Explorar el Código

1.弹框流程优化

huangxiaodong hace 6 meses
padre
commit
bb42649520

+ 2 - 2
创维盒子/双子星云手机/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"
 
 
 

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

@@ -72,6 +72,8 @@
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getCouldPhoneSysInfoFun:)  name:getCouldPhoneSysInfoNotification  object:nil];
     
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didInpuPwdOkFun) name:didInputPWDNotification object:nil];
+    
     [self.toolBar setHidden:YES];
     [self.navigationBar setHidden:YES];
     [self.navBarBGView setHidden:YES];
@@ -699,7 +701,7 @@
         [self checkFileTransferTask];
     });
     
-    [self beginShowAlertFun];
+    //[self beginShowAlertFun];
     
     [self handelAudioPlayingViewFun];
     
@@ -903,6 +905,49 @@
 }
 
 
+#pragma mark 输入密码完成
+- (void)didInpuPwdOkFun
+{
+    KWeakSelf
+    mainBlock(^{
+        //[weakSelf beginShowAlertFun];
+        
+        BOOL isNeedShowSecret = [HWDataManager getBoolWithKey:Const_need_show_Secret_key];
+        if(isNeedShowSecret){
+            [self showSecretkeyFun];
+        }
+        
+    });
+}
+
+
+#pragma mark - 显示秘钥 后续忘记密码要
+-(void)showSecretkeyFun
+{
+    if(!ksharedAppDelegate.isFirstInputPwdDone){
+        KWeakSelf
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf showSecretkeyFun];
+        });
+        
+        return;
+    }
+    
+    playerShowSecretkeyView *view = [[playerShowSecretkeyView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
+    //[ksharedAppDelegate.window addSubview:view];
+    [self.view addSubview:view];
+
+    //KWeakSelf
+    view.didCloseSecretKeyViewTip = ^{
+        [HWDataManager setBoolWithKey:Const_need_show_Secret_key value:NO];
+    };
+
+    view.didCopySecretKeyViewTip = ^{
+        [[webRtcManager shareManager] updateCopydata];;
+    };
+}
+
+
 #pragma mark 弹框流程
 //优先级:1.强制盒子更新弹窗
 //       2.APP版本更新弹窗 > 新手引导弹窗 > 通知公告弹窗
@@ -1057,7 +1102,7 @@
 #pragma mark 弹框流程 3 新手引导弹窗
 - (void)showNewerGuideFun
 {
-    BOOL didShow = [HWDataManager getBoolWithKey:@"Const_did_show_newer_Guide"];
+    BOOL didShow = YES;//[HWDataManager getBoolWithKey:@"Const_did_show_newer_Guide"];
     
     if(didShow){
         [self getLastNoticeFun];

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 254
创维盒子/双子星云手机/cloudPhone/cloudPhoneViewController.m