|
|
@@ -42,7 +42,6 @@
|
|
|
#import "MySetViewController.h"
|
|
|
#import "PhoneTimeInfoModel.h"
|
|
|
#import "connectDeviceManager.h"
|
|
|
-#import "ComontAlretViewController.h"
|
|
|
#import "commandSendCheckModel.h"
|
|
|
|
|
|
typedef enum : NSUInteger {
|
|
|
@@ -115,8 +114,7 @@ ComontAlretViewControllerDelegate>
|
|
|
|
|
|
PhoneTimeInfoDataModel *phoneTimeInfoDataModel;
|
|
|
|
|
|
- /*弹窗提示重启*/
|
|
|
- ComontAlretViewController *logoutAlertVC;
|
|
|
+
|
|
|
/*弹窗提示链接失败 网络或者云机*/
|
|
|
ComontAlretViewController *linkFailAlretVC;
|
|
|
|
|
|
@@ -1904,11 +1902,11 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
|
|
|
{
|
|
|
_isPwdVCShow = NO;
|
|
|
|
|
|
- if(logoutAlertVC){
|
|
|
- [logoutAlertVC dismissViewControllerAnimated:NO completion:^{
|
|
|
- self->logoutAlertVC = nil;
|
|
|
- }];
|
|
|
- }
|
|
|
+// if(logoutAlertVC){
|
|
|
+// [logoutAlertVC dismissViewControllerAnimated:NO completion:^{
|
|
|
+// self->logoutAlertVC = nil;
|
|
|
+// }];
|
|
|
+// }
|
|
|
|
|
|
[self setShowImgAndVoiceTypeFun:YES];
|
|
|
|
|
|
@@ -1932,6 +1930,10 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
|
|
|
{
|
|
|
if(isCan){//判断当前是否为最前面 才能播放
|
|
|
|
|
|
+ if(self->logoutAlertVC){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if(_isLoginAgainType ){
|
|
|
[self tryAgain];
|
|
|
[self opencommandChannelManagerrc_openURL];
|
|
|
@@ -2978,8 +2980,11 @@ static int couneeee = 0;
|
|
|
}
|
|
|
else if(self.webSocketConcentTime > 0){
|
|
|
//后续要跟进
|
|
|
- HLog(@"\n\n\n\n\n 云手机30s 无渲染数据 要跟进 \n\n\n\n\n");
|
|
|
- //[self showNetErrorAlertFun:3];
|
|
|
+
|
|
|
+ if(_isFirstEnterPhone){
|
|
|
+ HLog(@"\n\n\n\n\n 云手机30s 无渲染数据 要跟进 \n\n\n\n\n");
|
|
|
+ [self showNetErrorAlertFun:3];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -3137,7 +3142,7 @@ static int couneeee = 0;
|
|
|
#pragma mark -- /* 屏幕旋转通知接收函数*/
|
|
|
- (void)orientationChanged:(NSNotification *)notification
|
|
|
{
|
|
|
- KyoLog(@"rotated");
|
|
|
+ //KyoLog(@"rotated");
|
|
|
}
|
|
|
|
|
|
- (void)setDeviceOrientation:(UIDeviceOrientation)orientationPortrait
|