1.修复镜像升级成功后台会前台。显示成功界面在密码界面上

2.修复镜像升级成功界面有多个问题

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

@@ -6214,7 +6214,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6293,7 +6293,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

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

@@ -53,6 +53,8 @@
     NSInteger tryLinkNum;
     
     imageVersionRenewTipView * RenewTipView;
+    imageVersionUpdateDoneView* imageVersionUpdateDoneV;
+    imageVersionUpdateFailView* imageVersionUpdateFailV;
 }
 @property (nonatomic,strong)UITableView*tableView;
 
@@ -1055,16 +1057,30 @@
 #pragma mark 弹框流程 1 OTA升级完成
 - (void)OTAUpdateDoneFun
 {
+    //密码框界面 拦着 不给弹出
+    if(ksharedAppDelegate.isDidShowPwdType){
+        KWeakSelf
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf  OTAUpdateDoneFun];
+        });
+        return;
+    }
+    
     [RenewTipView removeFromSuperview];
     RenewTipView = nil;
     
+    if (imageVersionUpdateDoneV) {
+        [imageVersionUpdateDoneV removeFromSuperview];
+        imageVersionUpdateDoneV = nil;
+    }
+    
     //显示OTA完成页面
-    imageVersionUpdateDoneView* curView = [[imageVersionUpdateDoneView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
-    [ksharedAppDelegate.window addSubview:curView];
+    imageVersionUpdateDoneV = [[imageVersionUpdateDoneView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
+    [ksharedAppDelegate.window addSubview:imageVersionUpdateDoneV];
     //[self.view bringSubviewToFront:curView];
     
     KWeakSelf
-    curView.didClickUpdateDoneFun = ^{
+    imageVersionUpdateDoneV.didClickUpdateDoneFun = ^{
         [weakSelf closeOTAUpdateDoneFun];
     };
     
@@ -1073,18 +1089,32 @@
 #pragma mark 弹框流程 1 OTA升级失败
 - (void)OTAUpdateFailFun
 {
+    //密码框界面 拦着 不给弹出
+    if(ksharedAppDelegate.isDidShowPwdType){
+        KWeakSelf
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf  OTAUpdateFailFun];
+        });
+        return;
+    }
+    
     if(RenewTipView){
         [RenewTipView removeFromSuperview];
         RenewTipView = nil;
     }
     
+    if (imageVersionUpdateFailV) {
+        [imageVersionUpdateFailV removeFromSuperview];
+        imageVersionUpdateFailV = nil;
+    }
+    
     //显示OTA完成页面
-    imageVersionUpdateFailView* curView = [[imageVersionUpdateFailView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
-    [ksharedAppDelegate.window addSubview:curView];
+    imageVersionUpdateFailV = [[imageVersionUpdateFailView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
+    [ksharedAppDelegate.window addSubview:imageVersionUpdateFailV];
     //[self.view bringSubviewToFront:curView];
     
     KWeakSelf
-    curView.didClickUpdateDoneFun = ^{
+    imageVersionUpdateFailV.didClickUpdateDoneFun = ^{
         [weakSelf closeOTAUpdateDoneFun];
     };