1.修改分辨率后重置云机编码逻辑

创维盒子/双子星云手机/CloudPlayer/PlayerViewController+otherDelegate.h

@@ -24,7 +24,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)screenShotToPhoneFun;
 - (void)saveLastImageFun;
 - (void)readLastImageFun;
-
+#pragma mark 全屏屏重置云机编码
+- (void)reSetResolutionFactorFun;
 @end
 
 NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/CloudPlayer/PlayerViewController+otherDelegate.mm

@@ -129,4 +129,20 @@
     }
 }
 
+#pragma mark 重置云机编码
+- (void)reSetResolutionFactorFun
+{
+    if([webSocketManager shareInstance].isDiDChangePhoneSizeType){
+        CGFloat W = ksharedAppDelegate.couldPhone_W_PHONE;
+        CGFloat H = ksharedAppDelegate.couldPhone_H_PHONE;
+        
+        CGFloat maxH = H > W ? H : W;
+        
+        NSString *dataStr =  [RCCommandHelp commandResolutionFactorWithHeight:maxH];
+        [self.liveStreamManager rc_sendJsonData:[dataStr UTF8String]];
+        
+        [webSocketManager shareInstance].isDiDChangePhoneSizeType = NO;
+    }
+}
+
 @end

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -790,7 +790,8 @@ UIDocumentPickerDelegate>
                 });
             }
             
-            
+            //重置云机编码
+            [self reSetResolutionFactorFun];
             
             //  报链接失败 后面又连接上了
             [[errorAlertTool shareInstance] dismissErrorAlertFun];

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

@@ -313,9 +313,9 @@
     /*弹窗提示恢复出厂*/
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_Restore_Factorying_tips",nil)
                                                                                      msg:NSLocalizedString(@"my_set_no_Restore_Factorying_msg",nil)
-                                                                                imageStr:nil
+                                                                                imageStr:@""
                                                                              cancelTitle:NSLocalizedString(@"my_set_no_Restore_Factorying",nil)
-                                                                                 okTitle:nil
+                                                                                 okTitle:@""
                                                                         isOkBtnHighlight:NO
                                                                               didClickOk:^{
         [weakSelf RestoreFactoryCompleteFun];
@@ -335,16 +335,16 @@
 #pragma mark 恢复出厂倒计时结束
 - (void)RestoreFactoryCompleteFun
 {
-    KWeakSelf
+    //KWeakSelf
     //瑞云发起重连
     //[[connectDeviceManager shareInstance] onConnectFun];
     
     /*弹窗提示恢复出厂*/
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_Restore_Factory_ok_tips",nil)
                                                                                      msg:@""
-                                                                                imageStr:nil
+                                                                                imageStr:@""
                                                                              cancelTitle:NSLocalizedString(@"my_set_no_Restore_FactoryOK",nil)
-                                                                                 okTitle:nil
+                                                                                 okTitle:@""
                                                                         isOkBtnHighlight:NO
                                                                               didClickOk:^{
         

创维盒子/双子星云手机/cloudPhone/websocket/RCCommandHelp.h

@@ -102,6 +102,15 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)commandResolution500WithType:(NSUInteger)type;
 
 /**
+ * @brief 重置编码参数
+ *
+ * @param  height  宽或者高  最大这
+ *
+ */
++ (NSString *)commandResolutionFactorWithHeight:(CGFloat)height;
+
+
+/**
 * @brief 云手机预览图指令
 */
 + (NSString *)commandGetScreenPicWithTaskUid:(NSString *)taskUid intervalTime:(int)intervalTime;

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

@@ -699,6 +699,22 @@
     return dataStr;
 }
 
++ (NSString *)commandResolutionFactorWithHeight:(CGFloat)height
+{
+    NSString *dataStr = [NSString stringWithFormat:@"{\"data\":{\"resolution_factor\":%ld,},\"type\":5}",(NSInteger)height];
+    
+    if (USENEWCONTROLLCOMMONDNO500)
+    {
+//        dataStr = [self commondAppendingHeadAndEndStrWithSourStr:dataStr];
+    }
+    else
+    {
+        dataStr = [self commandAppending00StringWithSourStr:dataStr];
+    }
+    
+    return dataStr;
+}
+
 + (NSString *)commandSetFps{
     NSString *dataStr = @"{\"data\":{\"frame_rate\":25,\"clientType\":\"ios\"},\"type\":5}";
     

创维盒子/双子星云手机/cloudPhone/websocket/webSocketManager.h

@@ -72,6 +72,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,assign)BOOL isChangeBoxType;//是否更换盒子
 @property(nonatomic,assign)BOOL isLogoutByOtherType;//被挤下线
 
+@property(nonatomic,assign)BOOL isDiDChangePhoneSizeType;//是否修改了分辨率（如果是 进去云机需要重设解码器）
+
 //链接websocket
 - (void)opencommandChannelManagerrc_openURL;
 - (void)WebSocketNeedRelinkFun;

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

@@ -211,7 +211,12 @@ static webSocketManager *webSocketManagerInstance = nil;
                 }
             }
             else if ([messageType isEqualToString:@"getPhoneSize"] || [messageType isEqualToString:@"setPhoneSize"]){
-                NSString *sn = nil;
+                //NSString *sn = nil;
+                
+                if([messageType isEqualToString:@"setPhoneSize"]){
+                    weakSelf.isDiDChangePhoneSizeType = YES;
+                }
+                
                 if ([[dataDict allKeys] containsObject:@"data"]) {
                     NSDictionary *data = dataDict[@"data"];