parent: a2b69134 | 补丁 | 提交 | ignore whitespace
重庆迈尖科技有限公司
2018-08-14 f00d54a35b63208c2686c5a2105fcdd184722573 
Merge branch 'master' of ssh://193.112.35.168:29418/haicaojie

# Conflicts:
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
4个文件已修改
246 ■■■■■ 已修改文件
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/SJBaseViewController.m 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/BalanceViewController.m 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ



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


@@ -4,13 +4,85 @@


   version = "2.0">


   <Breakpoints>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            scope = "0"


            stopOnStyle = "0">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "No"


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/MergeAccountViewController.h"


            timestampString = "555402530.7800241"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "28"


            endingLineNumber = "28">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/LoginViewController.m"


            timestampString = "555588815.727405"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "561"


            endingLineNumber = "561"


            landmarkName = "-WeChatHasLoged:"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/MineViewController.m"


            timestampString = "555582159.340149"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "679"


            endingLineNumber = "679"


            landmarkName = "-noticeOrderOrShopCarBackWithLoginVc"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/&#x641c;&#x7d22;/searchDetailViewController.m"


            timestampString = "555588815.727831"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "640"


            endingLineNumber = "640"


            landmarkName = "-searchDataWithText:WithPage:WithFilter:WithOrder:WithStartPrice:WithEndPrice:"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"


            timestampString = "555844765.507682"


            timestampString = "555901445.964676"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "253"


@@ -22,15 +94,15 @@


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "No"


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"


            timestampString = "555844765.507742"


            timestampString = "555901445.965021"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "263"


            endingLineNumber = "263"


            startingLineNumber = "261"


            endingLineNumber = "261"


            landmarkName = "-networkError:"


            landmarkType = "7">


         </BreakpointContent>


@@ -38,64 +110,16 @@


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "No"


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"


            timestampString = "555844765.507785"


            filePath = "../SGNetObserver-master/SGNetObserver/SGNetObserver.m"


            timestampString = "555902137.230881"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "268"


            endingLineNumber = "268"


            landmarkName = "-networkError:"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "No"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"


            timestampString = "555844765.5078239"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "273"


            endingLineNumber = "273"


            landmarkName = "-networkError:"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "No"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"


            timestampString = "555844765.507861"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "255"


            endingLineNumber = "255"


            landmarkName = "-networkError:"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "No"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/SJBaseViewController.m"


            timestampString = "555844765.507908"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "274"


            endingLineNumber = "274"


            landmarkName = "-networkError:"


            startingLineNumber = "77"


            endingLineNumber = "77"


            landmarkName = "-networkStatusDidChanged"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>




 MIduo/½çÃæ/SJBaseViewController.m


@@ -117,9 +117,7 @@


}


#pragma mark - ç½‘络状态发生变化通知方法


-(void)NetWorkStatesChange:(NSNotification *)sender{


    BOOL canThouth = [self checkNetCanUse];


//    canThouth = YES;


    NSLog(@"%d",canThouth);


//    BOOL canThouth = [self checkNetCanUse];


    [YTHsharedManger startManger].isCheckNetCanUse = 0;


    NSDictionary *urlDic = [[NSUserDefaults standardUserDefaults]objectForKey:@"MainUrlArray"];


    BOOL urlRequest = NO;


@@ -189,26 +187,11 @@


                [self loadData];


            }


            


            if (canThouth) {


                if (urlRequest) {


                    [self isJumpTaobao];


                }


                [_noNetworkView setHidden:YES];


                [self loadData];


            }else{


                [YTHsharedManger startManger].isCheckNetCanUse = -2;


                if ([self datasourceIsNull]) {


                    self.noNetworkView.primtTitle.text = @"网络连接异常，请检测网络设置";


                    [self.noNetworkView.iconImage setImage:[UIImage imageNamed:@"网络错误"]];


                    [self loadNoNetworkView];


                    NSLog(@"%d",[self datasourceIsNull]);


                    


                } else {


                    NSLog(@"%d",[self datasourceIsNull]);


                    [_noNetworkView setHidden:YES];


                }


            }


            




            break;


            


@@ -249,31 +232,29 @@


    return NO;


}


- (void)networkError:(NSNotification *)notice{


    BOOL canThouth = [self checkNetCanUse];


    if (canThouth) {


        if ([self datasourceIsNull]) {


            [YTHsharedManger startManger].isCheckNetCanUse = -2;


            self.noNetworkView.primtTitle.text = @"网络连接异常，请检测网络设置";


            [self.noNetworkView.iconImage setImage:[UIImage imageNamed:@"网络错误"]];


            [self loadNoNetworkView];


            NSLog(@"%d",[self datasourceIsNull]);




        } else {


            NSLog(@"%d",[self datasourceIsNull]);


            [_noNetworkView setHidden:YES];


        }


        // é¦–页特有


        if ([self homeIsShowNetWorkView]) {


            


            [self loadNoNetworkView];


            NSLog(@"%d",[self datasourceIsNull]);


            


        } else {


            


            [_noNetworkView setHidden:YES];


            [self loadData];


        }


    [YTHsharedManger startManger].isCheckNetCanUse = -2;


    if ([self datasourceIsNull]) {


        self.noNetworkView.primtTitle.text = @"网络连接异常，请检测网络设置";


        [self.noNetworkView.iconImage setImage:[UIImage imageNamed:@"网络错误"]];


        [self loadNoNetworkView];


        NSLog(@"%d",[self datasourceIsNull]);


        


    } else {


        NSLog(@"%d",[self datasourceIsNull]);


        [_noNetworkView setHidden:YES];


    }


    // é¦–页特有


    if ([self homeIsShowNetWorkView]) {


        


        [self loadNoNetworkView];


        NSLog(@"%d",[self datasourceIsNull]);


        


    } else {


        


        [_noNetworkView setHidden:YES];


        [self loadData];


    }


    


}




- (void)dealloc{




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


@@ -81,22 +81,15 @@


            self.lastMonLabel.text = [dic[@"moneyLastMonth"]stringValue];


            self.estimateLabel.text = [dic[@"moneyToday"]stringValue];


            self.mothLabel.text = [dic[@"moneyMonth"]stringValue];


            self.royaltiesLabel.text = [NSString stringWithFormat:@"%.2f",[dic[@"totalUnGetTiChengMoney"]doubleValue]];


            self.royaltiesedLabel.text = [NSString stringWithFormat:@"%.2f",[dic[@"totalTiChengMoney"]doubleValue]];


            self.royaltiesLabel.text = [NSString stringWithFormat:@"%@",dic[@"totalUnGetTiChengMoney"]];


            self.royaltiesedLabel.text = [NSString stringWithFormat:@"%@",dic[@"totalTiChengMoney"]];


        }else{


            [self autoDisappearAlertTime:0.5 msg:object[@"msg"]];




        }


    } fail:^(id object) {


//        if (self.datasource) {


//            NSError *error = (NSError *)object;


//            if (error.code == -1009) {


//                [self autoDisappearAlertTime:0.5 msg:@"网络未连接，请检测网络设置"];


//


//            }else{


//                [self autoDisappearAlertTime:0.5 msg:@"网络连接异常，请检测网络设置"];


//            }


//        }




        


    }];


}


/**


@@ -111,9 +104,9 @@




    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"customer/getuserinfo"] param:dictionary success:^(NSDictionary *object) {


        self.datasource = object[@"data"][@"user"];//保存当前用户信息


        self.blanceLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"myHongBao"]doubleValue]];


        self.fanliLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"totalHongBao"]doubleValue]];


        self.accountLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"noOpenHongBao"]doubleValue]];


        self.blanceLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"myHongBao"]];


        self.fanliLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"totalHongBao"]];


        self.accountLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"noOpenHongBao"]];


    } fail:^(id object) {


        


    }];


@@ -165,7 +158,7 @@


    


    self.blanceLabel = [[UILabel alloc]initWithFrame:CGRectMake(20,  20, KScreenW / 3 * 2, 40)];


    self.blanceLabel.textColor = XYRMainColor;


    self.blanceLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"myHongBao"]doubleValue]];


    self.blanceLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"myHongBao"]];


    self.blanceLabel.font = [UIFont boldSystemFontOfSize:40];


    [_fanliView addSubview:self.blanceLabel];


    


@@ -235,7 +228,7 @@


    _fanliLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, 5, KScreenW / 2, 33)];


    _fanliLabel.textColor = [UIColor blackColor];


    _fanliLabel.font = [UIFont boldSystemFontOfSize:30];


    _fanliLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"totalHongBao"]doubleValue]];


    _fanliLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"totalHongBao"]];


    _fanliLabel.textAlignment = NSTextAlignmentCenter;


    [buttomView addSubview:_fanliLabel];


    UILabel *fanLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_fanliLabel.frame) + 5, KScreenW / 2, 20)];


@@ -248,7 +241,7 @@


    _accountLabel = [[UILabel alloc]initWithFrame:CGRectMake(KScreenW / 2 + 1, 5, KScreenW / 2, 33)];


    _accountLabel.textColor = [UIColor blackColor];


    _accountLabel.font = [UIFont boldSystemFontOfSize:30];


    _accountLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"noOpenHongBao"]doubleValue]];


    _accountLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"noOpenHongBao"]];


    _accountLabel.textAlignment = NSTextAlignmentCenter;


    [buttomView addSubview:_accountLabel];




@@ -273,7 +266,7 @@


    _royaltiesedLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, 5, KScreenW / 2, 33)];


    _royaltiesedLabel.textColor = [UIColor blackColor];


    _royaltiesedLabel.font = [UIFont boldSystemFontOfSize:30];


    _royaltiesedLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"totalHongBao"]doubleValue]];


    _royaltiesedLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"totalHongBao"]];


    _royaltiesedLabel.textAlignment = NSTextAlignmentCenter;


    [_royaltiesView addSubview:_royaltiesedLabel];


    UILabel *leijiLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_royaltiesedLabel.frame) + 5, KScreenW / 2, 20)];


@@ -286,7 +279,7 @@


    _royaltiesLabel = [[UILabel alloc]initWithFrame:CGRectMake(KScreenW / 2 + 1, 5, KScreenW / 2, 33)];


    _royaltiesLabel.textColor = [UIColor blackColor];


    _royaltiesLabel.font = [UIFont boldSystemFontOfSize:30];


    _royaltiesLabel.text = [NSString stringWithFormat:@"%.2f",[self.datasource[@"noOpenHongBao"]doubleValue]];


    _royaltiesLabel.text = [NSString stringWithFormat:@"%@",self.datasource[@"noOpenHongBao"]];


    _royaltiesLabel.textAlignment = NSTextAlignmentCenter;


    [_royaltiesView addSubview:_royaltiesLabel];


    


@@ -328,7 +321,7 @@


//    _estimateLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];


    


    _estimateLabel.textAlignment = NSTextAlignmentCenter;


    _estimateLabel.text = @"---";


    _estimateLabel.text = @"0";


    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_estimateLabel.frame)+ 20, CGRectGetMaxY(_estimateLabel.frame), 60, 25)];


    label.font = [UIFont systemFontOfSize:13];


    if (KScreenW > 375) {


@@ -365,7 +358,7 @@


//    _mothLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];


    


    _mothLabel.textAlignment = NSTextAlignmentCenter;


    _mothLabel.text = @"---";


    _mothLabel.text = @"0";


    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_mothLabel.frame) + 20, CGRectGetMaxY(_mothLabel.frame) ,60, 25)];


    label.font = [UIFont systemFontOfSize:13];


    if (KScreenW > 375) {


@@ -401,7 +394,7 @@


    _lastMonLabel.font = [UIFont boldSystemFontOfSize:30];


//    _lastMonLabel .font = [UIFont fontWithName:@"Arial-BoldMT" size:30];


    _lastMonLabel.textAlignment = NSTextAlignmentCenter;


    _lastMonLabel.text = @"---";


    _lastMonLabel.text = @"0";


    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(_lastMonLabel.frame) + 15, CGRectGetMaxY(_lastMonLabel.frame) , 60, 25)];


    label.font = [UIFont systemFontOfSize:13];


    if (KScreenW > 375) {