parent: a4cb464e | 补丁 | 提交 | show whitespace
重庆迈尖科技有限公司
2018-09-03 f33ec97e41391cf46766353010c1ba0c3e24346e 
no message
8个文件已修改
193 ■■■■■ 已修改文件
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/AppDelegate.m 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/Info.plist 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/动态/DynamicViewController.m 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/MineViewController.m 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/BalanceViewController.m 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/体现/IncarnateViewController.m 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ



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


@@ -19,56 +19,8 @@


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/界面/动态/DynamicViewController.m"


            timestampString = "557313845.993101"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "229"


            endingLineNumber = "229"


            landmarkName = "-wxShareWithArray:"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/balance/&#x4f53;&#x73b0;/IncarnateViewController.m"


            timestampString = "556193788.808557"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "246"


            endingLineNumber = "246"


            landmarkName = "-getAccount"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/balance/&#x4f53;&#x73b0;/IncarnateViewController.m"


            timestampString = "556193788.808603"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "253"


            endingLineNumber = "253"


            landmarkName = "-getAccount"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/&#x754c;&#x9762;/&#x4f18;&#x60e0;&#x5238;/classificationViewController.m"


            timestampString = "556452484.3680609"


            timestampString = "557398515.520295"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "147"


@@ -100,7 +52,7 @@


                  moduleName = "MIduo"


                  usesParentBreakpointCondition = "Yes"


                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/lib/ZJScrollPageView/ZJContentView.m"


                  timestampString = "557313846.062323"


                  timestampString = "557633214.076292"


                  startingColumnNumber = "9223372036854775807"


                  endingColumnNumber = "9223372036854775807"


                  startingLineNumber = "192"


@@ -115,7 +67,7 @@


                  moduleName = "MIduo"


                  usesParentBreakpointCondition = "Yes"


                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/lib/ZJScrollPageView/ZJContentView.m"


                  timestampString = "557313846.063996"


                  timestampString = "557633214.077917"


                  startingColumnNumber = "9223372036854775807"


                  endingColumnNumber = "9223372036854775807"


                  startingLineNumber = "193"


@@ -123,22 +75,6 @@


                  offsetFromSymbolStart = "108">


               </Location>


            </Locations>


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


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


            timestampString = "557313409.948368"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "206"


            endingLineNumber = "206"


            landmarkName = "-bindTaoBaos"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


@@ -164,7 +100,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/AppDelegate.m"


            timestampString = "557313845.993438"


            timestampString = "557630526.632936"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "613"


@@ -180,7 +116,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/AppDelegate.m"


            timestampString = "557313845.9934829"


            timestampString = "557630526.633334"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "624"


@@ -196,7 +132,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/AppDelegate.m"


            timestampString = "557313845.99352"


            timestampString = "557630526.633499"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "647"


@@ -212,7 +148,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/AppDelegate.m"


            timestampString = "557313845.9935549"


            timestampString = "557630526.633657"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "565"


@@ -244,7 +180,7 @@


                  moduleName = "MIduo"


                  usesParentBreakpointCondition = "Yes"


                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/YTHsharedManger.m"


                  timestampString = "557313846.090746"


                  timestampString = "557633214.097622"


                  startingColumnNumber = "9223372036854775807"


                  endingColumnNumber = "9223372036854775807"


                  startingLineNumber = "221"


@@ -259,7 +195,7 @@


                  moduleName = "MIduo"


                  usesParentBreakpointCondition = "Yes"


                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/YTHsharedManger.m"


                  timestampString = "557313846.092422"


                  timestampString = "557633214.099214"


                  startingColumnNumber = "9223372036854775807"


                  endingColumnNumber = "9223372036854775807"


                  startingLineNumber = "222"


@@ -274,7 +210,7 @@


                  moduleName = "MIduo"


                  usesParentBreakpointCondition = "Yes"


                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E6%95%B0%E6%8D%AE/YTHsharedManger.m"


                  timestampString = "557313846.094366"


                  timestampString = "557633214.100762"


                  startingColumnNumber = "9223372036854775807"


                  endingColumnNumber = "9223372036854775807"


                  startingLineNumber = "221"


@@ -282,70 +218,6 @@


                  offsetFromSymbolStart = "20">


               </Location>


            </Locations>


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


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


            timestampString = "557313409.948615"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "342"


            endingLineNumber = "342"


            landmarkName = "-Login"


            landmarkType = "7">


            <Locations>


               <Location


                  shouldBeEnabled = "Yes"


                  ignoreCount = "0"


                  continueAfterRunningActions = "No"


                  symbolName = "-[MineViewController Login]"


                  moduleName = "MIduo"


                  usesParentBreakpointCondition = "Yes"


                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E7%95%8C%E9%9D%A2/%E6%88%91%E7%9A%84/MineViewController.m"


                  timestampString = "557313846.099995"


                  startingColumnNumber = "9223372036854775807"


                  endingColumnNumber = "9223372036854775807"


                  startingLineNumber = "342"


                  endingLineNumber = "342"


                  offsetFromSymbolStart = "36">


               </Location>


               <Location


                  shouldBeEnabled = "Yes"


                  ignoreCount = "0"


                  continueAfterRunningActions = "No"


                  symbolName = "__27-[MineViewController Login]_block_invoke"


                  moduleName = "MIduo"


                  usesParentBreakpointCondition = "Yes"


                  urlString = "file:///Users/mj/Desktop/fanliquan/MIduo/%E7%95%8C%E9%9D%A2/%E6%88%91%E7%9A%84/MineViewController.m"


                  timestampString = "557313846.101844"


                  startingColumnNumber = "9223372036854775807"


                  endingColumnNumber = "9223372036854775807"


                  startingLineNumber = "343"


                  endingLineNumber = "343"


                  offsetFromSymbolStart = "56">


               </Location>


            </Locations>


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">


         <BreakpointContent


            shouldBeEnabled = "Yes"


            ignoreCount = "0"


            continueAfterRunningActions = "No"


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


            timestampString = "557313409.948656"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "677"


            endingLineNumber = "677"


            landmarkName = "-boundTaoBao:isOrder:"


            landmarkType = "7">


         </BreakpointContent>


      </BreakpointProxy>


      <BreakpointProxy


@@ -371,7 +243,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/AppDelegate.m"


            timestampString = "557313845.993634"


            timestampString = "557630526.633848"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "600"


@@ -387,7 +259,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/AppDelegate.m"


            timestampString = "557313845.993672"


            timestampString = "557630526.634005"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "581"




 MIduo/AppDelegate.m


@@ -739,7 +739,6 @@


//                            [YTHsharedManger startManger].playingType = 0;


                           NSLog(@"%ld",(long)[YTHsharedManger startManger].playingType);


                           [self loadViewsWithBor:[YTHsharedManger startManger].playingType];




                           


                       }


                       if ([dic[@"key"] compare:@"newuser"] == 0) {//




 MIduo/Info.plist


@@ -17,7 +17,7 @@


    <key>CFBundlePackageType</key>


    <string>APPL</string>


    <key>CFBundleShortVersionString</key>


    <string>1.3.7</string>


    <string>1.3.8</string>


    <key>CFBundleURLTypes</key>


    <array>


        <dict>


@@ -88,7 +88,7 @@


        </dict>


    </array>


    <key>CFBundleVersion</key>


    <string>27</string>


    <string>28</string>


    <key>LSApplicationQueriesSchemes</key>


    <array>


        <string>tbopen</string>




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




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


@@ -49,7 +49,7 @@


    UILabel *titleLabel;


    UITableView *_MineTableView;


    NSArray *grounpData1;


    NSArray *grounpData2;


    NSMutableArray *grounpData2;


    LXAlertView *Alert;//登录弹窗


}




@@ -111,7 +111,7 @@




- (void)viewDidLoad {


    [super viewDidLoad];


    


    grounpData2 = @[].mutableCopy;


    self.automaticallyAdjustsScrollViewInsets = YES;


    


    self.view.backgroundColor = XYRBackgroundColor;


@@ -192,7 +192,7 @@


 */


-(void)creatData {


    


    grounpData2 = [NSArray arrayWithObjects:@"订单申诉",@"邀请有奖1",@"关于我们", nil];


    grounpData2 = [NSArray arrayWithObjects:@"订单申诉",@"邀请有奖1",@"关于我们", nil].mutableCopy;


}




- (void)bindTaoBaos {


@@ -993,13 +993,24 @@


                


            case 2: {


                // é‚€è¯·æœ‰å¥–


                if ([YTHsharedManger startManger].playingType == 1) {


                    // å…³äºŽæˆ‘们


                    XYRWebViewController *aboutWebVC=[[XYRWebViewController alloc] init];


                    aboutWebVC.url = [[NSUserDefaults standardUserDefaults] objectForKey:@"about"];


                    aboutWebVC.backToRedBag=^(){


                


                    };


                    aboutWebVC.hidesBottomBarWhenPushed=YES;


                    [self.navigationController pushViewController:aboutWebVC animated:YES];


                }else{


                MainInviteViewController *mianVC = [[MainInviteViewController alloc]init];


                


                mianVC.isMine = YES;


                mianVC.hidesBottomBarWhenPushed = YES;


                


                [self.navigationController pushViewController:mianVC animated:YES];


                }


               


            }


                break;


                


@@ -1066,8 +1077,14 @@


        return 1;


        


    } else {


        


        if ([YTHsharedManger startManger].playingType == 1) {


            if (grounpData2.count == 3) {


                [grounpData2 removeObject:@"邀请有奖1"];


            }


            return 3;


        }else{


        return 4;


        }


    }


}




@@ -1276,8 +1293,10 @@


        [cell.cellTitle setText:grounpData2[indexPath.row - 1]];


        


        if (indexPath.row == 2) {


            if ([YTHsharedManger startManger].playingType == 0) {


            [cell.cellTitle setText:@"邀请有奖"];


        }


        }


        return cell;


    }


    return nil;




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


@@ -318,10 +318,9 @@


        label.font = [UIFont systemFontOfSize:14];


    }


    label.text = @"今日预估";


    label.textColor = SJColor(164, 164, 164, 1);




    label.textAlignment = NSTextAlignmentRight;


//    [label sizeToFit];


    


    label.textColor = SJColor(98, 98, 98,1);


    [_teamView addSubview:label];


    UIImageView *image = [[UIImageView alloc]initWithFrame:CGRectMake(CGRectGetMaxX(label.frame)-5, CGRectGetMinY(label.frame) + 3, 30, 22)];


@@ -356,7 +355,7 @@


    }


    label.textAlignment = NSTextAlignmentRight;


    label.text = @"本月预估";


    label.textColor = SJColor(164, 164, 164, 1);


    label.textColor = SJColor(98, 98, 98, 1);


//    [label sizeToFit];


    [_teamView addSubview:label];


    


@@ -395,7 +394,7 @@


    }


    label.textAlignment = NSTextAlignmentRight;


    label.text = @"上月收入";


    label.textColor = SJColor(164, 164, 164, 1);


    label.textColor = SJColor(98, 98, 98, 1);


//    [label sizeToFit];


    [_teamView addSubview:label];


    




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


@@ -168,7 +168,7 @@


        return;


    }


    if ([self.balanText.text doubleValue] > [self.maxMoney doubleValue]) {


        NSString * string = [NSString stringWithFormat:@"单笔提现不低于%@元",self.maxMoney];


        NSString * string = [NSString stringWithFormat:@"单笔提现不高于%@元",self.maxMoney];


        ALToastBottom(string);


        return;


    }