Browse Source

1.隐私模式出来完成

huangxiaodong 2 years ago
parent
commit
38d1386af0

+ 32 - 7
创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -210,13 +210,25 @@
     self.isLoginAgainType = NO;
     
     if(!_isQRCodeType){
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            mainBlock(^{
-                [playerRootVC setShowImgAndVoiceTypeFun:NO];
+       __block BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
+        
+        if(isPrivacyMode)
+        {
+            [playerRootVC setShowImgAndVoiceTypeFun:NO];
+            [self showCalculatorVC];
+        }
+        else{
+            [self HandleEnterNotPrivacyModeFun];
+            
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                mainBlock(^{
+                        [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
+                        playerRootVC.isPwdVCShow = NO;
+                        [playerRootVC setShowImgAndVoiceTypeFun:YES];
+                });
             });
-        });
+        }
         
-        [self showCalculatorVC];
         _isQRCodeType = NO;
     }
     else{
@@ -242,6 +254,16 @@
 //    self.window.rootViewController = playerNav;
 }
 
+#pragma mark 处理进来是非隐私模式的情况
+- (void)HandleEnterNotPrivacyModeFun
+{
+    NSInteger maskModel = [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
+    if (maskModel != 0){
+        [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:0];
+        [iTools lc_setAlternateIconName:@"AppIcon1"];
+    }
+}
+
 - (void)setPwdOk{
     [self enterMainVCFromScene];
     
@@ -445,9 +467,12 @@
         return;
     }
     
+    if(![connectDeviceManager shareInstance].DeviceThirdIdMod){
+        return;
+    }
   
-    BOOL haveOpenMask = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
-    if(!haveOpenMask)
+    BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
+    if(!isPrivacyMode)
     {
         [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
         [[NSNotificationCenter defaultCenter] postNotificationName:ShowImgAndVoiceNotification object:nil];

+ 14 - 0
创维盒子/双子星云手机/Assets.xcassets/AppIcon1.appiconset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "icon-1024_1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon1.appiconset/icon-1024_1.png


+ 13 - 0
创维盒子/双子星云手机/Class/Guide/GuideViewController.m

@@ -87,6 +87,19 @@
         
         
         if(curPwd && curPwd.length > 0){
+            BOOL haveOpenMask = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
+            if(!haveOpenMask)
+            {
+                [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
+                [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
+               
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [[NSNotificationCenter defaultCenter] postNotificationName:ShowImgAndVoiceNotification object:nil];
+                });
+                
+                return;
+            }
+            
             /*设置密码*/
             inputPWDViewController *nextVC = [[inputPWDViewController alloc] init];
             nextVC.isQRCodeType = YES;

+ 2 - 23
创维盒子/双子星云手机/Class/Set/ChangeLogo/ChangeLogoViewController.m

@@ -243,7 +243,7 @@
 //            [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:1];
 //        }];
         
-        [self lc_setAlternateIconName:@"AppIconJSJ"];
+        [iTools lc_setAlternateIconName:@"AppIconJSJ"];
         [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:1];
         
         // 修改应用名称
@@ -256,7 +256,7 @@
 //            [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:2];
 //        }];
         
-        [self lc_setAlternateIconName:@"AppIconLlq"];
+        [iTools lc_setAlternateIconName:@"AppIconLlq"];
         [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:2];
         
         // 修改应用名称
@@ -284,27 +284,6 @@
 }
 
 
-- (void)lc_setAlternateIconName:(NSString*)iconName
-{
-    //anti apple private method call analyse
-    if ([[UIApplication sharedApplication] respondsToSelector:@selector(supportsAlternateIcons)] &&
-        [[UIApplication sharedApplication] supportsAlternateIcons])
-    {
-        NSMutableString *selectorString = [[NSMutableString alloc] initWithCapacity:40];
-        [selectorString appendString:@"_setAlternate"];
-        [selectorString appendString:@"IconName:"];
-        [selectorString appendString:@"completionHandler:"];
-        
-        SEL selector = NSSelectorFromString(selectorString);
-        IMP imp = [[UIApplication sharedApplication] methodForSelector:selector];
-        void (*func)(id, SEL, id, id) = (void *)imp;
-        if (func)
-        {
-            func([UIApplication sharedApplication], selector, iconName, ^(NSError * _Nullable error) {});
-        }
-    }
-}
-
 - (void)logoSelectViewHaveSelect{
     [okBtn setEnabled:YES];
     [okBtn setAlpha:1];

+ 11 - 0
创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeViewController.m

@@ -252,6 +252,17 @@
     }
     else{
         self.tableView.hidden = YES;
+        [self HandleEnterNotPrivacyModeFun];
+    }
+}
+
+#pragma mark 处理进来是非隐私模式的情况
+- (void)HandleEnterNotPrivacyModeFun
+{
+    NSInteger maskModel = [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
+    if (maskModel != 0){
+        [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:0];
+        [iTools lc_setAlternateIconName:@"AppIcon1"];
     }
 }
 

+ 1 - 1
创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m

@@ -67,7 +67,7 @@ ShowImageViewDelegate>{
                   inRect:CGRectMake(0, 0, glkshowImageView.drawableWidth, glkshowImageView.drawableHeight)
                 fromRect:[ciImage extent]];
     
-    //[self->glkshowImageView display];
+    [self->glkshowImageView display];
 }
 
 - (void)showIMage

+ 3 - 0
创维盒子/双子星云手机/Helpers/iTools.h

@@ -148,6 +148,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 //
 + (NSString *)getTaskUidStr;
+
+//更换图标
++ (void)lc_setAlternateIconName:(NSString*)iconName;
 @end
 
 NS_ASSUME_NONNULL_END

+ 22 - 0
创维盒子/双子星云手机/Helpers/iTools.m

@@ -970,4 +970,26 @@ static const char encodingTable[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopq
     }
     return string;
 }
+
++ (void)lc_setAlternateIconName:(NSString*)iconName
+{
+    //anti apple private method call analyse
+    if ([[UIApplication sharedApplication] respondsToSelector:@selector(supportsAlternateIcons)] &&
+        [[UIApplication sharedApplication] supportsAlternateIcons])
+    {
+        NSMutableString *selectorString = [[NSMutableString alloc] initWithCapacity:40];
+        [selectorString appendString:@"_setAlternate"];
+        [selectorString appendString:@"IconName:"];
+        [selectorString appendString:@"completionHandler:"];
+        
+        SEL selector = NSSelectorFromString(selectorString);
+        IMP imp = [[UIApplication sharedApplication] methodForSelector:selector];
+        void (*func)(id, SEL, id, id) = (void *)imp;
+        if (func)
+        {
+            func([UIApplication sharedApplication], selector, iconName, ^(NSError * _Nullable error) {});
+        }
+    }
+}
+
 @end