1.屏蔽扫码SN长度的判断

2.去掉关于传输的镜像版本号相关的判断

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

@@ -24,8 +24,8 @@
 @property (nonatomic, strong)cloudPhoneExtraFileListModel* cloudPhoneExtraFileListMod;
 //@property (nonatomic, strong)couldPhoneBaseInfoModel *couldPhoneBaseInfoMod;
 @property (nonatomic, assign)BOOL getSystemPermissType;//主动获取权限进入后台
-@property (nonatomic, assign)BOOL DisabledFileTransferType;//禁用文件传输
-@property (nonatomic, assign)BOOL isImageNewFor130;//1.3.0的镜像是否待更新
+//@property (nonatomic, assign)BOOL DisabledFileTransferType;//禁用文件传输
+//@property (nonatomic, assign)BOOL isImageNewFor130;//1.3.0的镜像是否待更新
 @property (nonatomic, assign)BOOL isNeedShowImageNewType;//是否需要显示镜像强制更新
 
 @property (nonatomic, assign)BOOL isWebSockLinkOKAginType;//WebSock断开后或者链接上了

创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -113,10 +113,10 @@ isBangsScreen; \
 //#define CloudService   @""
 
 //预生产环境
-#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
+//#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
 
 //生产环境 1.4.3 开始使用
-//#define CloudService   @"http://cloud.sgbox.ai"
+#define CloudService   @"http://cloud.sgbox.ai"
 
 
 

创维盒子/双子星云手机/Class/Guide/QRCodeScanViewController.m

@@ -281,10 +281,11 @@ bool isDownType = YES;
     //Ch0IKJCY9lOgokjfPBFE1cowdC1+tj7ywB2pZgSzjhc=
     //sgl5OzDoVjY5SmGuL50/EnQ4n6Kw+DzRiE1oUjq7yAM=
     //BT80240900050aac5bd5a23dd7cc
-    if (([resStr containsString:@"RK"] && (resStr.length == @"RK3908P1V62112465".length))
-        || resStr.length == @"0333933700223250017273".length
-        || resStr.length == @"BT80240900050aac5bd5a23dd7cc".length
-         ){
+//    if (([resStr containsString:@"RK"] && (resStr.length == @"RK3908P1V62112465".length))
+//        || resStr.length == @"0333933700223250017273".length
+//        || resStr.length == @"BT80240900050aac5bd5a23dd7cc".length
+//         )
+    {
         
         [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_ok",nil)] show];
         [_scanLineTimer  invalidate];
@@ -300,9 +301,9 @@ bool isDownType = YES;
         //移除扫描层layer
         [self.layer removeFromSuperlayer];
     }
-    else{
-        [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_error",nil)] show];
-    }
+//    else{
+//        [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_error",nil)] show];
+//    }
 
 }
 

创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.m

@@ -297,10 +297,11 @@ bool isDownType22 = YES;
     //Ch0IKJCY9lOgokjfPBFE1cowdC1+tj7ywB2pZgSzjhc=
     //sgl5OzDoVjY5SmGuL50/EnQ4n6Kw+DzRiE1oUjq7yAM=
     
-    if (([resStr containsString:@"RK"] && (resStr.length == @"RK3908P1V62112465".length))
-        || resStr.length == @"0333933700223250017273".length
-        || resStr.length == @"BT80240900050aac5bd5a23dd7cc".length
-         ){
+//    if (([resStr containsString:@"RK"] && (resStr.length == @"RK3908P1V62112465".length))
+//        || resStr.length == @"0333933700223250017273".length
+//        || resStr.length == @"BT80240900050aac5bd5a23dd7cc".length
+//         )
+    {
         
         NSDictionary *deviceDict = [HWDataManager getObjectWithKey:Const_Have_Add_Device];
         if (!deviceDict || [[deviceDict allKeys] containsObject:Const_Have_Add_Device_SN]){
@@ -333,9 +334,9 @@ bool isDownType22 = YES;
         [self getScanSnMsgBy:resStr withDict:deviceDict];
         
     }
-    else{
-        [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_error",nil)] show];
-    }
+//    else{
+//        [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_error",nil)] show];
+//    }
 }
 
 #pragma mark 根据扫码得到的SN 重新获取信息
@@ -379,8 +380,8 @@ bool isDownType22 = YES;
                     //清除原来设置的数据
                     ksharedAppDelegate.isWebSockLinkOKAginType = NO;
                     ksharedAppDelegate.cloudPhoneExtraFileListMod = nil;
-                    ksharedAppDelegate.DisabledFileTransferType = NO;
-                    ksharedAppDelegate.isImageNewFor130 = NO;
+//                    ksharedAppDelegate.DisabledFileTransferType = NO;
+//                    ksharedAppDelegate.isImageNewFor130 = NO;
                     ksharedAppDelegate.isNeedShowImageNewType = NO;
                     ksharedAppDelegate.TvStatusMod = nil;
                     ksharedAppDelegate.NASMsgMod = nil;

创维盒子/双子星云手机/Class/Set/previewFile/backupsOptionViewController.m

@@ -275,15 +275,15 @@
     
     if(!haveOpenBackups){
         
-        if(ksharedAppDelegate.DisabledFileTransferType){
-            if(ksharedAppDelegate.isImageNewFor130){
-                [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-            }
-            else{
-                [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-            }
-            return;
-        }
+//        if(ksharedAppDelegate.DisabledFileTransferType){
+//            if(ksharedAppDelegate.isImageNewFor130){
+//                [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//            }
+//            else{
+//                [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//            }
+//            return;
+//        }
         
         if(!ksharedAppDelegate.isWebSockLinkOKAginType){
             [[iToast makeText:NSLocalizedString(@"check_could_phone_state",nil)] show];

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/backupsFileManager.m

@@ -60,9 +60,9 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
         return;
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        return;
+//    }
     
     //相册权限
     if (![[TZImageManager manager] authorizationStatusAuthorized]){

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadManager.m

@@ -101,16 +101,16 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        if(ksharedAppDelegate.isImageNewFor130){
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-        }
-        complete(_databaseArr);
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        if(ksharedAppDelegate.isImageNewFor130){
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//        }
+//        complete(_databaseArr);
+//        return;
+//    }
     
     for (couldPhoneFileModel*model in indexPathsForSelectedItems) {
         model.bg_tableName = download_tableName;
@@ -205,15 +205,15 @@ static downloadManager * cur_downloadManager = nil;
         
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        if(ksharedAppDelegate.isImageNewFor130){
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-        }
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        if(ksharedAppDelegate.isImageNewFor130){
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//        }
+//        return;
+//    }
     
     self.taskRenewTime = [iTools getNowTimeStamp];
     

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m

@@ -113,17 +113,17 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         return;
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        if(ksharedAppDelegate.isImageNewFor130){
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-        }
-        
-        complete(_databaseArr);
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        if(ksharedAppDelegate.isImageNewFor130){
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//        }
+//        
+//        complete(_databaseArr);
+//        return;
+//    }
     
     if(!_fileModelDataArr){
         _fileModelDataArr = [NSMutableArray new];
@@ -263,15 +263,15 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        if(ksharedAppDelegate.isImageNewFor130){
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-        }
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        if(ksharedAppDelegate.isImageNewFor130){
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//        }
+//        return;
+//    }
     
     if(_isSuspendType)
     {

创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m

@@ -762,15 +762,15 @@
         
         if(!haveOpenBackups){
             
-            if(ksharedAppDelegate.DisabledFileTransferType){
-                if(ksharedAppDelegate.isImageNewFor130){
-                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-                }
-                else{
-                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-                }
-                return;
-            }
+//            if(ksharedAppDelegate.DisabledFileTransferType){
+//                if(ksharedAppDelegate.isImageNewFor130){
+//                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//                }
+//                else{
+//                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//                }
+//                return;
+//            }
             
             if(!ksharedAppDelegate.isWebSockLinkOKAginType){
                 [[iToast makeText:NSLocalizedString(@"check_could_phone_state",nil)] show];

创维盒子/双子星云手机/NAS/NASViewController.m

@@ -427,15 +427,15 @@
     switch (tag) {
         case 1:
         {
-            if(ksharedAppDelegate.DisabledFileTransferType){
-                if(ksharedAppDelegate.isImageNewFor130){
-                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-                }
-                else{
-                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-                }
-                return;
-            }
+//            if(ksharedAppDelegate.DisabledFileTransferType){
+//                if(ksharedAppDelegate.isImageNewFor130){
+//                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//                }
+//                else{
+//                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//                }
+//                return;
+//            }
             
             [self userDidClickUploadViewFun];
         }
@@ -487,15 +487,15 @@
 //        return;
 //    }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        if(ksharedAppDelegate.isImageNewFor130){
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-        }
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        if(ksharedAppDelegate.isImageNewFor130){
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//        }
+//        return;
+//    }
     
     tryLinkNum = 0;
     switch (tag)

创维盒子/双子星云手机/NAS/nasBackupsManager/nasBackupsManager.m

@@ -49,9 +49,9 @@
         return;
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        return;
+//    }
     
     //相册权限
     if (![[TZImageManager manager] authorizationStatusAuthorized]){

创维盒子/双子星云手机/NAS/nasBackupsManager/nasMixBackupsManager.m

@@ -98,15 +98,15 @@
         
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        if(ksharedAppDelegate.isImageNewFor130){
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-        }
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        if(ksharedAppDelegate.isImageNewFor130){
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//        }
+//        return;
+//    }
     
     @synchronized (self) {
         if(self.uploadingOperationArr.count == _maxUploadLoadCount){

创维盒子/双子星云手机/NAS/nasUploadManager/nasMixUploadManager.m

@@ -93,15 +93,15 @@
         
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        if(ksharedAppDelegate.isImageNewFor130){
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-        }
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        if(ksharedAppDelegate.isImageNewFor130){
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//        }
+//        return;
+//    }
     
     
     if(operation){

创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadFileManager.m

@@ -102,17 +102,17 @@
         return;
     }
     
-    if(ksharedAppDelegate.DisabledFileTransferType){
-        if(ksharedAppDelegate.isImageNewFor130){
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
-        }
-        else{
-            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
-        }
-        
-        complete(_databaseArr);
-        return;
-    }
+//    if(ksharedAppDelegate.DisabledFileTransferType){
+//        if(ksharedAppDelegate.isImageNewFor130){
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+//        }
+//        else{
+//            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+//        }
+//        
+//        complete(_databaseArr);
+//        return;
+//    }
     
     _isNewAddTaskType = YES;
     

创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -326,33 +326,33 @@
     }
     
     //是否禁用文件传输 （1.3以及以上的镜像可以使用文件传输）
-    if(versionArr.count >= 3)
-    {
-        NSString * oneStr = versionArr[0];
-        NSString * twoStr = versionArr[1];
-        NSString * threeStr = versionArr[2];
-
-        if(oneStr.integerValue <=1 && twoStr.integerValue <=3 && threeStr.integerValue <=0){//禁用
-            ksharedAppDelegate.DisabledFileTransferType = YES;
-            
-            if(MyNewVersionArr.count >= 3)
-            {
-                NSString * newOneStr = MyNewVersionArr[0];
-                NSString * newTwoStr = MyNewVersionArr[1];
-                NSString * newThreeStr = MyNewVersionArr[2];
-                
-                if(newOneStr.integerValue >=1 && newTwoStr.integerValue >=3 && newThreeStr.integerValue >= 1){
-                    ksharedAppDelegate.isImageNewFor130 = YES;
-                }
-                else{
-                    ksharedAppDelegate.isImageNewFor130 = NO;
-                }
-            }
-        }
-        else{
-            ksharedAppDelegate.DisabledFileTransferType = NO;
-        }
-    }
+//    if(versionArr.count >= 3)
+//    {
+//        NSString * oneStr = versionArr[0];
+//        NSString * twoStr = versionArr[1];
+//        NSString * threeStr = versionArr[2];
+//
+//        if(oneStr.integerValue <=1 && twoStr.integerValue <=3 && threeStr.integerValue <=0){//禁用
+//            ksharedAppDelegate.DisabledFileTransferType = YES;
+//            
+//            if(MyNewVersionArr.count >= 3)
+//            {
+//                NSString * newOneStr = MyNewVersionArr[0];
+//                NSString * newTwoStr = MyNewVersionArr[1];
+//                NSString * newThreeStr = MyNewVersionArr[2];
+//                
+//                if(newOneStr.integerValue >=1 && newTwoStr.integerValue >=3 && newThreeStr.integerValue >= 1){
+//                    ksharedAppDelegate.isImageNewFor130 = YES;
+//                }
+//                else{
+//                    ksharedAppDelegate.isImageNewFor130 = NO;
+//                }
+//            }
+//        }
+//        else{
+//            ksharedAppDelegate.DisabledFileTransferType = NO;
+//        }
+//    }
     
     [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];
 }