浏览代码

1.镜像升级弹框不出现问题修复

huangxiaodong 10 月之前
父节点
当前提交
c52c1cdc62

+ 4 - 4
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -5459,7 +5459,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5542,7 +5542,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5740,7 +5740,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5821,7 +5821,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (

+ 28 - 3
创维盒子/双子星云手机/NAS/NASViewController.m

@@ -424,6 +424,16 @@
     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;
+            }
+            
             [self userDidClickUploadViewFun];
         }
             break;
@@ -474,6 +484,16 @@
         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)
     {
@@ -882,13 +902,18 @@
 - (void)showImageViewRenewTipViewFun
 {
     //密码框界面 拦着 不给弹出
-    if(![connectDeviceManager shareInstance].isFirstInputPwdDone){
-        didGetSysInfoType = NO;
+    if(ksharedAppDelegate.isDidShowPwdType){
+        //didGetSysInfoType = NO;
+        KWeakSelf
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf  showImageViewRenewTipViewFun];
+        });
+        
         return;
     }
     
     imageVersionRenewTipView * RenewTipView = [[imageVersionRenewTipView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
-    [[iTools getKeyWindow] addSubview:RenewTipView];
+    [ksharedAppDelegate.window addSubview:RenewTipView];
     //[self.view bringSubviewToFront:RenewTipView];
 }
 

+ 2 - 1
创维盒子/双子星云手机/cloudPhone/websocket/webSocketManager.m

@@ -717,7 +717,7 @@ static webSocketManager *webSocketManagerInstance = nil;
 
 - (void)getCouldPhoneSysInfoResponseFun:(NSDictionary *)dataDict{
     couldphoneSysInfoModel *model = [[couldphoneSysInfoModel alloc] initWithDictionary:dataDict error:nil];
-    [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];
+    //[[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];
         
     NSString *hostImgVer = model.data.data.hostImgVer;
     NSString *MyNewVersion = model.data.data.MyNewVersion;
@@ -787,6 +787,7 @@ static webSocketManager *webSocketManagerInstance = nil;
         }
     }
     
+    [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];
 }
 
 - (void)getCouldPhoneTvStatusResponseFun:(NSDictionary *)dataDict