1.云机---进入云手机改为大按钮

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -273,96 +273,96 @@
     [boxDownloadFileManager shareInstance];
     
     //获取NAS相关信息
-//    [self getNASMsgFun];
-//    
-//    [self initMainTabbarFun];
-//    
-//    return;
+    [self getNASMsgFun];
     
-    if(_curPlayerVC){
-        //[_curPlayerVC disconnectVideoServer];
-        
-        _curPlayerVC.isNeedRecyclResource = YES;
-        [_curPlayerVC recyclResource];
-        
-        _curPlayerVC.liveStreamManager = nil;
-        [_curPlayerVC.navigationController popViewControllerAnimated:NO];
-        _curPlayerVC = nil;
-    }
+    [self initMainTabbarFun];
     
-    //每次进入
-    PlayerViewController *playerRootVC = [[PlayerViewController alloc] init];
-    if(self.isLoginAgainType){
-        playerRootVC.isLoginAgainType = self.isLoginAgainType;
-    }
-    playerRootVC.isPwdVCShow = YES;
-    _curPlayerVC = playerRootVC;
+    return;
     
-//    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
+//    if(_curPlayerVC){
+//        //[_curPlayerVC disconnectVideoServer];
+//        
+//        _curPlayerVC.isNeedRecyclResource = YES;
+//        [_curPlayerVC recyclResource];
+//        
+//        _curPlayerVC.liveStreamManager = nil;
+//        [_curPlayerVC.navigationController popViewControllerAnimated:NO];
+//        _curPlayerVC = nil;
+//    }
+//    
+//    //每次进入
+//    PlayerViewController *playerRootVC = [[PlayerViewController alloc] init];
+//    if(self.isLoginAgainType){
+//        playerRootVC.isLoginAgainType = self.isLoginAgainType;
+//    }
+//    playerRootVC.isPwdVCShow = YES;
+//    _curPlayerVC = playerRootVC;
+//    
+////    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
+////    self.window.rootViewController = playerNav;
+//    
+//    UIViewController *vc = [UIViewController new];
+//
+//    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:vc];
+//    [playerNav pushViewController:playerRootVC animated:NO];
 //    self.window.rootViewController = playerNav;
-    
-    UIViewController *vc = [UIViewController new];
-
-    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:vc];
-    [playerNav pushViewController:playerRootVC animated:NO];
-    self.window.rootViewController = playerNav;
-    
-    _preRootPlayerNav = playerNav;
-    
-    self.isLoginAgainType = NO;
-    
-    __block BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
-    
-    KWeakSelf
-    if(!_isQRCodeType){
-        
-        if(isPrivacyMode)
-        {
-            [playerRootVC setShowImgAndVoiceTypeFun:NO];
-            [self showCalculatorVC];
-        }
-        else{
-            [self HandleEnterNotPrivacyModeFun];
-            
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                mainBlock(^{
-                        [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
-                        playerRootVC.isPwdVCShow = NO;
-                        [playerRootVC setShowImgAndVoiceTypeFun:YES];
-                        //[weakSelf shareAwakenAppBy:weakSelf.getShareStr];
-                    
-                        if(self->_session && self->_connectionOptions){
-                            [self scene:self->_session openURLContexts:self->_connectionOptions.URLContexts];
-                        }
-                });
-            });
-        }
-        
-        //_isQRCodeType = NO;
-    }
-    else{
-        if(isPrivacyMode)
-        {
-            [playerRootVC setShowImgAndVoiceTypeFun:NO];
-            [self showCalculatorVC];
-        }
-        else{
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                mainBlock(^{
-                    playerRootVC.isPwdVCShow = NO;
-                    [playerRootVC setShowImgAndVoiceTypeFun:YES];
-                });
-            });
-        }
-        
-    }
-    
-    _isQRCodeType = NO;
-    
-    //获取NAS相关信息
-    [self getNASMsgFun];
-    
-    [self initMainTabbarFun];
+//    
+//    _preRootPlayerNav = playerNav;
+//    
+//    self.isLoginAgainType = NO;
+//    
+//    __block BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
+//    
+//    KWeakSelf
+//    if(!_isQRCodeType){
+//        
+//        if(isPrivacyMode)
+//        {
+//            [playerRootVC setShowImgAndVoiceTypeFun:NO];
+//            [self showCalculatorVC];
+//        }
+//        else{
+//            [self HandleEnterNotPrivacyModeFun];
+//            
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                mainBlock(^{
+//                        [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
+//                        playerRootVC.isPwdVCShow = NO;
+//                        [playerRootVC setShowImgAndVoiceTypeFun:YES];
+//                        //[weakSelf shareAwakenAppBy:weakSelf.getShareStr];
+//                    
+//                        if(self->_session && self->_connectionOptions){
+//                            [self scene:self->_session openURLContexts:self->_connectionOptions.URLContexts];
+//                        }
+//                });
+//            });
+//        }
+//        
+//        //_isQRCodeType = NO;
+//    }
+//    else{
+//        if(isPrivacyMode)
+//        {
+//            [playerRootVC setShowImgAndVoiceTypeFun:NO];
+//            [self showCalculatorVC];
+//        }
+//        else{
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                mainBlock(^{
+//                    playerRootVC.isPwdVCShow = NO;
+//                    [playerRootVC setShowImgAndVoiceTypeFun:YES];
+//                });
+//            });
+//        }
+//        
+//    }
+//    
+//    _isQRCodeType = NO;
+//    
+//    //获取NAS相关信息
+//    [self getNASMsgFun];
+//    
+//    [self initMainTabbarFun];
 }
 
 #pragma mark 1.4.1 新增tabbar

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -251,7 +251,7 @@ UIDocumentPickerDelegate>
     HLog(@"瑞云连接状态:%d",[[connectDeviceManager shareInstance] curConnectDeviceState]);
     
     //第一次进 先输入密码才能连接
-    if([connectDeviceManager shareInstance].isFirstInputPwdDone){
+    //if([connectDeviceManager shareInstance].isFirstInputPwdDone){
         if([connectDeviceManager shareInstance].isPingOk
            && [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWiFi){
             ip = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.ip;
@@ -265,7 +265,7 @@ UIDocumentPickerDelegate>
                 [self didCanConnectServerFun];
             }
         }
-    }
+    //}
     
     
 }

创维盒子/双子星云手机/cloudPhone/cloudPhoneViewController.m

@@ -7,6 +7,7 @@
 
 #import "cloudPhoneViewController.h"
 #import "cloudPhoneSetView.h"
+#import "PlayerViewController.h"
 
 @interface cloudPhoneViewController ()
 @property (nonatomic,strong) cloudPhoneSetView *cloudPhoneSetV;
@@ -125,14 +126,14 @@
     
     [enterCloudPhoneButton.layer addSublayer:gl];
     [enterCloudPhoneButton setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
-    [enterCloudPhoneButton addTarget:self action:@selector(didClickButtonFun:) forControlEvents:(UIControlEventTouchUpInside)];
+    //[enterCloudPhoneButton addTarget:self action:@selector(didClickButtonFun:) forControlEvents:(UIControlEventTouchUpInside)];
     [enterCloudPhoneButton setTitle:NSLocalizedString(@"cloudPhone_enter_tip",nil) forState:(UIControlStateNormal)];
     [enterCloudPhoneButton.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
     [enterCloudPhoneButton.layer setCornerRadius:21.f];
     enterCloudPhoneButton.layer.borderWidth = 1.5;
     enterCloudPhoneButton.layer.borderColor = [UIColor whiteColor].CGColor;
     enterCloudPhoneButton.clipsToBounds = YES;
-    enterCloudPhoneButton.tag = 2;
+    //enterCloudPhoneButton.tag = 2;
     [midImageV addSubview:enterCloudPhoneButton];
 
     [enterCloudPhoneButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -141,6 +142,22 @@
         make.centerX.mas_equalTo(0);
         make.bottom.equalTo(midImageV.mas_bottom).offset(-60);
     }];
+    
+    //扩大金融云机范围按钮
+    UIButton *bigButton = [[UIButton alloc] init];
+    bigButton.tag = 2;
+    [bigButton addTarget:self action:@selector(didClickButtonFun:) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:bigButton];
+    //bigButton.backgroundColor = [UIColor greenColor];
+    
+    [bigButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        
+        make.top.equalTo(midImageV.mas_top).offset(0);
+        make.right.equalTo(midImageV.mas_right).offset(0);
+        make.left.equalTo(midImageV.mas_left).offset(0);
+        make.bottom.equalTo(midImageV.mas_bottom).offset(0);
+    
+    }];
 }
 
 #pragma mark 点击按钮
@@ -174,8 +191,8 @@
             break;
         case 2:
         {
-//            uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
-//            [self pushViewController:vc animated:YES];
+            PlayerViewController *vc = [PlayerViewController new];
+            [self pushViewController:vc animated:YES];
         }
             break;
             
@@ -294,7 +311,7 @@
     
     /*弹窗提示恢复出厂*/
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_Restore_Factory_ok_tips",nil)
-                                                                                     msg:NSLocalizedString(@"my_set_no_Restore_Factory_ok_msg",nil)
+                                                                                     msg:@""//NSLocalizedString(@"my_set_no_Restore_Factory_ok_msg",nil)
                                                                                 imageStr:nil
                                                                              cancelTitle:NSLocalizedString(@"my_set_no_Restore_FactoryOK",nil)
                                                                                  okTitle:nil