huangxiaodong преди 1 година
родител
ревизия
0eaa5b6f04

+ 26 - 2
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -194,6 +194,12 @@
 		6B3F963A2AD2AD0B008E349E /* newWorkInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96392AD2AD0B008E349E /* newWorkInterface.h */; };
 		6B45C4FD2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B45C4FB2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h */; };
 		6B45C4FE2B57BC87007E6911 /* cloudPhoneExtraFileListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B45C4FC2B57BC87007E6911 /* cloudPhoneExtraFileListModel.m */; };
+		6B45C5042B5F9CEC007E6911 /* diskListTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B45C5022B5F9CEC007E6911 /* diskListTableView.h */; };
+		6B45C5052B5F9CEC007E6911 /* diskListTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B45C5032B5F9CEC007E6911 /* diskListTableView.m */; };
+		6B45C5082B5FA2DD007E6911 /* diskListTableCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B45C5062B5FA2DD007E6911 /* diskListTableCell.h */; };
+		6B45C5092B5FA2DD007E6911 /* diskListTableCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B45C5072B5FA2DD007E6911 /* diskListTableCell.m */; };
+		6B45C50C2B5FA80E007E6911 /* diskListBgView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B45C50A2B5FA80E007E6911 /* diskListBgView.h */; };
+		6B45C50D2B5FA80E007E6911 /* diskListBgView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B45C50B2B5FA80E007E6911 /* diskListBgView.m */; };
 		6B4D23B12B33DDBC005B718A /* imageVersionRenewTipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B4D23AF2B33DDBB005B718A /* imageVersionRenewTipView.h */; };
 		6B4D23B22B33DDBC005B718A /* imageVersionRenewTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D23B02B33DDBB005B718A /* imageVersionRenewTipView.m */; };
 		6B5B60602B3BC8DE009A2AE2 /* fileTransferPopView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B5B605E2B3BC8DE009A2AE2 /* fileTransferPopView.h */; };
@@ -627,6 +633,12 @@
 		6B3F96392AD2AD0B008E349E /* newWorkInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = newWorkInterface.h; sourceTree = "<group>"; };
 		6B45C4FB2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cloudPhoneExtraFileListModel.h; sourceTree = "<group>"; };
 		6B45C4FC2B57BC87007E6911 /* cloudPhoneExtraFileListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = cloudPhoneExtraFileListModel.m; sourceTree = "<group>"; };
+		6B45C5022B5F9CEC007E6911 /* diskListTableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = diskListTableView.h; sourceTree = "<group>"; };
+		6B45C5032B5F9CEC007E6911 /* diskListTableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = diskListTableView.m; sourceTree = "<group>"; };
+		6B45C5062B5FA2DD007E6911 /* diskListTableCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = diskListTableCell.h; sourceTree = "<group>"; };
+		6B45C5072B5FA2DD007E6911 /* diskListTableCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = diskListTableCell.m; sourceTree = "<group>"; };
+		6B45C50A2B5FA80E007E6911 /* diskListBgView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = diskListBgView.h; sourceTree = "<group>"; };
+		6B45C50B2B5FA80E007E6911 /* diskListBgView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = diskListBgView.m; sourceTree = "<group>"; };
 		6B4D23AF2B33DDBB005B718A /* imageVersionRenewTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = imageVersionRenewTipView.h; sourceTree = "<group>"; };
 		6B4D23B02B33DDBB005B718A /* imageVersionRenewTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = imageVersionRenewTipView.m; sourceTree = "<group>"; };
 		6B5B605E2B3BC8DE009A2AE2 /* fileTransferPopView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fileTransferPopView.h; sourceTree = "<group>"; };
@@ -1478,6 +1490,12 @@
 				6B5D402E2B4BCBC1000965CF /* downLoadPreViewCell.m */,
 				6B5D40312B4BE358000965CF /* downloadFileBottomView.h */,
 				6B5D40322B4BE358000965CF /* downloadFileBottomView.m */,
+				6B45C5022B5F9CEC007E6911 /* diskListTableView.h */,
+				6B45C5032B5F9CEC007E6911 /* diskListTableView.m */,
+				6B45C5062B5FA2DD007E6911 /* diskListTableCell.h */,
+				6B45C5072B5FA2DD007E6911 /* diskListTableCell.m */,
+				6B45C50A2B5FA80E007E6911 /* diskListBgView.h */,
+				6B45C50B2B5FA80E007E6911 /* diskListBgView.m */,
 			);
 			path = view;
 			sourceTree = "<group>";
@@ -1940,6 +1958,7 @@
 				18FCE5332AD12FE00020F623 /* ConnectTestViewController.h in Headers */,
 				181E84F22A8F0A9B00292B96 /* HelpDownScrollView.h in Headers */,
 				6B2170882B1444CC00656670 /* allVersionView.h in Headers */,
+				6B45C50C2B5FA80E007E6911 /* diskListBgView.h in Headers */,
 				6B2170912B15BAE700656670 /* privacyModeViewController.h in Headers */,
 				6B1FBD3A2B467A8000926382 /* backupsFilerecordTableView.h in Headers */,
 				6BF0F3D02AD391D8000AA133 /* connectDeviceManager.h in Headers */,
@@ -1975,6 +1994,7 @@
 				6B72725F2B0E240F00C03F87 /* uploadFileRecordTableView.h in Headers */,
 				181E84F72A8F451D00292B96 /* MineViewCell.h in Headers */,
 				6B8FF6C12B05B24D00800981 /* uploadFileRecordCell.h in Headers */,
+				6B45C5082B5FA2DD007E6911 /* diskListTableCell.h in Headers */,
 				183AE6D42A8CAFAE00B11CB0 /* UIView+View.h in Headers */,
 				6BED888A2B4E819000F76DDC /* downloadFileRecordTableView.h in Headers */,
 				6B0581AF2AFCF57300D37290 /* AJPhotoGroupCell.h in Headers */,
@@ -2006,6 +2026,7 @@
 				6B5D402F2B4BCBC1000965CF /* downLoadPreViewCell.h in Headers */,
 				6B0581AD2AFCF57300D37290 /* AJPhotoGroupView.h in Headers */,
 				18F9CB072ABD7835003FF71A /* QRCodeScanForChangeDeviceViewController.h in Headers */,
+				6B45C5042B5F9CEC007E6911 /* diskListTableView.h in Headers */,
 				18664FF62AC2B3A4008F8A61 /* ShearDeviceUDPManager.h in Headers */,
 				18F9CAFF2ABD3643003FF71A /* ModifyPWDSecondViewController.h in Headers */,
 				6BF52CA12AD7C2F600A617DB /* inputPWDViewController.h in Headers */,
@@ -2296,12 +2317,14 @@
 				A084D68927E8587400054880 /* HWToolViewController.m in Sources */,
 				18E557232A3C5D75005CC84B /* NSString+FloatHandle.m in Sources */,
 				A08A950227E9A4E400C544BB /* FMDatabase.m in Sources */,
+				6B45C5052B5F9CEC007E6911 /* diskListTableView.m in Sources */,
 				6B5B60612B3BC8DE009A2AE2 /* fileTransferPopView.m in Sources */,
 				6BF52C962AD5546500A617DB /* Reachability.m in Sources */,
 				18F9CAFB2ABD35C4003FF71A /* ModifyPWDFirstViewController.m in Sources */,
 				183AE6542A8A2CF000B11CB0 /* AFURLResponseSerialization.m in Sources */,
 				A0295B1227ED938B009C5D8B /* HWHistoryViewController.m in Sources */,
 				6B1FBD232B43DAD200926382 /* backupsSetViewController.m in Sources */,
+				6B45C50D2B5FA80E007E6911 /* diskListBgView.m in Sources */,
 				A003F6D127D8425C00715CBF /* iTools.m in Sources */,
 				18EC79DD2ABC109F0084836A /* SetPWDSecondViewController.m in Sources */,
 				183AE6012A89CE3C00B11CB0 /* NSArray+JSONModel.m in Sources */,
@@ -2352,6 +2375,7 @@
 				6B0581B32AFE02B100D37290 /* uploadFileBottomView.m in Sources */,
 				181E85012A8F6B1800292B96 /* LogoSelectView.m in Sources */,
 				6B0582792AFF7C6D00D37290 /* TZAssetModel+imageData.m in Sources */,
+				6B45C5092B5FA2DD007E6911 /* diskListTableCell.m in Sources */,
 				A031DD6827EC195400909527 /* HWBookmarkViewController.m in Sources */,
 				183AE6572A8A2CF000B11CB0 /* AFURLRequestSerialization.m in Sources */,
 				6B0581AC2AFCF57300D37290 /* AJPhotoGroupCell.m in Sources */,
@@ -2800,7 +2824,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2879,7 +2903,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 130 - 21
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/downLoadPreviewViewController.m

@@ -13,10 +13,18 @@
 #import "downloadManager.h"
 #import "uploadFileRecordViewController.h"
 #import "UIScrollView+EmptyDataSet.h"
+#import "diskListBgView.h"
+#import "diskListTableView.h"
 
 @interface downLoadPreviewViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 @property (nonatomic, strong) UITableView *tableView;
+
+@property (strong, nonatomic) UILabel *MytitleLabel;
+@property (strong, nonatomic) UIImageView *selectTip;
 @property (nonatomic, strong) UIButton *rightButton;
+@property (nonatomic, strong) diskListBgView *diskListBgV;
+@property (nonatomic, strong) diskListTableView *diskListTableV;
+
 @property (nonatomic, strong) downloadFileBottomView *downloadFileBottomV;
 @property (nonatomic,assign) BOOL didGetType;
 
@@ -42,24 +50,7 @@
 
 - (void)drawAnyView{
     
-    _rightButton = [[UIButton alloc] init];
-    [_rightButton setTitle:NSLocalizedString(@"File_upload_Record_select_all",nil) forState:UIControlStateNormal];
-    [_rightButton setTitle:NSLocalizedString(@"File_upload_cancel_select_all",nil) forState:UIControlStateSelected];
-    
-    [_rightButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
-    _rightButton.titleLabel.font = [UIFont systemFontOfSize:18.0];
-    _rightButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
-    [_rightButton addTarget:self action:@selector(didClickSelectAllButton:) forControlEvents:UIControlEventTouchUpInside];
-    [self.navBarBGView addSubview:_rightButton];
-    
-    
-    
-    [_rightButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(120);
-        make.height.mas_equalTo(40);
-        make.right.mas_equalTo(-15);
-        make.centerY.mas_equalTo(self.titleLabel.mas_centerY);
-    }];
+    [self initNavHeadUIFun];
     
     [self.view addSubview:self.tableView];
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -88,6 +79,60 @@
     
 }
 
+- (void)initNavHeadUIFun
+{
+    //title
+    UILabel *titleLabel = [[UILabel alloc] init];
+    titleLabel.textAlignment = NSTextAlignmentCenter;
+    titleLabel.font = [UIFont boldSystemFontOfSize:18.0];
+    titleLabel.textColor = [UIColor blackColor];
+    titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
+    [self.navBarBGView addSubview:titleLabel];
+
+    self.MytitleLabel = titleLabel;
+    
+    //selectTipImageView
+    UIImageView *selectTip = [[UIImageView alloc] init];
+    selectTip.image = [UIImage imageNamed:@"upload_image_arrow"];
+    selectTip.translatesAutoresizingMaskIntoConstraints = NO;
+    [self.navBarBGView addSubview:selectTip];
+    self.selectTip = selectTip;
+    
+    UIButton *tapBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    tapBtn.backgroundColor = [UIColor clearColor];
+    tapBtn.translatesAutoresizingMaskIntoConstraints = NO;
+    [tapBtn addTarget:self action:@selector(selectDiskAction:) forControlEvents:UIControlEventTouchUpInside];
+    [self.navBarBGView addSubview:tapBtn];
+    
+    [tapBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.navBarBGView.mas_centerX);
+        make.centerY.mas_equalTo(self.backBtn.mas_centerY);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(30);
+    }];
+    
+    [self setTitleLabelText:@""];
+    
+    _rightButton = [[UIButton alloc] init];
+    [_rightButton setTitle:NSLocalizedString(@"File_upload_Record_select_all",nil) forState:UIControlStateNormal];
+    [_rightButton setTitle:NSLocalizedString(@"File_upload_cancel_select_all",nil) forState:UIControlStateSelected];
+    
+    [_rightButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
+    _rightButton.titleLabel.font = [UIFont systemFontOfSize:18.0];
+    _rightButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+    [_rightButton addTarget:self action:@selector(didClickSelectAllButton:) forControlEvents:UIControlEventTouchUpInside];
+    [self.navBarBGView addSubview:_rightButton];
+    
+    
+    [_rightButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(120);
+        make.height.mas_equalTo(40);
+        make.right.mas_equalTo(-15);
+        make.centerY.mas_equalTo(self.titleLabel.mas_centerY);
+    }];
+}
+
+
 #pragma mark - 懒加载
 - (UITableView *)tableView{
     if (!_tableView) {
@@ -115,6 +160,33 @@
     return _tableView;
 }
 
+- (diskListBgView*)diskListBgV
+{
+    if(!_diskListBgV){
+        _diskListBgV = [[diskListBgView alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
+        _diskListBgV.hidden = YES;
+        [self.view addSubview:_diskListBgV];
+        
+        [_diskListBgV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(0);
+            make.bottom.mas_equalTo(0);
+            make.right.mas_equalTo(0);
+            make.top.mas_equalTo(self.navBarBGView.mas_bottom);
+        }];
+       
+    }
+    
+    return  _diskListBgV;
+}
+
+- (UITableView *)diskListTableV{
+    if (!_diskListTableV) {
+        _diskListTableV = [[diskListTableView alloc] init];
+//
+    }
+    
+    return _tableView;
+}
 
 #pragma mark - 列表委托
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
@@ -211,6 +283,39 @@
     [self RefreshBottomViewUIFun];
 }
 
+#pragma mark 设置标题
+- (void)setTitleLabelText:(NSString*)title
+{
+    self.MytitleLabel.text = title;
+    
+    CGFloat curWidth = [title boundingRectWithSize:CGSizeMake(SCREEN_W, 30) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:18.f]} context:nil].size.width;
+    
+    curWidth += 20;
+    //HLog(@"title w:%f",curWidth);
+    [self.MytitleLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.navBarBGView.mas_centerX).offset(-10);
+        make.centerY.mas_equalTo(self.backBtn.mas_centerY);
+        make.width.mas_equalTo(curWidth);
+        make.height.mas_equalTo(30);
+    }];
+    //self.MytitleLabel.backgroundColor = [UIColor greenColor];
+    
+    [self.selectTip mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.MytitleLabel.mas_right).offset(2);
+        make.centerY.mas_equalTo(self.backBtn.mas_centerY);
+        make.width.mas_equalTo(15);
+        make.height.mas_equalTo(15);
+    }];
+}
+
+#pragma mark 选择硬盘
+- (void)selectDiskAction:(UIButton*)but
+{
+    if(self.diskListBgV.hidden){
+        self.diskListBgV.hidden = NO;
+    }
+}
+
 #pragma mark 刷新底部
 - (void)RefreshBottomViewUIFun
 {
@@ -232,10 +337,12 @@
     
     if(!_didGetType){
         if(_isPhotoType){
-            self.titleLabel.text = NSLocalizedString(@"my_set_no_image_upload",nil) ;
+            //self.titleLabel.text = NSLocalizedString(@"my_set_no_image_upload",nil) ;
+            [self setTitleLabelText:NSLocalizedString(@"my_set_no_image_upload",nil)];
         }
         else{
-            self.titleLabel.text = NSLocalizedString(@"my_set_no_video_upload",nil) ;
+            //self.titleLabel.text = NSLocalizedString(@"my_set_no_video_upload",nil) ;
+            [self setTitleLabelText:NSLocalizedString(@"my_set_no_video_upload",nil)];
         }
         
         [self searchFileListFun];
@@ -263,7 +370,9 @@
     
     NSMutableArray *filterArr = [NSMutableArray new];
     for (couldPhoneFileModel*model in _curCouldPhoneFileListMod.data.list) {
-        if(model.length > 1024){
+        //if(model.length > 1024)
+        if(model.length > 1024*50)
+        {
             [filterArr addObject:model];
         }
     }

+ 12 - 6
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/view/diskListBgView.m

@@ -9,12 +9,18 @@
 
 @implementation diskListBgView
 
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
+- (id)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    [self setBackgroundColor:[UIColor hwColor:@"000000" alpha:0.5]];
+    [self drawAnyView];
+    
+   
+    return self;
+}
+
+- (void)drawAnyView
+{
+    //self.backgroundColor = [UIColor redColor];
 }
-*/
 
 @end

+ 12 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/view/diskListTableCell.h

@@ -6,11 +6,22 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "cloudPhoneExtraFileListModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface diskListTableCell : UITableViewCell
+@property(nonatomic,strong)UIView *lineView;
+@property(nonatomic,strong)UIView *cellBgView;
+@property(nonatomic,strong)UIImageView *mImageView;
+@property(nonatomic,strong)UILabel *titleLabel;
+@property(nonatomic,strong)UILabel *titleLabel2;
+@property(nonatomic,strong)UIImageView *rightImage;
+@property(nonatomic, strong) CALayer* bgViewLayer;
+@property(nonatomic, strong) UIButton *checkButton;
+
+@property(nonatomic, strong) cloudPhoneExtraFileModel *curModel;
 
+@property (nonatomic,copy) void (^didClickSwitch)(BOOL SwitchOn);
 @end
 
 NS_ASSUME_NONNULL_END

+ 130 - 3
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/view/diskListTableCell.m

@@ -8,16 +8,143 @@
 #import "diskListTableCell.h"
 
 @implementation diskListTableCell
+@synthesize cellBgView;
+@synthesize mImageView;
+@synthesize titleLabel;
+@synthesize titleLabel2;
+@synthesize rightImage;
+@synthesize lineView;
+@synthesize checkButton;
 
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
 }
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    
+    if (self)
+    {
+        [self drawView];
+    }
+    
+    return self;
+}
+
+- (void)drawView
+{
+    cellBgView = [[UIView alloc] init];
+    [self.contentView addSubview:cellBgView];
+    //cellBgView.backgroundColor = [UIColor whiteColor];
+    [cellBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(0.f);
+        make.top.mas_equalTo(0);
+        make.bottom.mas_equalTo(0);
+        make.right.mas_equalTo(0.f);
+        //make.width.mas_equalTo(SCREEN_W - 2*15.f);
+    }];
+    
+    /*图片*/
+    mImageView = [[UIImageView alloc] init];
+    [mImageView setBackgroundColor:[UIColor clearColor]];
+    mImageView.image = [UIImage imageNamed:@"uploadFile_disk_icon"];
+    [cellBgView addSubview:mImageView];
+    [mImageView setContentMode:(UIViewContentModeScaleAspectFill)];
+    [mImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(15);
+        make.width.mas_equalTo(36);
+        make.height.mas_equalTo(36);
+        make.centerY.equalTo(cellBgView.mas_centerY);
+    }];
+    
+    /*右侧箭头*/
+    rightImage = [[UIImageView alloc] init];
+    [rightImage setBackgroundColor:[UIColor clearColor]];
+    [rightImage setImage:[UIImage imageNamed:@"cell_right_access"]];
+    [cellBgView addSubview:rightImage];
+    [rightImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(28);
+        make.right.mas_equalTo(-15.f);
+        make.height.mas_equalTo(28);
+        make.centerY.equalTo(cellBgView.mas_centerY);
+    }];
+    
+    checkButton = [[UIButton alloc] init];
+    [checkButton setImage:[UIImage imageNamed:@"upload_file_uncheck"] forState:UIControlStateNormal];
+    [checkButton setImage:[UIImage imageNamed:@"upload_file_check"] forState:UIControlStateSelected];
+    [cellBgView addSubview:checkButton];
+    [checkButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-18.f);
+        make.centerY.equalTo(cellBgView.mas_centerY);
+        make.width.mas_equalTo(36.f);
+        make.height.mas_equalTo(36.f);
+    }];
+    
+    [checkButton addTarget:self action:@selector(maskSwitchPressed:) forControlEvents:(UIControlEventTouchUpInside)];
+    
+    
+    /**标题*/
+    titleLabel = [[UILabel alloc] init];
+    [cellBgView addSubview:titleLabel];
+    titleLabel.font = [UIFont boldSystemFontOfSize:14.f];
+    titleLabel.numberOfLines = 0;
+    [titleLabel setTextColor:HW0A132BColor];
+    [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(mImageView.mas_right).offset(5.f);
+        make.right.equalTo(checkButton.mas_left).offset(-5.f);
+        //make.centerY.equalTo(cellBgView.mas_centerY);
+        make.top.mas_equalTo(15.f);
+    }];
+    
+    /**副标题*/
+    titleLabel2 = [[UILabel alloc] init];
+    [cellBgView addSubview:titleLabel2];
+    titleLabel2.font = [UIFont systemFontOfSize:12.f];
+    //[titleLabel2 setTextAlignment:(NSTextAlignmentRight)];
+    [titleLabel2 setTextColor:HW666666Color];
+    [titleLabel2 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-53.f);
+        make.left.mas_equalTo(titleLabel.mas_left);
+        //make.centerY.equalTo(cellBgView.mas_centerY);
+        make.bottom.mas_equalTo(-15);
+    }];
+    
+    lineView = [[UIView alloc] init];
+    [lineView setBackgroundColor:HW979797Color10];
+    [cellBgView addSubview:lineView];
+    [lineView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-15.f);
+        make.left.mas_equalTo(15.f);
+        make.bottom.mas_equalTo(0);
+        make.height.mas_equalTo(1.f);
+    }];
+    
+    
+    //titleLabel2.text = @"30GB/128GB";
+}
+
 
-    // Configure the view for the selected state
+- (void)setCurModel:(cloudPhoneExtraFileModel *)curModel
+{
+    titleLabel.text = curModel.extraPath;
+    
+    CGFloat extraAvableSizeF = curModel.extraAvableSize / 1024.0 /1024.0/1024.0;
+    CGFloat extraTotalSizeF = curModel.extraTotalSize / 1024.0 /1024.0/1024.0;
+    
+    titleLabel2.text = [[NSString alloc] initWithFormat:@"%.1fGB/%.1fGB",extraAvableSizeF,extraTotalSizeF];
+    
+    checkButton.selected = curModel.isCheckType;
+}
+
+- (void)maskSwitchPressed:(UIButton *)maskSwitch{
+    maskSwitch.selected = !maskSwitch.selected;
+    
+    if(_didClickSwitch){
+        _didClickSwitch(maskSwitch.selected);
+    }
 }
 
 @end
+

+ 62 - 6
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/view/diskListTableView.m

@@ -6,15 +6,71 @@
 //
 
 #import "diskListTableView.h"
+#import "diskListTableCell.h"
+
+@interface diskListTableView()<UITableViewDataSource,UITableViewDelegate>
+
+@end
 
 @implementation diskListTableView
 
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
+#pragma mark - init
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        [self initCommon];
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder {
+    self = [super initWithCoder:coder];
+    if (self) {
+        [self initCommon];
+    }
+    return self;
+}
+
+- (id)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self initCommon];
+    }
+    return self;
+}
+
+- (void)initCommon {
+    self.delegate = self;
+    self.dataSource = self;
+    self.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.backgroundColor = [UIColor colorWithRed:235.0/255.0 green:235.0/255.0 blue:235.0/255.0 alpha:1.0];
+}
+
+
+#pragma mark - uitableviewDelegate
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    static NSString *cellIdentifer = @"diskListTableCell";
+    diskListTableCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer forIndexPath:indexPath];
+    if(cell == nil){
+        cell = [[diskListTableCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifer];
+    }
+    
+
+    return cell;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 1;
 }
-*/
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 60.0;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    
+}
+
 
 @end

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/view/filePathCreatTableViewCell.m

@@ -50,7 +50,7 @@
     /*图片*/
     mImageView = [[UIImageView alloc] init];
     [mImageView setBackgroundColor:[UIColor clearColor]];
-    mImageView.image = [UIImage imageNamed:@"uploadFile_file_icon"];
+    mImageView.image = [UIImage imageNamed:@"uploadFile_disk_icon"];
     [cellBgView addSubview:mImageView];
     [mImageView setContentMode:(UIViewContentModeScaleAspectFill)];
     [mImageView mas_makeConstraints:^(MASConstraintMaker *make) {