1.隐私盒子 测试环境1.1

创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -108,12 +108,12 @@ isBangsScreen; \
 //弃用 #define shareService   @"http://testprivacy.phone.armclouding.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //创维盒子 测试地址 正在使用
-//#define CloudService   @"http://testprivacy.phone.androidscloud.com:1801"
-//#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
+#define CloudService   @"http://testprivacy.phone.androidscloud.com:1801"
+#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //预生产环境
-#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
-#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
+//#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 
 //生产环境 1.4.3 开始使用

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -442,7 +442,12 @@
             //playerRootVC.isPwdVCShow = NO;
             //[playerRootVC setShowImgAndVoiceTypeFun:YES];
             //[weakSelf shareAwakenAppBy:weakSelf.getShareStr];
-
+            
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter] postNotificationName:didInputPWDNotification object:nil];
+            });
+            
+            
             if(self->_session && self->_connectionOptions){
                 [self scene:self->_session openURLContexts:self->_connectionOptions.URLContexts];
             }
@@ -457,6 +462,10 @@
         }
         else{
             [[webRtcManager shareManager] beginToLinkWebRtcFun];
+            ksharedAppDelegate.isFirstInputPwdDone = YES;
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter] postNotificationName:didInputPWDNotification object:nil];
+            });
         }
 
     }

创维盒子/双子星云手机/cloudPhone/cloudPhoneViewController.m

@@ -526,10 +526,43 @@
 {
     KWeakSelf
     mainBlock(^{
+        
+        BOOL isNeedShowSecret = [HWDataManager getBoolWithKey:Const_need_show_Secret_key];
+        if(isNeedShowSecret){
+            [self showSecretkeyFun];
+        }
+        
         if(ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType
            || ksharedAppDelegate.needToPushWebRtcVCType){
             [weakSelf queryWebRtcMsgFun:YES];
         }
     });
 }
+
+#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];
+    };
+}
+
 @end

创维盒子/双子星云手机/netWork/netWorkManager.m

@@ -376,30 +376,30 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
 //事件模块值 Scan_code
 - (void)DataEmbeddingPointBy:(int)eventType withEventValue:(NSString*)eventValue
 {
-    //test code
-    //return;
+    //隐私空间 不要埋点
+    return;
     
-    if(!eventValue){
-        return;
-    }
-    
-    NSString *curSN = ksharedAppDelegate.DeviceThirdIdMod.data.changeSn;
-    if (curSN) {
-        [manager.requestSerializer setValue:curSN forHTTPHeaderField:@"SN"];
-    }
-    else{
-        return;
-    }
-    
-    NSMutableDictionary *dict = [NSMutableDictionary new];
-    [dict setValue:[NSNumber numberWithInt:eventType] forKey:@"eventType"];
-    [dict setValue:eventValue forKey:@"eventValue"];
-    
-    [self CommonPostCallBackCode:clientAddDataPointFun Parameters:dict success:^(id  _Nonnull responseObject) {
-        //HLog(@"111");
-    } failure:^(NSError * _Nonnull error) {
-        
-    }];
+//    if(!eventValue){
+//        return;
+//    }
+//    
+//    NSString *curSN = ksharedAppDelegate.DeviceThirdIdMod.data.changeSn;
+//    if (curSN) {
+//        [manager.requestSerializer setValue:curSN forHTTPHeaderField:@"SN"];
+//    }
+//    else{
+//        return;
+//    }
+//    
+//    NSMutableDictionary *dict = [NSMutableDictionary new];
+//    [dict setValue:[NSNumber numberWithInt:eventType] forKey:@"eventType"];
+//    [dict setValue:eventValue forKey:@"eventValue"];
+//    
+//    [self CommonPostCallBackCode:clientAddDataPointFun Parameters:dict success:^(id  _Nonnull responseObject) {
+//        //HLog(@"111");
+//    } failure:^(NSError * _Nonnull error) {
+//        
+//    }];
 }
 
 

创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.h

@@ -79,7 +79,8 @@ NS_ASSUME_NONNULL_BEGIN
 //获取备份文件夹列表
 - (void)getBackupFolderListFun;
 
-
+#pragma mark 复制手机消息到云机
+- (void)updateCopydata;
 
 #pragma mark 分类方向
 #pragma mark nas下载完成

创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -125,7 +125,7 @@
     
     NSString *roomName = _webRtcMsgMod.data.uniqueIdentifier;
     
-    NSInteger result = [_mediaStream startUploadChannel:url ice:ice sn:roomName token:@"vclusters"];
+    NSInteger result = [_mediaStream startUploadChannel:url ice:ice sn:roomName token:@"mediakit"];
     
     HLog(@"webrtc 发起连接 result:%ld",result)
     [_mediaStream setShouldGetStats:YES];

创维盒子/双子星云手机/webRtc/webRtcPlayerViewController.m

@@ -207,7 +207,7 @@
                       cardWidth:(NSInteger)phoneSize.width//0//1080//0
                      cardHeight:(NSInteger)phoneSize.height//0//1920//0
                     cardDensity:cardDensity
-                          token:@"vclusters"];
+                          token:@"mediakit"];
     
     HLog(@"result:%ld",result)