输入密码界面弹窗新手引导弹窗

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

@@ -1066,8 +1066,10 @@
         return;
     }
     
-    [RenewTipView removeFromSuperview];
-    RenewTipView = nil;
+    if(RenewTipView){
+        [RenewTipView removeFromSuperview];
+        RenewTipView = nil;
+    }
     
     if (imageVersionUpdateDoneV) {
         [imageVersionUpdateDoneV removeFromSuperview];
@@ -1263,6 +1265,15 @@
         return;
     }
     
+    //密码框界面 拦着 不给弹出
+    if(ksharedAppDelegate.isDidShowPwdType){
+        KWeakSelf
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf  showNewerGuideFun];
+        });
+        return;
+    }
+    
     newerGuideView *guideView =  [[newerGuideView alloc] init];
     [ksharedAppDelegate.window addSubview:guideView];
     
@@ -1343,6 +1354,15 @@
 
 - (void)showHaveNoticeViewBy:(noticeModel*)model
 {
+    //密码框界面 拦着 不给弹出
+    if(ksharedAppDelegate.isDidShowPwdType){
+        KWeakSelf
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf  showHaveNoticeViewBy:model];
+        });
+        return;
+    }
+    
     HaveNoticeView * noticeView = [HaveNoticeView shardInstance];
     NSString * preShowID = [HWDataManager getStringWithKey:Const_did_show_Notice_ID];