Procházet zdrojové kódy

Merge commit 'e2c16b50d9bec449b4aca36b5bad8beab60c874b'

# Conflicts:
#	创维盒子/双子星云手机.xcodeproj/project.pbxproj
#	创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m
#	创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm
huangxiaodong před 1 rokem
rodič
revize
246bdab33a

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

+ 1 - 0
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+AppDelegate.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 @property NSString *nowSSid;
 
+- (void)updateCopydata;
 @end
 
 NS_ASSUME_NONNULL_END

+ 22 - 0
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+AppDelegate.m

@@ -12,6 +12,7 @@
 #import <RCCloudPhoneSDK/RCAudioPlayer.h>
 #import "ShortcutManager.h"
 #import <objc/runtime.h>
+#import "RCCommandHelp.h"
 
 @interface PlayerViewController(AppDelegate)
 
@@ -95,6 +96,7 @@
     
     
     [self setShowImgAndVoiceTypeFun:YES];
+    [self updateCopydata];
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application {
@@ -125,4 +127,24 @@
         return currentSSID;
 }
 
+- (void)updateCopydata{
+    UIPasteboard* pasteboard = [UIPasteboard generalPasteboard];
+    NSString *str = [pasteboard string];
+    
+    HLog(@"__________%s______%@____",__func__,str);
+    
+    if ([str rangeOfString:@"CVLUSTERS_NOUSE_"].location != NSNotFound)
+    {
+        str = nil;
+    }
+    
+    if (str)
+    {
+        /*发送数据*/
+        NSString *dataStr = [RCCommandHelp commandCuttingWithContent:str];
+        [self.commandChannelManager rc_sendData:dataStr];
+        //pasteboard.string = @"";
+    }
+    
+}
 @end

+ 2 - 1
创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -243,7 +243,6 @@ ComontAlretViewControllerDelegate>
     
     if(_checkThridConnectNum >= 30 && [[connectDeviceManager shareInstance] curConnectDeviceState] <= 3 ){
         [self showNetErrorAlertFun:11];
-        
         _checkThridConnectNum = 0;
 //        [_checkThridConnectTimer invalidate];
 //        return;
@@ -1652,6 +1651,8 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     
     [self fristConnectNeedGiveAMsgFun];
     
+    [self updateCopydata];
+    
     //  报链接失败 后面又连接上了
     if(linkFailAlretVC && linkFailAlretVC.view.tag == 2){
         mainBlock(^{