Parcourir la source

1.更新版本弹框删除按钮颜色问题
2.展示版本信息的sn用云机的(串机后显示两个)

huangxiaodong il y a 1 an
Parent
commit
8f9ae7c626

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

@@ -91,7 +91,7 @@ static HaveNewVersionView * _instance;
     /*删除按钮*/
     deleteBtn = [[UIButton alloc] init];
     [deleteBtn setBackgroundColor:[UIColor clearColor]];
-    [deleteBtn setImage:[UIImage imageNamed:@"guanbi_bai_icon"] forState:(UIControlStateNormal)];
+    [deleteBtn setImage:[UIImage imageNamed:@"common_del"] forState:(UIControlStateNormal)];
     [deleteBtn addTarget:self action:@selector(deleteBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
     [bgView addSubview:deleteBtn];
     

+ 15 - 4
创维盒子/双子星云手机/Class/Set/view/allVersionView.m

@@ -44,6 +44,7 @@
     NSString *str5 = NSLocalizedString(@"my_set_about_version_tap_sn",nil);
     NSString *str6 = NSLocalizedString(@"my_set_about_version_tap_av",nil);
     NSString *str7 = NSLocalizedString(@"my_set_about_version_tap_newVersion",nil);
+    NSString *str8 = @"sdnId";
     
     [dataArr addObject:str1];
     [dataArr addObject:str1_1];
@@ -54,6 +55,7 @@
     [dataArr addObject:str5];
     [dataArr addObject:str6];
     [dataArr addObject:str7];
+    [dataArr addObject:str8];
     
     self.backgroundColor = [UIColor hwColor:@"#000000" alpha:0.6];
     
@@ -65,7 +67,7 @@
     [_whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(20);
         make.right.mas_equalTo(-20);
-        make.height.mas_equalTo(500);
+        make.height.mas_equalTo(560);
         make.centerY.mas_equalTo(self.center).offset(-20);
     }];
     
@@ -189,9 +191,14 @@
                 cell.detailTextLabel.text = [NSString stringWithFormat:@"V%@",vers];
             }
                 break;
-            case 6:
-                //cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.sn;
-                cell.detailTextLabel.text = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn;
+            case 6:{
+                if([_couldphoneSysInfoMod.data.data.sn isEqualToString:[connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn]){
+                    cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.sn;
+                }
+                else{
+                    cell.detailTextLabel.text = [[NSString alloc] initWithFormat:@"%@(%@)",_couldphoneSysInfoMod.data.data.sn,[connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn];
+                }
+            }
                 break;
             case 7:{
                 cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.AVVersion;
@@ -201,6 +208,10 @@
                 cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.MyNewVersion;
             }
                 break;
+            case 9:{
+                cell.detailTextLabel.text = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sdnId;
+            }
+                break;
         }
     }