1.同步bug--未完成

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

@@ -2494,7 +2494,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2552,7 +2552,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2573,7 +2573,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2631,7 +2631,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

创维盒子/双子星云手机/Class/Guide/AuthCodeView/AuthCodeInputView.m

@@ -116,11 +116,13 @@
 #pragma mark  UITextFieldDelegate
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
 {
-// 获取短信中提取的验证码，自动输入到输入框中
     if(string.length > 1){
         for (int i = 0 ; i < self.tfArr.count; i++) {
             AuthCodeTextField *tf = self.tfArr[i];
-            tf.text = [string substringWithRange:NSMakeRange(i, 1)];
+            if(string.length >= i+1)
+            {
+                tf.text = [string substringWithRange:NSMakeRange(i, 1)];
+            }
         }
         return NO;
     }

创维盒子/双子星云手机/Class/Set/MySetViewController.m

@@ -52,6 +52,7 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarHidden:NO];
     
     if(_getTvStatus){
         _getTvStatus();

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/AJPhotoGroupCell.m

@@ -37,6 +37,7 @@
         textLabel.font = [UIFont boldSystemFontOfSize:16];
         textLabel.backgroundColor = [UIColor clearColor];
         textLabel.numberOfLines = 0;
+        textLabel.textColor = [UIColor blackColor];
         [self.contentView addSubview:textLabel];
         self.groupTextLabel = textLabel;
     }

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileBottomView.m

@@ -27,6 +27,7 @@
 - (void)drawAnyView{
     _selectNumLabel = [[UILabel alloc] init];
     _selectNumLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    _selectNumLabel.textColor = [UIColor blackColor];
     [self addSubview:_selectNumLabel];
     
     [_selectNumLabel mas_makeConstraints:^(MASConstraintMaker *make) {

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordCell.m

@@ -122,6 +122,7 @@
     
     _fileNamelabel = [[UILabel alloc] init];
     _fileNamelabel.font = [UIFont boldSystemFontOfSize:16.0];
+    _fileNamelabel.textColor = [UIColor blackColor];
     //_fileNamelabel.backgroundColor = [UIColor greenColor];
     [self.contentView addSubview:_fileNamelabel];
     

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

@@ -23,6 +23,8 @@ WHPingDelegate
     dispatch_queue_t initProxyQueue;
     
     WHPingTester *whPingTester;
+    
+    BOOL didRuiYunInitOkType;
 }
 
 @property (nonatomic, strong) NSTimer *connectCheckTimer;
@@ -147,8 +149,7 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
 #pragma mark 初始化瑞云的SDK等
 - (void)initRuiyunSDKFun{
     
-    bool connected = [RaylinkProxy.sharedManager isSdnConnected];
-    if(connected){
+    if(didRuiYunInitOkType){
         [self onConnectFun];
         return;
     }
@@ -173,11 +174,44 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
         [NSFileManager.defaultManager createDirectoryAtURL:logUrl withIntermediateDirectories:YES attributes:NULL error:NULL];
     }
     
+    KWeakSelf
     dispatch_async(initProxyQueue, ^{
         NSData *sdnInfo = [NSData dataWithContentsOfURL:[[NSBundle.mainBundle bundleURL] URLByAppendingPathComponent:@"planet.1ali_3ry_peer"]];
         
         /// 1. 初始化代理库
         [RaylinkProxy.sharedManager initProxy:logUrl.path rootSdnInfo:sdnInfo];
+        
+        self->didRuiYunInitOkType = YES;
+        
+        /// 启动定时器监听 SND 连接状态
+        self.connectCheckTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 repeats:YES block:^(NSTimer * _Nonnull timer) {
+            
+            /// 2. 监听SDN 连接状态
+            bool connected = [RaylinkProxy.sharedManager isSdnConnected];
+            if (self.sdnConnected == connected) {
+                return;
+            }
+            
+            self.sdnConnected = connected;
+            if (self.sdnConnected) {
+                
+                [weakSelf onConnectFun];
+                [self->_connectCheckTimer invalidate];
+                
+                //self.sdnConnectStateLab.text = @"SDN state: Connected";
+                //self.sdnIDLab.text = [@"My SDN ID: " stringByAppendingString:[RaylinkProxy.sharedManager getSdnId]];
+                
+                    
+            } else {
+                //self.sdnConnectStateLab.text = @"SDN state: Connectting";
+            }
+            
+            
+        }];
+        
+        [[NSRunLoop currentRunLoop] addTimer:self.connectCheckTimer forMode:NSRunLoopCommonModes];
+        [[NSRunLoop currentRunLoop] run];
+        
     });
     
     
@@ -189,62 +223,16 @@ static connectDeviceManager *connectDeviceManagerInstance = nil;
         NSLog(@"accept ok %d",self.serverSocket.localPort);
     }
     
-    KWeakSelf
-    /// 启动定时器监听 SND 连接状态
-    self.connectCheckTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 repeats:YES block:^(NSTimer * _Nonnull timer) {
-        
-        /// 2. 监听SDN 连接状态
-        bool connected = [RaylinkProxy.sharedManager isSdnConnected];
-        if (self.sdnConnected == connected) {
-            return;
-        }
-        
-        self.sdnConnected = connected;
-        
-        if (self.sdnConnected) {
-            
-            [weakSelf onConnectFun];
-            [self->_connectCheckTimer invalidate];
-            
-            //self.sdnConnectStateLab.text = @"SDN state: Connected";
-            //self.sdnIDLab.text = [@"My SDN ID: " stringByAppendingString:[RaylinkProxy.sharedManager getSdnId]];
-            
-                
-        } else {
-            //self.sdnConnectStateLab.text = @"SDN state: Connectting";
-        }
-        
-        
-    }];
-    
-    
-//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//        mainBlock(^{
-//            [self onConnectFun];
-//        });
-//    });
 }
 
 
 - (void)onConnectFun{
     
-    // 2. 监听SDN 连接状态
-//    bool connected = [RaylinkProxy.sharedManager isSdnConnected];
-//
-//    HLog(@"协助瑞云看日志onConnectFun isSdnConnected：%d",connected);
-//
-//    if(!connected){
-//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//            mainBlock(^{
-//                [self onConnectFun];
-//            });
-//        });
-//
-//        return;
-//    }
-    
-    if (self.peerConnected == YES) {
+    if (self.peerConnected == YES
+        && _Pre_sdnId
+        && ![_Pre_sdnId isEqualToString:self.DeviceThirdIdMod.data.sdnId]) {
         //[self disconnect];
+
         //return;
     }