浏览代码

1.修改暂存

huangxiaodong 2 年之前
父节点
当前提交
e4adf1676e

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

@@ -15,6 +15,7 @@
 #import "CustomerWebViewController.h"
 #import "netWorkManager.h"
 #import "SuperModel.h"
+#import "allVersionView.h"
 
 @interface AboutViewController ()
 @property (nonatomic, strong) UIButton *checUpdatekBtn;
@@ -316,6 +317,15 @@
 
 - (void)didTap5NumFun
 {
-    HLog(@"55555");
+    allVersionView *view = [[allVersionView alloc] init];
+    UIWindow *keyWindow = [iTools getKeyWindow];
+    [keyWindow addSubview:view];
+    
+    [view mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(0);
+        make.left.mas_equalTo(0);
+        make.right.mas_equalTo(0);
+        make.bottom.mas_equalTo(0);
+    }];
 }
 @end

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

@@ -6,8 +6,12 @@
 //
 
 #import "allVersionView.h"
+#import "MineViewCell.h"
 
 @interface allVersionView ()<UITableViewDelegate,UITableViewDataSource>
+{
+    NSMutableArray*dataArr;
+}
 @property(nonatomic,strong)UIView *whiteBgView;
 @property(nonatomic,strong)UITableView *tableView;
 
@@ -24,9 +28,18 @@
 }
 
 - (void)drawAnyView{
+
+    dataArr = [NSMutableArray new];
+    
+    NSString *str1 = NSLocalizedString(@"my_set_about_version_tap_jingxiang",nil);
+    NSString *str2 = NSLocalizedString(@"my_set_about_version_tap_daili",nil);
+    NSString *str3 = NSLocalizedString(@"my_set_about_version_tap_app",nil);
+    NSString *str4 = NSLocalizedString(@"my_set_about_version_tap_sn",nil);
+    
     self.backgroundColor = [UIColor hwColor:@"#000000" alpha:0.6];
     
     _whiteBgView = [[UIView alloc] init];
+    _whiteBgView.backgroundColor = [UIColor whiteColor];
     _whiteBgView.layer.cornerRadius = 8;
     [self addSubview:_whiteBgView];
     
@@ -39,6 +52,7 @@
     
     UIButton* delBut = [[UIButton alloc] init];
     [delBut setImage:[UIImage imageNamed:@"common_del"] forState:UIControlStateNormal];
+    [delBut addTarget:self action:@selector(delViewFun) forControlEvents:UIControlEventTouchUpInside];
     [_whiteBgView addSubview:delBut];
     
     [delBut mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -48,7 +62,27 @@
         make.height.mas_equalTo(40.0);
     }];
     
-    //UILabel * version
+    UILabel * versionTipLabel = [[UILabel alloc] init];
+    versionTipLabel.text = NSLocalizedString(@"my_set_about_version_tap_tip",nil) ;
+    versionTipLabel.textAlignment = NSTextAlignmentCenter;
+    versionTipLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    [_whiteBgView addSubview:versionTipLabel];
+    
+    [versionTipLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(15);
+        make.right.mas_equalTo(-15);
+        make.top.mas_equalTo(30);
+        make.height.mas_equalTo(20.0);
+    }];
+    
+    [_whiteBgView addSubview:self.tableView];
+    
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(15);
+        make.right.mas_equalTo(-15);
+        make.top.mas_equalTo(versionTipLabel.mas_bottom).offset(10);
+        make.bottom.mas_equalTo(-16.0);
+    }];
 }
 
 #pragma mark - 懒加载
@@ -62,9 +96,10 @@
 //        _tableView.contentInset = UIEdgeInsetsMake(-H_STATE_BAR, 0, 0, 0);
         [_tableView setSeparatorStyle:(UITableViewCellSeparatorStyleNone)];
         [_tableView setSeparatorColor:[UIColor clearColor]];
-        [_tableView setBackgroundColor:[UIColor clearColor]];
+        [_tableView setBackgroundColor:[UIColor hwColor:@"#D8D8D8" alpha:1.0]];
         [_tableView setTableFooterView:[UIView new]];
         [_tableView setBounces:YES];
+        _tableView.layer.cornerRadius = 8;
         if (@available(iOS 15.0, *)) {
             _tableView.sectionHeaderTopPadding = 0;
         }
@@ -73,4 +108,48 @@
     
     return _tableView;
 }
+
+- (void)delViewFun
+{
+    [self removeFromSuperview];
+}
+
+#pragma mark - 列表委托
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return dataArr.count;
+}
+
+- (MineViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    NSInteger row = indexPath.row;
+    static NSString *identifier = @"MineViewCell";
+    
+    MineViewCell * cell =  [tableView dequeueReusableCellWithIdentifier:identifier];
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    if (!cell){
+        cell = [[MineViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:identifier];
+        [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+        [cell setBackgroundColor:[UIColor clearColor]];
+        [cell setAccessoryType:(UITableViewCellAccessoryNone)];
+        
+        [cell.bgViewLayer removeFromSuperlayer];
+        [cell.titleLabel2 setHidden:NO];
+        [cell.rightImage setHidden:YES];
+        [cell.mImageView setHidden:YES];
+        [cell.lineView setHidden:YES];
+        [cell.maskSwitch setHidden:YES];
+    }
+  
+    if(row < dataArr.count){
+        cell.titleLabel.text = dataArr[row];
+    }
+    
+
+    return cell;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    return 60;
+}
 @end

+ 5 - 0
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -272,3 +272,8 @@
 "File_upload_fail"   = "文件上传失败";
 "File_upload_success"   = "文件上传成功";
 "File_upload_file_already_exists"   = "文件已存在";
+"my_set_about_version_tap_tip"   = "详细版本信息";
+"my_set_about_version_tap_jingxiang"   = "镜像版本号";
+"my_set_about_version_tap_daili"   = "代理版本号";
+"my_set_about_version_tap_app"   = "手机版本号";
+"my_set_about_version_tap_sn"   = "SN号";