Browse Source

1.同步日志--1.修改bug

huangxiaodong 1 year ago
parent
commit
8dbacd7a00

BIN
创维盒子/双子星云手机/Assets.xcassets/Other/imageVersionTipBg.imageset/imageVersionTipBg@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Other/imageVersionTipBg.imageset/imageVersionTipBg@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Other/noticeTopBg.imageset/noticeTopBg@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Other/noticeTopBg.imageset/noticeTopBg@3x.png


+ 3 - 3
创维盒子/双子星云手机/Class/Set/appUpdate/HaveNoticeView.m

@@ -2,7 +2,7 @@
 //  HaveNoticeView.m
 //
 //
-//  Created by David on 2024/4/1.
+//  Created David on 2024/4/1.
 //
 
 #import "HaveNoticeView.h"
@@ -162,13 +162,13 @@ static HaveNoticeView * _instance;
     gl.frame = CGRectMake(0,0,240.f,40.f);
     gl.startPoint = CGPointMake(0, 0.5);
     gl.endPoint = CGPointMake(1, 0.5);
-    gl.colors = @[(__bridge id)[UIColor hwColor:@"#0BDDFD"].CGColor, (__bridge id)HW058DFBColor.CGColor];
+    gl.colors = @[(__bridge id)HWFFE10FColor.CGColor, (__bridge id)HWFFE411Color.CGColor];
     gl.locations = @[@(0), @(1.0f)];
     
     [updatekBtn.layer addSublayer:gl];
     [updatekBtn addTarget:self action:@selector(deleteBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
     [updatekBtn setTitle:NSLocalizedString(@"guide_set_pwd_guide_know",nil) forState:(UIControlStateNormal)];
-    [updatekBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
+    [updatekBtn setTitleColor:[UIColor blackColor] forState:(UIControlStateNormal)];
     [updatekBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
     [updatekBtn.layer setCornerRadius:8.f];
     updatekBtn.clipsToBounds = YES;

+ 4 - 3
创维盒子/双子星云手机/CloudPlayer/View/imageVersionRenewTipView.m

@@ -1,8 +1,8 @@
 //
 //  imageVersionRenewTipView.m
-// GBOX
+  //
 //
-//  Created by David on 2023/12/21.
+//  Created David on 2023/12/21.
 //
 
 #import "imageVersionRenewTipView.h"
@@ -113,11 +113,12 @@
     konwBut.layer.cornerRadius = 8;
     konwBut.layer.masksToBounds = YES;
     [konwBut addTarget:self action:@selector(colseFun) forControlEvents:UIControlEventTouchUpInside];
+    [konwBut setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
     [_whiteBgView addSubview:konwBut];
     
     CAGradientLayer *gradientLayer = [CAGradientLayer layer];
     gradientLayer.frame = CGRectMake(0, 0, 160, 48);
-    gradientLayer.colors = @[(__bridge NSString *)[UIColor hwColor:@"#0CDEFD" alpha:1.0].CGColor, (__bridge NSString *)[UIColor hwColor:@"#058DFB" alpha:1.0].CGColor];
+    gradientLayer.colors = @[(__bridge NSString *)HWFFE10FColor.CGColor, (__bridge NSString *)HWFFE411Color.CGColor];
     gradientLayer.locations = @[@(0), @(1.0f)];
     [konwBut.layer addSublayer:gradientLayer];
     

+ 5 - 42
创维盒子/双子星云手机/NAS/view/errorAlertTool.m

@@ -2,7 +2,7 @@
 //  errorAlertTool.m
 //
 //
-//  Created by David on 2024/7/20.
+//  Created David on 2024/7/20.
 //
 
 #import "errorAlertTool.h"
@@ -69,7 +69,6 @@ static errorAlertTool *shareInstance = nil;
 -(void)showNetErrorAlertFunInMain:(NSInteger)type
 {
     
-    [cachesFileManager writeLogsWithMsg:[[NSString alloc] initWithFormat:@"showNetErrorAlertFun %ld",type]];
     
     if(linkFailAlretVC
        ||(ksharedAppDelegate.isWebSockLinkOKAginType && type == 2) //重连上了但是延时消息来了
@@ -116,49 +115,13 @@ static errorAlertTool *shareInstance = nil;
 //    }
     
     BOOL isPhoneNetWorkWrongType = NO;
-    NSString *linkErrTip = NSLocalizedString(@"player_link_fail_tip_type11",nil);
+    NSString *linkErrTip = @"";
     if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable){
         linkErrTip = NSLocalizedString(@"netWork_error_tip_content",nil);
         isPhoneNetWorkWrongType = YES;
     }
     
-    if(type == 11 && !isPhoneNetWorkWrongType){
-        NSString* linkErrTitle = NSLocalizedString(@"player_link_fail_title_type11",nil);
-        linkErrTitle = [[NSString alloc] initWithFormat:@"[%ld]%@",type,linkErrTitle];
-        
-        KWeakSelf
-        linkFailAlretType2VC  = [[ComontAlretType2ViewController alloc] initWithTitle:linkErrTitle msg:linkErrTip imageStr:@"" cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil) okTitle:NSLocalizedString(@"player_link_fail_tryAgain",nil) otherTitle:NSLocalizedString(@"my_set_no_restart_phone",nil) isOkBtnHighlight:YES didClickOk:^{
-            [weakSelf tryAgainInLinkFailFun];
-            [cachesFileManager writeLogsWithMsg:@"click tryAgain"];
-            
-            if(self->curDidClickButFun){
-                self->curDidClickButFun(1);
-            }
-        } didClickCancel:^{
-            if(type == 5){
-                self->curDidClickButFun(5);
-            }
-            else{
-                exit(0);
-            }
-            
-        } didClickOther:^{//重启云机
-            [weakSelf needToRebootFun];
-            
-            if(self->curDidClickButFun){
-                self->curDidClickButFun(3);
-            }
-        }];
-                 
-         
-        linkFailAlretType2VC.modalPresentationStyle = UIModalPresentationCustom;
-         
-         [ksharedAppDelegate.window.rootViewController presentViewController:linkFailAlretType2VC animated:YES completion:^{
-             self->linkFailAlretType2VC.view.superview.backgroundColor = [UIColor clearColor];
-         }];
-        
-    }
-    else{
+    
         NSString* linkErrTitle = @"";
         if(type == 2
            ||type==5
@@ -186,7 +149,7 @@ static errorAlertTool *shareInstance = nil;
                                                                                       okTitle:NSLocalizedString(@"player_link_fail_tryAgain",nil) isOkBtnHighlight:YES
                                                                                    didClickOk:^{
             [weakSelf tryAgainInLinkFailFun];
-            [cachesFileManager writeLogsWithMsg:@"click tryAgain"];
+
             
             if(self->curDidClickButFun){
                 self->curDidClickButFun(1);
@@ -200,7 +163,7 @@ static errorAlertTool *shareInstance = nil;
          [ksharedAppDelegate.window.rootViewController presentViewController:linkFailAlretVC animated:YES completion:^{
              self->linkFailAlretVC.view.superview.backgroundColor = [UIColor clearColor];
          }];
-    }
+    
     
     linkFailAlretVC.view.tag = type;
 }