소스 검색

1.扫码SN后要确认可以链接并且为指定SN 才可以显示云机

huangxiaodong 1 개월 전
부모
커밋
2c2e0352ee

+ 2 - 0
创维盒子/code/AppDelegate/Config/Const.h

@@ -187,6 +187,8 @@ UIKIT_EXTERN NSString *const Const_best_webRtc_IPRoom;
 /*记录当前镜像版本的tokens是否需要新的*/
 UIKIT_EXTERN NSString *const Const_image_version_for_new_token;
 
+/*记录上一个连接成功的SN*/
+UIKIT_EXTERN NSString *const Const_pre_did_link_ok_sn;
 @end
 
 NS_ASSUME_NONNULL_END

+ 3 - 0
创维盒子/code/AppDelegate/Config/Const.m

@@ -183,4 +183,7 @@ NSString *const Const_best_webRtc_IPRoom = @"best_webRtc_IPRoom";
 
 /*记录当前镜像版本的tokens是否需要新的*/
 NSString *const Const_image_version_for_new_token = @"image_V_token";
+
+/*记录上一个连接成功的SN*/
+NSString *const Const_pre_did_link_ok_sn = @"pre_did_link_ok_sn";
 @end

+ 31 - 2
创维盒子/code/AppDelegate/SceneDelegate.m

@@ -121,6 +121,8 @@
         
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scanChangeDeviceBackFun:)  name:scanChangeDeviceBackNotification  object:nil];
         
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(firstDidLinkBoxFun)  name:@"firstDidLinkBox"  object:nil];
+        
         UIWindowScene *windowScene = (UIWindowScene *)scene;
         self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
         self.window.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height);
@@ -552,8 +554,12 @@
     NSArray *imageNArr = @[@"tabbar_nas_N", @"tabbar_file_N",@"tabbar_my_N"];
     NSArray *imageHArr = @[@"tabbar_nas_H", @"tabbar_file_H",@"tabbar_my_H"];
     
-    if(ksharedAppDelegate.DeviceThirdIdMod
-       && ![ksharedAppDelegate.DeviceThirdIdMod.data.changeSn isEqualToString:@"0333933700223110016962"]){
+    //记录当前连接的SN
+    NSString* preSN = [HWDataManager getStringWithKey:@"Const_pre_did_link_ok_sn"];
+    NSString *curSN = ksharedAppDelegate.DeviceThirdIdMod.data.changeSn;
+    if(![curSN isEqualToString:@"0333933700223110016962"]
+       && ![preSN isEqualToString:@"0333933700223110016962"]
+       && preSN.length > 0){
         titleArr = @[@"NAS",phoneTitle,myTitle];
         imageNArr = @[@"tabbar_nas_N", @"my_device_NO",@"tabbar_my_N"];
         imageHArr = @[@"tabbar_nas_H", @"my_device_ok",@"tabbar_my_H"];
@@ -612,6 +618,29 @@
     });
 }
 
+
+#pragma mark 第一次连接成功
+- (void)firstDidLinkBoxFun
+{
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        
+        if (ksharedAppDelegate.mainTabBar) {
+            NSArray *curArr = ksharedAppDelegate.mainTabBar.viewControllers;
+            if (curArr.count >= 3) {
+                BaseNavigationController *Nav = curArr[1];
+                UIViewController *curVC = Nav.viewControllers.firstObject;
+                if (![curVC isKindOfClass:[previewFileAndFolderViewController class]]) {
+                    return;
+                }
+            }
+        }
+        
+        //[self initMainTabbarFun];
+        [self enterMainVCFromScene];
+    });
+}
+
 #pragma mark 处理进来是非隐私模式的情况
 - (void)HandleEnterNotPrivacyModeFun
 {

+ 15 - 0
创维盒子/code/webRtc/webRtcManager/webRtcManager.m

@@ -253,6 +253,21 @@
         
         NSString *commondStr2  = @"{\"type\":\"TvStatus\"}";
         [self send_data:commondStr2];
+        
+        //记录当前连接的SN
+        NSString* preSN = [HWDataManager getStringWithKey:@"Const_pre_did_link_ok_sn"];
+        NSString *curSN = ksharedAppDelegate.DeviceThirdIdMod.data.changeSn;
+        if (!preSN || ![preSN isEqualToString:curSN]) {
+            if (curSN) {
+                [HWDataManager setStringWithKey:@"Const_pre_did_link_ok_sn" value:curSN];
+                
+                if(![curSN isEqualToString:@"0333933700223110016962"]){
+                    [[NSNotificationCenter defaultCenter] postNotificationName:@"firstDidLinkBox" object:nil];
+                }
+            }
+        }
+        
+        
     }
 }
 

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

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