Переглянути джерело

1、将分辨率调整为720P,全面屏设备同样适用此分辨率。
2、在不同网络环境下动态调整码率:WiFi环境下设定为4Mbps,移动数据环境下设定为2Mbps。

huangxiaodong 6 місяців тому
батько
коміт
d9d011769d

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

@@ -6157,11 +6157,9 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 26;
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 30;
+				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/双子星云手机/CloudPlayer",
@@ -6221,7 +6219,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = box20240511;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -6239,11 +6236,9 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 26;
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 30;
+				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/双子星云手机/CloudPlayer",
@@ -6303,7 +6298,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = box20240511;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

+ 4 - 4
创维盒子/双子星云手机/AppDelegate/AppDelegate.m

@@ -76,11 +76,11 @@
     [self setLanguagesFun];
     
     //设置默认值
-//    self.couldPhone_W_PHONE = 720.0;
-//    self.couldPhone_H_PHONE = 1280.0;
+    self.couldPhone_W_PHONE = 720.0;
+    self.couldPhone_H_PHONE = 1280.0;
     
-    self.couldPhone_W_PHONE = 1080.0;
-    self.couldPhone_H_PHONE = 1920.0;
+//    self.couldPhone_W_PHONE = 1080.0;
+//    self.couldPhone_H_PHONE = 1920.0;
     
     [[UIButton appearance] setExclusiveTouch:YES];
     

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

@@ -1300,8 +1300,8 @@ withType:(BOOL)isUploadType
     //
     CGFloat scaleWH = (W_PHONE*1.0)/(H_PHONE*1.0);
     if (scaleWH >1.0) {//横屏
-        CGFloat scale = 1080.0/H_PHONE;
-        H_PHONE = 1080;
+        CGFloat scale = 720.0/H_PHONE;//1080.0/H_PHONE;
+        H_PHONE = 720.0;//1080;
         W_PHONE = W_PHONE * scale;
         W_PHONE = ((int)(W_PHONE/8)) *8;
         
@@ -1309,9 +1309,9 @@ withType:(BOOL)isUploadType
         W_PHONE -= 60;
         
         //音视频说方案webrtc 最大解码分辨率 宽1080  高 1920
-        if(W_PHONE > 1920){//超宽了
-            CGFloat scale = (1920.0 + 60)/(W_PHONE-60);
-            W_PHONE = 1920.0;
+        if(W_PHONE > 1280){//超宽了
+            CGFloat scale = (1280.0 + 60)/(W_PHONE-60);
+            W_PHONE = 1280.0;
             H_PHONE = H_PHONE * scale;
             H_PHONE = ((int)(H_PHONE/8)) *8;
         }
@@ -1321,8 +1321,8 @@ withType:(BOOL)isUploadType
 //        W_PHONE = 1920.0;
     }
     else{//竖屏
-        CGFloat scale = 1080.0/W_PHONE;
-        W_PHONE = 1080;//W_PHONE*scale;
+        CGFloat scale = 720.0/W_PHONE;//1080.0/W_PHONE;
+        W_PHONE = 720.0;//1080;//W_PHONE*scale;
         H_PHONE = H_PHONE * scale;
         H_PHONE = ((int)(H_PHONE/8)) *8;
         
@@ -1330,9 +1330,9 @@ withType:(BOOL)isUploadType
         H_PHONE -= 60;
         
         //音视频说方案webrtc 最大解码分辨率 宽1080  高 1920
-        if(H_PHONE > 1920){//超宽了
-            CGFloat scale = (1920.0+60)/(H_PHONE-60);
-            H_PHONE = 1920.0;
+        if(H_PHONE > 1280){//超宽了
+            CGFloat scale = (1280.0+60)/(H_PHONE-60);
+            H_PHONE = 1280.0;
             W_PHONE = W_PHONE * scale;
             W_PHONE = ((int)(W_PHONE/8)) *8;
         }

+ 12 - 13
创维盒子/双子星云手机/webRtc/webRtcPlayerViewController.m

@@ -139,7 +139,7 @@
     
     //判断是否是全屏
     BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
-    CGSize  phoneSize = CGSizeMake(1080.0, 1920.0);
+    CGSize  phoneSize = CGSizeMake(720.0, 1280.0);
     //云机分辨率被改成 720.0, 1280.0
     if(ksharedAppDelegate.couldPhone_W_PHONE == 720 && ksharedAppDelegate.couldPhone_H_PHONE == 1280) {//云机可能存在的分辨率
         phoneSize = CGSizeMake(720.0, 1280.0);
@@ -154,8 +154,6 @@
     [self initBaseUIFun];
     [self setTimerCountDown];
     
-    //CGFloat curRate = 1080.0/1920.0;
-    //CGFloat curRate = phoneSize.width/phoneSize.height;
     
     [self showNewIndicatorWithCanBack:YES canTouch:NO];
     
@@ -180,19 +178,20 @@
    
     NSString *roomName = _webRtcMsgMod.data.uniqueIdentifier;
     
-    NSInteger cardDensity = 480;
+    NSInteger cardDensity = 320;//480;
     //判断是否是全屏
     BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
     if(fullscreenType){
         //cardDensity = 380;
-        cardDensity = 320;
+        //cardDensity = 320;
+        //cardDensity = 480;
     }
     
-    //码率根据网络设置 wifi 8M 移动网络 4M
-    NSInteger bitrate = 8*1024;
+    //码率根据网络设置 wifi 8M 移动网络 4M ->改为 4M 2M
+    NSInteger bitrate = 4*1024;
     
     if([AFNetworkReachabilityManager sharedManager].isReachableViaWWAN){
-        bitrate = 4*1024;
+        bitrate = 2*1024;
     }
     
     NSInteger result = [_mediaStream start:url
@@ -239,7 +238,7 @@
         
         //判断是否是全屏
         BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
-        CGSize  phoneSize = CGSizeMake(1080.0, 1920.0);
+        CGSize  phoneSize = CGSizeMake(720.0, 1280.0);
         if(fullscreenType){
             phoneSize = [RCCommandHelp commondToSetFullScreenPhoneSizeBySize];
         }
@@ -768,10 +767,10 @@
     BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
     
     CGFloat tempRate = 0.0;
-    NSInteger cardDensity = 480;
+    NSInteger cardDensity = 320;//480;
     //重新设置分辨率
     if(fullscreenType){
-        cardDensity = 320;//380;//480;//422;//380;//460;
+        //cardDensity = 380;//480;//422;//380;//460;
         CGSize size = [RCCommandHelp commondToSetFullScreenPhoneSizeBySize];
         
         if(isLan){
@@ -785,9 +784,9 @@
         tempRate = (size.width *1.0)/(size.height *1.0);
     }
     else{
-        CGSize size = CGSizeMake(1080.0, 1920.0);
+        CGSize size = CGSizeMake(720.0, 1280.0);
         if(isLan){
-            size = CGSizeMake(1920.0, 1080.0);
+            size = CGSizeMake(1280.0, 720.0);
         }
         [self setCardSize:(NSInteger)size.width cardHeight:(NSInteger)size.height cardDensity:cardDensity];