MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstateBinary 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(@"ææ¬å 容å¤å¶æå"); }]; } /** @@ -534,7 +532,7 @@ @param activityId id */ - (void)activityinviteImgWirh:(NSString *)activityId{ - (void)activityinviteImgWirh:(NSString *)activityId { if (!([[NSUserDefaults standardUserDefaults] objectForKey:@"userId"])) { [SVProgressHUD dismiss]; @@ -1067,7 +1065,6 @@ _noNetworkViews.hidden = YES; return _noNetworkViews; } - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; MIduo/½çÃæ/ÎÒµÄ/LoginViewController.m
@@ -357,44 +357,54 @@ 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"]; // 妿æå®Controller å°±åæå®Controller if (self.fromVc) { if (self.isShopCar) { [self.navigationController popToViewController:self.fromVc animated:YES]; 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 { [self.navigationController popViewControllerAnimated:YES]; // 妿æå®Controller å°±åæå®Controller if (self.fromVc) { [self.navigationController popToViewController:self.fromVc animated:YES]; } else { [self.navigationController popViewControllerAnimated:YES]; } // self.vcName ä¸ä¸º nil 说æ if (self.vcName) { if (self->_delegate && [self->_delegate respondsToSelector:@selector(noticeMineBackEvent:)]) { [self->_delegate noticeMineBackEvent:self.vcName]; } } else if (self->_delegate && [self->_delegate respondsToSelector:@selector(noticeOrderOrShopCarBackWithLoginVc)]) { [self->_delegate noticeOrderOrShopCarBackWithLoginVc]; } } // self.vcName ä¸ä¸º nil 说æ if (self.vcName) { if (self->_delegate && [self->_delegate respondsToSelector:@selector(noticeMineBackEvent:)]) { [self->_delegate noticeMineBackEvent:self.vcName]; } } else if (self->_delegate && [self->_delegate respondsToSelector:@selector(noticeOrderOrShopCarBackWithLoginVc)]) { [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
@@ -34,12 +34,15 @@ @property (nonatomic,strong)SJRemoveBoundView *primtView; @property (weak, nonatomic) IBOutlet UIButton *addTopButton; @property (nonatomic,strong)NSString *textString; @property (nonatomic,strong)NSDictionary * userDataSource; @property (nonatomic, strong)NSDictionary * userDataSource; @property (nonatomic, assign) BOOL isHaveDian; @property (nonatomic, assign) BOOL isFirstZero; @property (nonatomic, strong) NSDictionary * alipayBindStateDictionary; @property (nonatomic,strong)SJNoNetwork *noNetworkViews; @property (nonatomic, copy) NSString *maxMoney; @property (nonatomic, copy) NSString *minMoney; @end @@ -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,9 +11,9 @@ @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; @property (nonatomic, strong) SJNoNetwork *noNetworkViews; @property (nonatomic, strong) PingHelper *pingHelper; @@ -56,14 +56,16 @@ accessType:[GLobalRealReachability currentWWANtype]]; } - (void)ClickConnectBtn:(UIButton *)sender{ - (void)ClickConnectBtn:(UIButton *)sender { if (iOS10) { NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; if( [[UIApplication sharedApplication]canOpenURL:url] ) { [[UIApplication sharedApplication]openURL:url options:@{}completionHandler:^(BOOL success) { }]; } }else{ } 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]; @@ -244,7 +246,7 @@ return _pingHelper; } -(void)CreatNavigationBar{ -(void)CreatNavigationBar { self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:XYRMainColor,NSFontAttributeName:[UIFont boldSystemFontOfSize:17]}; UIImage *image = [UIImage imageNamed:@"F72A37B3-8434-44EE-A2BA-BDCEB598C99F"]; //廿éæåå¯¼èªæ ä¸è¾¹çé»è¾¹ 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]; }else{ if(self.url){ page = [AlibcTradePageFactory page:self.url]; } else { page = [AlibcTradePageFactory itemDetailPage:[NSString stringWithFormat:@"%@",_goodsId]]; } MIduo/½çÃæ/ÍøÒ³ÊÓͼ/ÉÌÆ·ÏêÇé/GoodDeTrViewController.m
@@ -58,8 +58,11 @@ @property (nonatomic, assign) BOOL isCollection; @property (nonatomic, assign) BOOL isCollectionBack; @property (nonatomic,strong)SJNoNetwork *noNetworkViews; @property (nonatomic, strong) PingHelper *pingHelper; @property (nonatomic, strong) SJNoNetwork *noNetworkViews; @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; } } @@ -190,7 +180,7 @@ [self.view addSubview:self.topView]; [self.view addSubview:self.backButton]; [self.view addSubview:self.buttomView]; [self .view addSubview:self.transitionView]; [self.view addSubview:self.transitionView]; [self.buttomView.collectButton addTarget:self action:@selector(collectTaped:) forControlEvents:UIControlEventTouchUpInside]; @@ -295,7 +285,7 @@ } fail:^(id object) { [self.view hideToastActivity]; self.buttomView.collectButton.enabled = YES; if (((NSError *)object).code == -1009) { self.noNetworkViews.hidden = YES; @@ -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(@"ç½ç»è¿æ¥å¼å¸¸ï¼è¯·æ£æµç½ç»è®¾ç½®"); } }); }]; [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) { self.isTaoBaoBind = YES; if ([object[@"code"] integerValue] == 0) { self.isTaoBaoBind = YES; 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) { @@ -478,7 +472,7 @@ - (void)backTaped:(UIButton *)sender { [self.view hideToastActivity]; [self.view hideToastActivity]; [[YTHNetInterface startInterface] cancelAll]; [self.navigationController popViewControllerAnimated:YES]; } @@ -487,7 +481,7 @@ { RealReachability *reachability = (RealReachability *)notification.object; ReachabilityStatus status = [reachability currentReachabilityStatus]; [self setupFlagLabelWithStatus:status isVPNOn:[GLobalRealReachability isVPNOn] accessType:[GLobalRealReachability currentWWANtype]]; @@ -531,10 +525,10 @@ { self.noNetworkViews.hidden = YES; if (self.dataSource.count == 0) { if (self.dataSource.count == 0) { [self getgoodsInfomation]; } } break; } @@ -543,10 +537,10 @@ { self.noNetworkViews.hidden = YES; if (self.dataSource.count == 0) { if (self.dataSource.count == 0) { [self getgoodsInfomation]; } } break; } @@ -580,7 +574,7 @@ if (self.isProgressHud) { [self.view makeToastActivity:CSToastPositionCenter]; [self.view makeToastActivity:CSToastPositionCenter]; } NSMutableDictionary *dic = @{}.mutableCopy; @@ -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,16 +627,15 @@ [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]; }else{ } else { [self .buttomView.buyButton setTitle:@"ç«å³è´ä¹°" forState:UIControlStateNormal]; } @@ -662,30 +657,20 @@ } } else { [YTHsharedManger startManger].isCheckNetCanUse = -2; [self.pingHelper pingWithBlock:^(BOOL isSuccess) { if (self.dataSource.count == 0) { dispatch_async(dispatch_get_main_queue(), ^{ if (!isSuccess) { [YTHsharedManger startManger].isCheckNetCanUse = -2; // é¦é¡µç¹æ if (self.dataSource.count == 0) { self.noNetworkViews.primtTitle.text = @"ç½ç»è¿æ¥å¼å¸¸ï¼è¯·æ£æµç½ç»è®¾ç½®"; [self.noNetworkViews.iconImage setImage:[UIImage imageNamed:@"ç½ç»é误"]]; self.noNetworkViews.hidden = NO; } else { self.noNetworkViews.hidden = YES; ALToastBottom(@"ç½ç»è¿æ¥å¼å¸¸ï¼è¯·æ£æµç½ç»è®¾ç½®"); } } }); }]; self.noNetworkViews.primtTitle.text = @"ç½ç»è¿æ¥å¼å¸¸ï¼è¯·æ£æµç½ç»è®¾ç½®"; [self.noNetworkViews.iconImage setImage:[UIImage imageNamed:@"ç½ç»é误"]]; self.noNetworkViews.hidden = NO; } else { self.noNetworkViews.hidden = YES; 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,7 +811,8 @@ LoginVC.hidesBottomBarWhenPushed=YES; LoginVC.isShopCar = YES; LoginVC.isGoodDeTr = YES; LoginVC.delegate = self; ALToastBottom(@"å°æªç»å½ï¼è¯·å ç»å½"); self.buttomView.shareButton.userInteractionEnabled = YES; @@ -851,21 +857,11 @@ ALToastBottom(@"ç½ç»æªè¿æ¥ï¼è¯·æ£æµç½ç»è®¾ç½®"); } else { [YTHsharedManger startManger].isCheckNetCanUse = -2; [self.pingHelper pingWithBlock:^(BOOL isSuccess) { dispatch_async(dispatch_get_main_queue(), ^{ if (!isSuccess) { [YTHsharedManger startManger].isCheckNetCanUse = -2; self.noNetworkViews.hidden = YES; ALToastBottom(@"ç½ç»è¿æ¥å¼å¸¸ï¼è¯·æ£æµç½ç»è®¾ç½®"); } }); }]; 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) { @@ -885,9 +888,10 @@ if ([YTHsharedManger startManger].isCheckNetCanUse == -2) { ALToastBottom(@"ç½ç»è¿æ¥å¼å¸¸ï¼è¯·æ£æµç½ç»è®¾ç½®"); return ; } if (![[NSUserDefaults standardUserDefaults] objectForKey:@"userId"]) { self.isLogined = YES; @@ -911,29 +915,53 @@ } - (void)jumpTaoBao { if (self.dataSource == nil) { return; } [self jumpTaobaoWithGoodId:self.dataSource[@"goods"][@"auctionId"]]; // if (self.dataSource == nil) { // return; // } [self jumpTaobaoWithGoodId:self.dataSource[@"goods"][@"auctionId"]goodsTicket:self.ticketDic]; } - (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) { FeignGoodsDetaiViewController *webView= [[FeignGoodsDetaiViewController alloc] init]; if (@([self.dataSource[@"goods"][@"coupon"] integerValue]).boolValue) { webView.url = self.dataSource[@"goods"][@"couponInfo"][@"couponUrl"]; }else{ } 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 @@ -948,7 +976,7 @@ AlibcTradeShowParams* showParam = [[AlibcTradeShowParams alloc] init]; showParam.openType = AlibcOpenTypeNative; showParam.linkKey = @"taobao"; showParam.isNeedPush=YES; showParam.isNeedPush = YES; [service show:self.navigationController page:page showParams:showParam taoKeParams:taokeParams trackParam:nil tradeProcessSuccessCallback:^(AlibcTradeResult * _Nullable result) { if (result.result==AlibcTradeResultTypePaySuccess) {//æ¯ä»æå @@ -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 {