no message

重庆迈尖科技有限公司

2018-09-06 74347953b397cf811df4548a2d466eb03817b25b

no message

 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ

 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,16 +2,4 @@
<Bucket
   type = "0"
   version = "2.0">
   <Breakpoints>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            scope = "0"
            stopOnStyle = "0">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
</Bucket>

 MIduo/AppDelegate.m

@@ -60,7 +60,10 @@
    [self Configuration];
    
    //监听网络
    [self netWorkChangeEvent];
    GLobalRealReachability.hostForPing = @"www.baidu.com";
    GLobalRealReachability.hostForCheck = @"www.baidu.com";
    [GLobalRealReachability startNotifier];;
    //[self netWorkChangeEvent];
    
    //weex
    //    [self WeexInit];
@@ -746,9 +749,7 @@

-(void)netWorkChangeEvent{
    
    GLobalRealReachability.hostForPing = @"www.baidu.com";
    GLobalRealReachability.hostForCheck = @"www.apple.com";
    [GLobalRealReachability startNotifier];
    
    
    //    [[AFNetworkActivityIndicatorManager sharedManager] setEnabled:YES];
    //    NSURL *url = [NSURL URLWithString:@"http://baidu.com"];

 MIduo/Êý¾Ý/lib/LXAlertView/ShareAppView/ShareAppView.h

@@ -13,13 +13,15 @@
typedef void(^selectShareType)(NSString *type);

@interface ShareAppView : UIView

/**
 *
 *    åˆå§‹åŒ–方法
 */
- (instancetype)initShareAppView;

@property (nonatomic, copy) selectShareType haveIndex;

- (void)show;

- (void)diss;
- (void)dismiss;

@end

 MIduo/Êý¾Ý/lib/LXAlertView/ShareAppView/ShareAppView.m

@@ -41,7 +41,7 @@
    
    self = [super init];
    
    if (self) {
    if (self) {;
        
        [self setDataSource];
        
@@ -64,7 +64,7 @@
    }];
}

- (void)diss {
- (void)dismiss {
    
    [UIView animateWithDuration:timeAnitmation animations:^{
        
@@ -275,7 +275,7 @@
        [[_dissButton rac_signalForControlEvents:UIControlEventTouchUpInside]
         subscribeNext:^(UIButton *button) {
             @strongify(self)
             [self diss];
             [self dismiss];
         }];
    }
    return _dissButton;
@@ -300,7 +300,7 @@

- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
    
    [self diss];
    [self dismiss];
}

@end

 MIduo/½çÃæ/¶¯Ì¬/DynamicViewController.m

@@ -521,12 +521,10 @@
    
    activityVC.excludedActivityTypes = @[UIActivityTypePostToFacebook,UIActivityTypePostToTwitter,UIActivityTypeMessage,UIActivityTypeMail,UIActivityTypePrint,UIActivityTypeCopyToPasteboard,UIActivityTypeAssignToContact,UIActivityTypeSaveToCameraRoll,UIActivityTypeAddToReadingList,UIActivityTypePostToFlickr,UIActivityTypePostToVimeo,UIActivityTypePostToTencentWeibo,UIActivityTypeAirDrop,UIActivityTypeOpenInIBooks];
    [self presentViewController:activityVC animated:YES completion:^{
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        
        [SVProgressHUD dismiss];
        ALToastCenter(@"文本内容复制成功");
    }];
    
}

/**
@@ -1067,7 +1065,6 @@
    _noNetworkViews.hidden = YES;
    return _noNetworkViews;
}


- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];

 MIduo/½çÃæ/ÎÒµÄ/LoginViewController.m

@@ -357,19 +357,28 @@
        
        if (isSuccessful) {
            
            if (self.isCollections) {
                
                if (self.delegate && [self.delegate respondsToSelector:@selector(noticeCollectionBackWithLoginVc)]) {
                    [self.delegate noticeCollectionBackWithLoginVc];
                }
            }
            
            ALToastBottom(LOGIN_SUCCESS)
            
            [self loginDeviceToken];
            
            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"islogined"];
            
            if (self.isShopCar) {
                
                if (self->_delegate && [self->_delegate respondsToSelector:@selector(ShopCarBack)]) {
                    [self->_delegate ShopCarBack];
                }
                
                if (self.isCollections) {
                    
                    if (self->_delegate && [self->_delegate respondsToSelector:@selector(noticeCollectionBackWithLoginVc)]) {
                        [self->_delegate noticeCollectionBackWithLoginVc];
                    }
                }
                
                [self.navigationController popViewControllerAnimated:YES];
                
            } else {
            
            // å¦‚果指定Controller å°±å›žæŒ‡å®šController
            
@@ -395,6 +404,7 @@
                    
                    [self->_delegate noticeOrderOrShopCarBackWithLoginVc];
                }
            }
            
        } else {
            
@@ -402,9 +412,7 @@
        }
    }];
}
- (BOOL)datasourceIsNull{
    return NO;
}

/**
 åˆ¤æ–­æ˜¯å¦åŒæ„ç”¨æˆ·åè®®ï¼Œé»˜è®¤åŒæ„
 

 MIduo/½çÃæ/ÎÒµÄ/MineViewController.m

@@ -1314,7 +1314,7 @@
    
    self.shareAppView.haveIndex = ^(NSString *type) {
        
        [weakSelf.shareAppView diss];
        [weakSelf.shareAppView dismiss];
        weakSelf.shareAppView = nil;
        
        if ([type isEqualToString:@"微信好友"]) {

 MIduo/½çÃæ/ÎÒµÄ/balance/ÌåÏÖ/IncarnateViewController.m

@@ -41,6 +41,9 @@

@property (nonatomic,strong)SJNoNetwork *noNetworkViews;

@property (nonatomic, copy) NSString *maxMoney;
@property (nonatomic, copy) NSString *minMoney;

@end

@implementation IncarnateViewController
@@ -338,25 +341,23 @@
            [self.navigationController pushViewController:modifyVC animated:YES];
            
        }
        
        return;
    }
    
    [self.view endEditing:YES];
    self.balanText.text = [self.balanText.text removeSpace];
    if ([self.balanText.text doubleValue] > [self.datasource[@"myHongBao"] doubleValue]) {

        ALToastBottom(@"你当前可提现余额不足");
        return;
    }
    if ([self.balanText.text doubleValue] < 20) {

        ALToastBottom(@"单笔提现不低于20元");
    if ([self.balanText.text doubleValue] < [self.minMoney doubleValue]) {
        NSString * string = [NSString stringWithFormat:@"单笔提现不低于%@元",self.minMoney];
        ALToastBottom(string);
        return;
    }
    if ([self.balanText.text doubleValue] > 50) {

        ALToastBottom(@"单笔提现不高于50元");
    if ([self.balanText.text doubleValue] > [self.maxMoney doubleValue]) {
        NSString * string = [NSString stringWithFormat:@"单笔提现不高于%@元",self.maxMoney];
        ALToastBottom(string);
        return;
    }
    NSString *phoneString = _userInfo[@"phone"];
@@ -497,6 +498,8 @@
                   NSDictionary *dic = object[@"data"];
                   self.alipayBindStateDictionary = dic[@"alipayBindState"];
                   self.userInfo = dic[@"user"];
                   self.maxMoney = dic[@"maxMoney"];
                   self.minMoney = dic[@"minMoney"];
                   self.userDataSource = dic;
                   self.bindingAccountList = dic[@"bindingAccountList"];
                   

 MIduo/½çÃæ/ÎÒµÄ/complain/ComplainViewController.m

@@ -11,7 +11,7 @@
@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
@property (weak, nonatomic) IBOutlet UITextField *textfield;
@property (weak, nonatomic) IBOutlet UIButton *submitButton;
@property (strong, nonatomic) NSString *contentString;
@property (nonatomic, copy) NSString *contentString;

@property (nonatomic,strong)SJNoNetwork *noNetworkViews;

@@ -63,7 +63,9 @@
            [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL        success) {
            }];
        }
        
    }else{
        
        NSURL *url= [NSURL URLWithString:@"prefs:root=com.haicaojie-ios"];
        if( [[UIApplication sharedApplication]canOpenURL:url] ) {
            [[UIApplication sharedApplication]openURL:url];
@@ -71,8 +73,8 @@
    }
}

- (void)networkChanged:(NSNotification *)notification
{
- (void)networkChanged:(NSNotification *)notification {
    
    RealReachability *reachability = (RealReachability *)notification.object;
    ReachabilityStatus status = [reachability currentReachabilityStatus];
    
@@ -81,9 +83,8 @@
                        accessType:[GLobalRealReachability currentWWANtype]];
}

- (void)VPNStatusChanged:(NSNotification *)notification
{
    // refreshing the status.
- (void)VPNStatusChanged:(NSNotification *)notification {
    
    [self setupFlagLabelWithStatus:[GLobalRealReachability currentReachabilityStatus]
                           isVPNOn:[GLobalRealReachability isVPNOn]
                        accessType:[GLobalRealReachability currentWWANtype]];
@@ -163,6 +164,7 @@
    self.contentString = textfield.text;
    self.textfield.text = textString;
}

- (BOOL)inputShouldLetterOrNum:(NSString *)inputString {
    if (inputString.length == 0) return NO;
    NSRange range = [inputString rangeOfString:@"^[0-9]*$" options:NSRegularExpressionSearch];

 MIduo/½çÃæ/ÎÒµÄ/service/WINCopyLabel.m

@@ -78,8 +78,5 @@
    }
    
}
//- (void)copy:(id)sender{
//    
//}

@end

 MIduo/½çÃæ/ÍøÒ³ÊÓͼ/ÉÌÆ·ÏêÇé/FeignGoodsDetaiViewController.m

@@ -125,11 +125,13 @@
- (void)createWebView {
    
    id<AlibcTradePage> page;
//    page = [AlibcTradePageFactory itemDetailPage:[NSString stringWithFormat:@"%@",_goodsId]];
 
        if(_url){
            page = [AlibcTradePageFactory page:_url];
        if(self.url){
            
            page = [AlibcTradePageFactory page:self.url];
            
        }else{
            
            page = [AlibcTradePageFactory itemDetailPage:[NSString stringWithFormat:@"%@",_goodsId]];
        }
    

 MIduo/½çÃæ/ÍøÒ³ÊÓͼ/ÉÌÆ·ÏêÇé/GoodDeTrViewController.m

@@ -59,7 +59,10 @@
@property (nonatomic, assign) BOOL isCollectionBack;

@property (nonatomic,strong)SJNoNetwork *noNetworkViews;
@property (nonatomic, strong) PingHelper *pingHelper;

@property (nonatomic, strong) NSDictionary *ticketDic;
/// æ˜¯å¦ç‚¹å‡»ç™»é™†ï¼ŒçŠ¶æ€ ç™»é™†æœ‰æ²¡æˆåŠŸ
@property (nonatomic, assign) NSInteger clickLoginStates;

@end

@@ -69,6 +72,7 @@
    [super viewDidLoad];
    
    self.isProgressHud = YES;
    self.clickLoginStates = 0;
    
    [[NSNotificationCenter defaultCenter] addObserver:self
                                             selector:@selector(EnterForeground:)
@@ -125,11 +129,9 @@
    }
}


- (void)viewWillAppear:(BOOL)animated {
    [super viewWillAppear:animated];
    
    [self getgoodsInfomation];
    self.title = @"商品详情";
    
    [self.navigationController setNavigationBarHidden:YES animated:animated];
@@ -137,7 +139,6 @@
    
    self.tabBarController.tabBar.hidden = YES;
    
    self.transitionView .hidden = YES;
    [YTHsharedManger startManger].isEnterForeground = NO;
    
    UIView *statusBar = [[[UIApplication sharedApplication] valueForKey:@"statusBarWindow"] valueForKey:@"statusBar"];
@@ -153,17 +154,6 @@
    if ([YTHsharedManger startManger].isBackGoodDeTr && !self.isSharelogin) {
        
        [self ShopCarBack];
        [YTHsharedManger startManger].isBackGoodDeTr = NO;
    }
    
    if (self.isLogined && [[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] && [[ALBBSession sharedInstance] isLogin] ) {
        
        [self usergettbpidinfo];
    }
    
    if (self.isSharelogin && [[NSUserDefaults standardUserDefaults] objectForKey:@"userId"]) {
        [self gotoShareShopping];
        
        [YTHsharedManger startManger].isBackGoodDeTr = NO;
    }
}
@@ -304,20 +294,12 @@
                       
                   } else {
                       
                       [self.pingHelper pingWithBlock:^(BOOL isSuccess) {
                           
                           dispatch_async(dispatch_get_main_queue(), ^{
                               
                               if (!isSuccess) {
                                   
                                   [YTHsharedManger startManger].isCheckNetCanUse = -2;
                                   
                                   self.noNetworkViews.hidden = YES;
                                   
                                   ALToastBottom(@"网络连接异常，请检测网络设置");
                               }
                           });
                       }];
                       
                   }
               }];
}
@@ -365,33 +347,42 @@
        } else {
            
            self.isTaoBaoBind = YES;
            
            if (self.clickLoginStates == 1) {
                
                self.clickLoginStates = 0;
                
                self.transitionView.hidden = NO;
                [self performSelector:@selector(jumpTaoBao) withObject:nil/*可传任意类型参数*/ afterDelay:0.5f];
            }
        }
    }
}

#pragma mark --- èŽ·å–淘宝转链信息 ---
/**
 é‡æ–°è¯·æ±‚pid
 */
- (void)usergettbpidinfo {
    
    NSMutableDictionary *dic = @{}.mutableCopy;
    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] == nil) {
    if (!([[NSUserDefaults standardUserDefaults] objectForKey:@"userId"])) {
        return;
    }
    
    [dic setObject:[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] forKey:@"uid"];
    [dic setObject:self.goodsID forKey:@"id"];
    
    NSMutableDictionary *dictionary = [SJNetwork CommonDictionarywithDic:dic];
    
    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"user/gettbpidinfo"]
    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"user/gettaobaolink"]
                 param:dictionary
               success:^(NSDictionary *object) {
                   
                   if ([object[@"code"]integerValue] == 0) {
                       
                       self.alibaichuan = [[SJAliBaicun alloc] initWithDic:object[@"data"][@"pidInfo"]];
                       
                       self.transitionView.hidden = NO;
                       [self performSelector:@selector(jumpTaoBao) withObject:nil/*可传任意类型参数*/ afterDelay:0.3];
                       self.ticketDic = object[@"data"][@"ticket"];
                       
                   } else {
                       
@@ -452,17 +443,20 @@
                 param:dictionary
               success:^(NSDictionary *object) {
                   
                   if ([object[@"code"] integerValue] == 0) {
                       self.isTaoBaoBind = YES;
                   
                   if ([object[@"code"] integerValue] == 0) {
                       

                       ALToastCenter(BIND_SUCCESS);
                       
                       [self usergettbpidinfo];
                       self.transitionView.hidden = NO;
                       [self performSelector:@selector(jumpTaoBao) withObject:nil/*可传任意类型参数*/ afterDelay:0.3];
                       
                   } else {
                       self.isTaoBaoBind = YES;
               
                       [self usergettbpidinfo];
                       self.transitionView.hidden = NO;
                       [self performSelector:@selector(jumpTaoBao) withObject:nil/*可传任意类型参数*/ afterDelay:0.3];
                   }
                   
               } fail:^(id object) {
@@ -596,6 +590,8 @@
                   [self.view hideToastActivity];
                   
                   self.dataSource = object[@"data"];
                   self.ticketDic = object[@"data"][@"ticket"];
                   
                   self.code = [object[@"code"] integerValue];
                   
                   if (self.code == 2) {
@@ -631,12 +627,11 @@
                   
                   [self.buttomView loadViewInfomation:self.dataSource];
                   
                   
                   self.alibaichuan = [[SJAliBaicun alloc]initWithDic:self.dataSource[@"tbPidInfo"]];
                   NSLog(@"%@,%@,%@,%@",self.alibaichuan.appKey,self.alibaichuan.pid,self.alibaichuan.siteID,self.alibaichuan.adZoneID);
                   NSInteger coupon = [object[@"data"][@"goods"][@"coupon"] integerValue];
                   
                   if (coupon == 1) {
                   NSNumber *coupon = @([object[@"data"][@"goods"][@"coupon"] integerValue]);
                   
                   if (coupon.boolValue) {
                       
                       [self .buttomView.buyButton setTitle:@"领券购买" forState:UIControlStateNormal];
                       
@@ -662,15 +657,8 @@
                       }
                       
                   } else {
                       
                       [self.pingHelper pingWithBlock:^(BOOL isSuccess) {
                           
                           dispatch_async(dispatch_get_main_queue(), ^{
                               
                               if (!isSuccess) {
                                   
                                   [YTHsharedManger startManger].isCheckNetCanUse = -2;
                                   // é¦–页特有
                       
                                   if (self.dataSource.count == 0) {
                                       
                                       self.noNetworkViews.primtTitle.text = @"网络连接异常，请检测网络设置";
@@ -683,9 +671,6 @@
                                       
                                       ALToastBottom(@"网络连接异常，请检测网络设置");
                                   }
                               }
                           });
                       }];
                   }
               }];
}
@@ -725,6 +710,14 @@
#pragma mark - GoodsHeaderTableViewCellDelegate

- (void)useQuanClicked:(GoodsHeaderTableViewCell *)cell {
    
    NSNumber *invalid = @([self.dataSource[@"invalid"] integerValue]);
    
    if (invalid.boolValue) {
        
        return;
    }
    
    if ([YTHsharedManger startManger].networkStatus == 0) {
        
        ALToastCenter(@"网络未连接，请检测网络设置");
@@ -742,7 +735,7 @@
        LoginVC.isGoodDeTr = YES;
        LoginVC.hidesBottomBarWhenPushed = YES;
        LoginVC.isShopCar = YES;
        
        LoginVC.delegate = self;
        [self.navigationController pushViewController:LoginVC animated:YES];
        
    } else {
@@ -768,17 +761,29 @@
#pragma mark --- ç™»å½•æˆåŠŸè¿”回 é€šçŸ¥ ---
- (void)ShopCarBack {
    
    [self usergettbpidinfo];
    
    if (self.isCollectionBack) {
        
        self.isCollectionBack = NO;
        
    } else if (self.isSharelogin) {
        
        [self gotoShareShopping];
        
        [YTHsharedManger startManger].isBackGoodDeTr = NO;
        
    } else {
        
        self.clickLoginStates = 1;
        
        [self detectionIsBindTaoBaoTips];
    }
}

- (void)noticeCollectionBackWithLoginVc {
    
    [self usergettbpidinfo];
    
    // ç™»å½•æˆåŠŸåŽ ç›´æŽ¥æ”¶è—æˆ–跳转
    [self fecthAndPostCollection];
@@ -806,6 +811,7 @@
        LoginVC.hidesBottomBarWhenPushed=YES;
        LoginVC.isShopCar = YES;
        LoginVC.isGoodDeTr = YES;
        LoginVC.delegate = self;

        ALToastBottom(@"尚未登录，请先登录");
        self.buttomView.shareButton.userInteractionEnabled = YES;
@@ -851,21 +857,11 @@
                       ALToastBottom(@"网络未连接，请检测网络设置");
                       
                   } else {
                       
                       [self.pingHelper pingWithBlock:^(BOOL isSuccess) {
                           
                           dispatch_async(dispatch_get_main_queue(), ^{
                               
                               if (!isSuccess) {
                                   
                                   [YTHsharedManger startManger].isCheckNetCanUse = -2;
                                   
                                   self.noNetworkViews.hidden = YES;
                                   
                                   ALToastBottom(@"网络连接异常，请检测网络设置");
                               }
                           });
                       }];
                   }
               }];
}
@@ -874,6 +870,13 @@
 é¢†åˆ¸è´­ä¹°
 */
- (void)buyClicked:(ButtomCarView *)view {
    
    NSNumber *invalid = @([self.dataSource[@"invalid"] integerValue]);
    
    if (invalid.boolValue) {
        
        return;
    }
    
    if ([YTHsharedManger startManger].networkStatus == 0) {
        
@@ -888,6 +891,7 @@

        return ;
    }
    
    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"userId"]) {
        
        self.isLogined = YES;
@@ -911,29 +915,53 @@
}

- (void)jumpTaoBao {
    if (self.dataSource == nil) {
        return;
    //    if (self.dataSource == nil) {
    //        return;
    //    }
    [self jumpTaobaoWithGoodId:self.dataSource[@"goods"][@"auctionId"]goodsTicket:self.ticketDic];
    }
    [self jumpTaobaoWithGoodId:self.dataSource[@"goods"][@"auctionId"]];
}
- (void)jumpTaobaoWithGoodId:(NSString *)goodId {

- (void)jumpTaobaoWithGoodId:(NSString *)goodId goodsTicket:(NSDictionary *)goodsTicket {
    
    self.isLogined = NO;
    
    if (!self.native) {
        
        FeignGoodsDetaiViewController *webView=[[FeignGoodsDetaiViewController alloc] init];
        if ([self.dataSource[@"goods"][@"coupon"]integerValue] == 1) {
        
        if (@([self.dataSource[@"goods"][@"coupon"] integerValue]).boolValue) {
            
            webView.url = self.dataSource[@"goods"][@"couponInfo"][@"couponUrl"];
            
        }else{
            
            webView.goodsId=self.goodsID;
        }
        
        webView.alibaicuan = self.alibaichuan;
        [self.navigationController pushViewController:webView animated:YES];
        return;
    }
    
    [YTHsharedManger startManger].isEnterForeground = YES;
    id<AlibcTradePage> page;
    if(goodId){
    
    if (goodsTicket) {
        
        if (goodsTicket[@"couponUrl"]) {
            
            page = [AlibcTradePageFactory page:goodsTicket[@"couponUrl"]];
            
        } else {
            
            page = [AlibcTradePageFactory page:goodsTicket[@"clickUrl"]];
        }
        
    } else {
        
        page = [AlibcTradePageFactory itemDetailPage:[NSString stringWithFormat:@"%@",goodId]];
    }
    
    //淘客信息
    AlibcTradeTaokeParams *taokeParams = [[AlibcTradeTaokeParams alloc] init];
    taokeParams.pid = self.alibaichuan.pid; //mm_XXXXX为你自己申请的阿里妈妈淘客pid
@@ -1023,9 +1051,7 @@
        NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:3];
        [self.detailTableview scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionTop animated:YES];
    }
    
}


#pragma mark - scrollViewDelegate
- (void)scrollViewDidScroll:(UIScrollView *)scrollView
@@ -1538,15 +1564,6 @@
    return _noNetworkViews;
}

- (PingHelper *)pingHelper {
    
    if (!_pingHelper) {
        _pingHelper = [[PingHelper alloc] init];
        _pingHelper.host = @"https://captive.apple.com";
        _pingHelper.hostForCheck = @"https://captive.apple.com";
    }
    return _pingHelper;
}

- (void)onNetWorkBack:(UIButton *)button {