Browse Source

1.bug 修复

huangxiaodong 1 year ago
parent
commit
834e7d7090

+ 9 - 2
创维盒子/双子星云手机/CloudPlayer/View/playerSetView.m

@@ -146,6 +146,7 @@
     _speedLabel =  [[UILabel alloc] init];
     _speedLabel.font = [UIFont systemFontOfSize:12.0];
     _speedLabel.textColor = [UIColor whiteColor];
+    _speedLabel.textAlignment = NSTextAlignmentCenter;
     //_speedLabel.text = NSLocalizedString(@"webrtc_msg_delayed",nil);
     [blackBgView addSubview:_speedLabel];
     //_speedLabel.backgroundColor = [UIColor redColor];
@@ -153,7 +154,7 @@
     [_speedLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         //make.centerX.mas_equalTo(1.5*laberW);
         make.centerX.mas_equalTo(self.mas_centerX);
-        make.width.mas_equalTo(laberW*2.9);
+        make.width.mas_equalTo(laberW*3.0);
         make.height.mas_equalTo(laberH);
         make.top.mas_equalTo(laberTop);
     }];
@@ -500,7 +501,13 @@
         _delayedLabel.textColor = [UIColor hwColor:@"#FF2855"];
     }
     
-    _delayedLabel.text = [[NSString alloc] initWithFormat:@"%ldms",delayedMS];
+    if(delayedMS >= 1000){
+        _delayedLabel.text = [[NSString alloc] initWithFormat:@"%lds",delayedMS/1000];
+    }
+    else{
+        _delayedLabel.text = [[NSString alloc] initWithFormat:@"%ldms",delayedMS];
+    }
+    
     //_PacketLossLabel.text = PacketLossStr;
     _speedLabel.text = [[NSString alloc] initWithFormat:@"%@%@",NSLocalizedString(@"webrtc_msg_speed",nil),speedStr];
     _fpsLabel.text = [[NSString alloc] initWithFormat:@"FPS:%@",fpsStr];

+ 4 - 1
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -128,7 +128,10 @@
 
 - (void)relinkWebRtcFun{
     ksharedAppDelegate.isWebSockLinkOKAginType = NO;
-    [self beginToLinkWebRtcFun];
+    
+    if(!_isChangeBoxType){
+        [self beginToLinkWebRtcFun];
+    }
 }
 
 #pragma mark webrtc P2P通道发送消息

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

@@ -1232,10 +1232,10 @@
     //网速 传输数据速度
     NSString *netDataSpeedStr = @"";
     if(preReceive/1024.0 > 1024){
-        netDataSpeedStr = [NSString stringWithFormat:@"%.01fMB/s\n",preReceive/1024.0/1024.0];
+        netDataSpeedStr = [NSString stringWithFormat:@"%.01fMB/S\n",preReceive/1024.0/1024.0];
     }
     else{
-        netDataSpeedStr = [NSString stringWithFormat:@"%ldkB/s\n",preReceive/1024];
+        netDataSpeedStr = [NSString stringWithFormat:@"%ldkB/S\n",preReceive/1024];
     }
     //showStr = [showStr stringByAppendingString:netDataSpeedStr];