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

重庆迈尖科技有限公司

2018-08-14 d3509ba1cebcc1cb58b086dbf0589d8e2b2edbbd

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

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

 MIduo/AppDelegate.m

@@ -328,6 +328,8 @@
        [[NSNotificationCenter defaultCenter] postNotificationName:@"isEnterForeground" object:nil];
    }

    [[NSNotificationCenter defaultCenter] postNotificationName:@"fromBackGround" object:nil];

}

- (void)boardcheck{

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

@@ -343,13 +343,11 @@
        return ;
    }
    if ([YTHsharedManger startManger].networkStatus == 0) {
 
        [CustomProgressHUD showNormal:@"网络未连接，请检测网络设置"];
        ALToastCenter(@"网络未连接，请检测网络设置");
        return;
    }
    if ([YTHsharedManger startManger].isCheckNetCanUse == -2) {

        [CustomProgressHUD showNormal:@"网络连接异常，请检测网络设置"];
        ALToastCenter(@"网络连接异常，请检测网络设置");
        return ;
    }
    [YTHsharedManger startManger].isBound = NO;
@@ -413,8 +411,8 @@
 */
- (BOOL)agreenPrimt{
    if (!self.isSelect) {
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showInfoWithStatus:@"请阅读并同意用户协议及隐私条款"];

        ALToastCenter(@"请阅读并同意用户协议及隐私条款");
        return NO;
    }
    return YES;
@@ -428,12 +426,13 @@
- (IBAction)clickAgreement:(id)sender {
    if ([YTHsharedManger startManger].networkStatus == 0) {

         [CustomProgressHUD showNormal:@"网络未连接，请检测网络设置"];
        ALToastCenter(@"网络未连接，请检测网络设置");

        return;
    }
    if ([YTHsharedManger startManger].isCheckNetCanUse == -2) {
       
         [CustomProgressHUD showNormal:@"网络连接异常，请检测网络设置"];
        ALToastCenter(@"网络连接异常，请检测网络设置");

        return ;
    }
    XYRWebViewController *aboutWebVC=[[XYRWebViewController alloc] init];
@@ -498,8 +497,8 @@
            [SVProgressHUD showSuccessWithStatus:BIND_SUCCESS];
        }else
        {
            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
            [SVProgressHUD showErrorWithStatus:object[@"msg"]];

            ALToastCenter(object[@"msg"]);
        }
    } fail:^(id object) {
        

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

@@ -96,11 +96,12 @@
            [SVProgressHUD showSuccessWithStatus:BIND_REMOVE_SUCCESS];
            [self.navigationController popViewControllerAnimated:YES];
        }else{
            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
            [SVProgressHUD showErrorWithStatus:object[@"msg"]];
//            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
//            [SVProgressHUD showErrorWithStatus:object[@"msg"]];
            ALToastCenter(object[@"msg"]);
        }
    } fail:^(id object) {
        [SVProgressHUD showErrorWithStatus:object];
//        [SVProgressHUD showErrorWithStatus:object];
    }];
}


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

@@ -42,6 +42,7 @@
    
    //创建红包列表
    [self.view addSubview:self.settingTableView];
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fromBack:) name:@"fromBackGround" object:nil];
}

/**
@@ -77,7 +78,11 @@
    }
    return _settingTableView;
}

- (void)fromBack:(NSNotification *)notice{
    if (self.settingTableView) {
        [self.settingTableView reloadData];
    }
}

/**
 å…³é—­æˆ–开启通知
@@ -184,11 +189,11 @@
            
            if ([self isAllowedNotification]) {
                
                [cell.switchButton setOn:NO];
                [cell.switchButton setOn:YES];
                
            }else{
                
                [cell.switchButton setOn:YES];
                [cell.switchButton setOn:NO];
            }
            return cell;
        }

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

@@ -69,8 +69,7 @@
    
    if (self.textfield.text.length == 0) {
        
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showInfoWithStatus:@"请输入您的订单号"];
        ALToastCenter(@"请输入您的订单号");

        return;
    }
@@ -89,21 +88,16 @@
        
        if ([dic[@"state"] integerValue] == 0) {
            
            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
            [SVProgressHUD showSuccessWithStatus:dic[@"info"]];
            
            ALToastCenter(dic[@"info"]);
        } else {
            
            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
            [SVProgressHUD showInfoWithStatus:dic[@"info"]];

            ALToastCenter(dic[@"info"]);

        }
        
    } fail:^(id object) {
        
        NSString *Error = [object localizedDescription];
        [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
        [SVProgressHUD showInfoWithStatus:Error];
        NSLog(@"%@",Error);

    }];
}


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

@@ -389,8 +389,7 @@
            
        } else {
            
            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
            [SVProgressHUD showErrorWithStatus:object[@"msg"]];
            ALToastCenter(object[@"msg"]);
        }
    } fail:^(id object) {
        
@@ -469,14 +468,12 @@
                       dispatch_resume(_timer);
                   }  else {
                       
                       [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
                       [SVProgressHUD showErrorWithStatus:object[@"msg"]];

                       ALToastCenter(object[@"msg"]);
                   }
                   
               } fail:^(id object) {
                   
                   [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
                   [SVProgressHUD showErrorWithStatus:object];
               }];
    
}