Merge branch 'master' of ssh://193.112.35.168:29418/fanliquan

重庆迈尖科技有限公司

2018-08-20 315dc27a933743130c38558af3ed090f9d04f9bd

Merge branch 'master' of ssh://193.112.35.168:29418/fanliquan

# Conflicts:
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

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

Binary files differ

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

@@ -4,108 +4,18 @@
   version = "2.0">
   <Breakpoints>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "No"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            scope = "0"
            stopOnStyle = "0">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x4f18;&#x60e0;&#x5238;/classificationViewController.m"
            timestampString = "555908948.249001"
            filePath = "MIduo/&#x754c;&#x9762;/&#x9080;&#x8bf7;/&#x5546;&#x54c1;&#x5206;&#x4eab;/ShonpingShareViewController.m"
            timestampString = "555988233.959499"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "275"
            endingLineNumber = "275"
            landmarkName = "-childViewController:forIndex:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x52a8;&#x6001;/DynamicViewController.m"
            timestampString = "556172363.6755069"
            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;/messageLogin/MessageLoginViewController.m"
            timestampString = "556193788.808499"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "415"
            endingLineNumber = "415"
            landmarkName = "-sendMessage:"
            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;/&#x6211;&#x7684;/MineViewController.m"
            timestampString = "556193788.808673"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "1149"
            endingLineNumber = "1149"
            landmarkName = "-tableView:cellForRowAtIndexPath:"
            startingLineNumber = "51"
            endingLineNumber = "51"
            landmarkName = "-back:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>

 MIduo/½çÃæ/ÑûÇë/MainInviteViewController.m

@@ -37,6 +37,8 @@

@property (nonatomic, strong) NSAttributedString *attributedString;

@property (nonatomic, copy) NSString *series;

@property (nonatomic, strong) UIView *primtView;
@property (nonatomic, strong) UILabel *primtTitle;
@property (nonatomic, strong) UILabel *primtContent;
@@ -50,11 +52,9 @@
- (void)viewDidLoad {
    [super viewDidLoad];
    
    self.automaticallyAdjustsScrollViewInsets = NO;
    [self navBarConfig];
    
    self.navigationController.title = @"邀请有奖";
    
    self.view.backgroundColor = XYRBackgroundColor;
    [self dataCarType];
    
    self.pageIndex = 1;
    
@@ -70,20 +70,37 @@
    
    if (!self.isMine) {
        
        [self.navigationController setNavigationBarHidden:YES animated:animated];
        
    } else {
        self.title = @"邀请有奖";
        [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];
        // é‡å†™button
        UIButton *backbutton = [UIButton buttonWithType:UIButtonTypeCustom];
        backbutton.frame=CGRectMake(0, 0, 30, 30);
        [backbutton setImage:[UIImage imageNamed:@""] forState:UIControlStateNormal];
        self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backbutton];
    }
    
    [self.viewModel.requestRemotetCommand execute:nil];
}

- (void)navBarConfig {
    
    self.automaticallyAdjustsScrollViewInsets = NO;
    self.navigationController.navigationBar.translucent = NO;
    
    self.navigationController.title = @"邀请有奖";
    
    self.view.backgroundColor = XYRBackgroundColor;
    
    // è®¾ç½®å¯¼èˆªæ é¢œè‰²
    self.navigationController.navigationBar.barTintColor = YTHColor(229, 0, 92);
    //去掉透明后导航栏下边的黑边
    [self.navigationController.navigationBar setShadowImage:[[UIImage alloc] init]];
    
    self.navigationController.navigationBar.titleTextAttributes=@{NSForegroundColorAttributeName:[UIColor whiteColor],NSFontAttributeName:[UIFont boldSystemFontOfSize:17]};
}

- (void)viewWillDisappear:(BOOL)animated {
    [super viewWillDisappear:animated];
    
    [self.navigationController setNavigationBarHidden:NO animated:animated];
    //    [self.navigationController setNavigationBarHidden:NO animated:animated];
}

- (void)bindViewModel {
@@ -363,34 +380,20 @@
    if (!_tableView) {
        
        CGRect rect;
        NSInteger height;
        
        if (self.isMine) {
            
            height = 0;
            
            rect.size.height = SCREEN_HEIGHT - kNavigationBarH - kStatusBarH;
            
        } else {
            
            height = -20;
            
            if (IsiPhoneX) {
                
                height = -44;
                
            } else if (IS_IPHONE_5) {
                
                height = 0;
            }
            
             rect.size.height = SCREEN_HEIGHT - kToolBarH - height;
            rect.size.height = SCREEN_HEIGHT - kToolBarH - kStatusBarH - kNavigationBarH;
        }
        
        rect.origin.x = 0;
        rect.origin.y = height;
        rect.origin.y = 0;
        rect.size.width = SCREEN_WIDTH;
       
        
        _tableView = [[UITableView alloc] initWithFrame:rect
                                                  style:UITableViewStyleGrouped];
        _tableView.delegate = self;
@@ -454,6 +457,18 @@
    return _viewModel;
}

- (void)viewDidAppear:(BOOL)animated {
    
    self.navigationItem.title = self.series;
}

- (void)dataCarType {
    
    self.series = @"邀请有奖";
    
    [self viewDidAppear:YES];
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.

 MIduo/½çÃæ/ÑûÇë/ÑûÇëºÃÓÑ/InvitationFriendsViewController.m

@@ -51,13 +51,16 @@
}

- (void)back:(UIButton *)sender {
    
    [SVProgressHUD dismiss];
    [self.navigationController popViewControllerAnimated:YES];
}
- (void)viewDidLoad {
    [super viewDidLoad];
    
    self.title = @"邀请好友";
    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent
                                                animated:YES];
    
    self.isChangeColor = NO;
    [self changeWIthDataLodingInviteButton];