|
@@ -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];
|
|
|
|