1.分享功能改版---添加分享次数和被举报的显示

创维盒子/双子星云手机/Assets.xcassets/NAS/nas_share_Divider_img.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "nas_share_Divider_img@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "nas_share_Divider_img@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

创维盒子/双子星云手机/Class/Set/previewFile/model/ShareRecordModel.h

@@ -62,7 +62,7 @@ typedef enum{
 @property (nonatomic, copy) NSString* sn;//
 @property (nonatomic, copy) NSString* addShareId;//
 @property (nonatomic, assign) NSInteger fileType;
-@property (nonatomic, assign) NSInteger platformType;
+@property (nonatomic, assign) NSInteger platformType;//平台类型 1=微信 2=QQ 3=朋友圈 4=私密
 @property (nonatomic, assign) NSInteger expirationStatus;//过期状态 0=有效 1=失效
 @property (nonatomic, copy) NSString* expirationTime;//
 @property (nonatomic, copy) NSString* createTime;

创维盒子/双子星云手机/Class/Set/previewFile/shareRecordDetailsHWViewController.m

@@ -8,15 +8,23 @@
 #import "shareRecordDetailsHWViewController.h"
 
 @interface shareRecordDetailsHWViewController ()
+@property (nonatomic,strong)UIScrollView *BgScrollView;
+
 @property (nonatomic,strong)UIView *whiteBgView;
 @property (nonatomic,strong)UILabel *shareTitleLabel;
 @property (nonatomic,strong)UILabel *shareBeginDateLabel;
 @property (nonatomic,strong)UIImageView *shareQRCodeImageView;
 @property (nonatomic,strong)UIButton*checkShareLinkButton;
-@property (nonatomic,strong)UIView *extractCodeBgView;
-@property (nonatomic,strong)UILabel *extractCodeTip2Lab;
-@property (nonatomic,strong)UIView *shareEndDateBgView;
-@property (nonatomic,strong)UILabel *shareEndDateLabel;
+
+@property (nonatomic,strong)UIImageView*lineImageView;//分割线
+
+@property (nonatomic,strong)UILabel *shareEndDateLabel;//失效日期
+@property (nonatomic,strong)UILabel *remainingNumberLabel;//剩余次数
+
+@property (nonatomic,strong)UILabel *extractCodeTipLab;//提取码
+@property (nonatomic,strong)UILabel *extractCodeTip2Lab;//提取码
+@property (nonatomic,strong)UILabel *reportTipLabel;//被投诉封禁
+@property (nonatomic,strong)UILabel *reportLabel;//被投诉封禁
 
 @property (nonatomic,strong)UIButton*cancelShareLinkButton;
 @property (nonatomic,strong)UIButton*shareLinkCopyButton;
@@ -40,33 +48,47 @@
 
 - (void)drawAnyView{
     
+    _BgScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, NAVIHEIGHT + AdaptNaviHeight, SCREEN_W, SCREEN_H - NAVIHEIGHT- AdaptNaviHeight)];
+    //_BgScrollView.backgroundColor = [UIColor greenColor];
+    //_BgScrollView.contentSize = CGSizeMake(SCREEN_W, 0);
+    [self.view addSubview:_BgScrollView];
+//    [_BgScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.left.mas_equalTo(0);
+//        make.right.mas_equalTo(0);
+//        make.top.equalTo(self.navBarBGView.mas_bottom).offset(0.f);
+//        make.bottom.mas_equalTo(0);
+//    }];
+    
     //
     _whiteBgView = [[UIView alloc] init];
     _whiteBgView.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:_whiteBgView];
+    [_BgScrollView addSubview:_whiteBgView];
     
     _whiteBgView.layer.cornerRadius = 8;
     _whiteBgView.layer.masksToBounds = YES;
     
     [_whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(15);
-        make.right.mas_equalTo(-15);
-        make.top.equalTo(self.navBarBGView.mas_bottom).offset(40.f);
-        make.height.mas_equalTo(448);
+        //make.right.mas_equalTo(-15);
+        make.width.mas_equalTo(SCREEN_W - 30);
+        //make.top.equalTo(self.navBarBGView.mas_bottom).offset(40.f);
+        make.top.mas_equalTo(40);
+        make.height.mas_equalTo(558);
     }];
     
     //文件夹图标
     UIImageView *folderImageView = [[UIImageView alloc] init];
     folderImageView.image = [UIImage imageNamed:@"uploadFile_file_icon"];
     folderImageView.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:folderImageView];
+    [_BgScrollView addSubview:folderImageView];
     
     folderImageView.layer.cornerRadius = 44;
     folderImageView.layer.masksToBounds = YES;
     
     [folderImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.navBarBGView.mas_bottom).offset(10.f);
-        make.centerX.mas_equalTo(self.view.mas_centerX);
+        //make.top.equalTo(self.navBarBGView.mas_bottom).offset(10.f);
+        make.top.mas_equalTo(10.f);
+        make.centerX.mas_equalTo(_BgScrollView.mas_centerX);
         make.width.mas_equalTo(88);
         make.height.mas_equalTo(88);
     }];
@@ -105,7 +127,8 @@
 
     [QRCodeEdgingImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(_shareBeginDateLabel.mas_bottom).offset(10.f);
-        make.centerX.mas_equalTo(self.view.mas_centerX);
+        //make.centerX.mas_equalTo(self.view.mas_centerX);
+        make.centerX.mas_equalTo(_whiteBgView.mas_centerX);
         make.width.mas_equalTo(208);
         make.height.mas_equalTo(208);
     }];
@@ -128,7 +151,7 @@
     _checkShareLinkButton.titleLabel.font = [UIFont systemFontOfSize:14.0];
     [_checkShareLinkButton addTarget:self action:@selector(didClickButtonFun:) forControlEvents:UIControlEventTouchUpInside];
     _checkShareLinkButton.tag = 1;
-    [self.view addSubview:_checkShareLinkButton];
+    [_whiteBgView addSubview:_checkShareLinkButton];
     
     [_checkShareLinkButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(15);
@@ -137,93 +160,130 @@
         make.height.mas_equalTo(30);
     }];
     
-    //提取码
-    _extractCodeBgView = [[UIView alloc] init];
-    _extractCodeBgView.backgroundColor = [UIColor hwColor:@"#F9F9F9"];
-    [_whiteBgView addSubview:_extractCodeBgView];
-    _extractCodeBgView.layer.cornerRadius = 8;
-    _extractCodeBgView.layer.masksToBounds = YES;
-    
-    [_extractCodeBgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(50);
-        make.right.mas_equalTo(-50);
-        make.top.equalTo(_checkShareLinkButton.mas_bottom).offset(15);
-        make.height.mas_equalTo(40);
-    }];
-    
-    UILabel *extractCodeTipLab = [[UILabel alloc] init];
-    extractCodeTipLab.font = [UIFont systemFontOfSize:14.f];
-    [extractCodeTipLab setTextColor:[UIColor hwColor:@"#999999"]];
-    extractCodeTipLab.text =  NSLocalizedString(@"share_Extract_code_tip",nil);
-    [_extractCodeBgView addSubview:extractCodeTipLab];
-    
-    [extractCodeTipLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(15);
-        make.width.mas_equalTo(80);
-        make.top.mas_equalTo(0);
-        make.bottom.mas_equalTo(0);
-    }];
-    
-    _extractCodeTip2Lab = [[UILabel alloc] init];
-    _extractCodeTip2Lab.font = [UIFont systemFontOfSize:14.f];
-    //[_extractCodeTip2Lab setTextAlignment:(NSTextAlignmentRight)];
-    //[_extractCodeTip2Lab setTextAlignment:(NSTextAlignmentCenter)];
-    [_extractCodeTip2Lab setTextColor:[UIColor hwColor:@"#01B7EA" alpha:1.0]];
-    [_extractCodeBgView addSubview:_extractCodeTip2Lab];
-    //extractCodeTip2Lab.text = _addShareMod.data.extractionCode;
-    
-    //_extractCodeTip2Lab.backgroundColor = [UIColor redColor];
-    
-    [_extractCodeTip2Lab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(extractCodeTipLab.mas_right);
-        make.right.mas_equalTo(-20);
-        make.top.mas_equalTo(0);
-        make.bottom.mas_equalTo(0);
-    }];
-    
     
-    //失效日期
-    _shareEndDateBgView = [[UIView alloc] init];
-    _shareEndDateBgView.backgroundColor = [UIColor hwColor:@"#F9F9F9"];
-    [_whiteBgView addSubview:_shareEndDateBgView];
-    _shareEndDateBgView.layer.cornerRadius = 8;
-    _shareEndDateBgView.layer.masksToBounds = YES;
+    //分割线 347 /32
+    CGFloat lineW = SCREEN_W - 30;
+    CGFloat lineH = (lineW*32.0)/347.0;
     
-    [_shareEndDateBgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(50);
-        make.right.mas_equalTo(-50);
-        make.top.equalTo(_extractCodeBgView.mas_bottom).offset(15);
-        make.height.mas_equalTo(40);
+    _lineImageView = [[UIImageView alloc] init];
+    //_lineImageView.backgroundColor = [UIColor lightGrayColor];
+    _lineImageView.image = [UIImage imageNamed:@"nas_share_Divider_img"];
+    [_whiteBgView addSubview:_lineImageView];
+    [_lineImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(_checkShareLinkButton.mas_bottom).offset(8);
+        make.height.mas_equalTo(lineH);
+        make.left.mas_equalTo(0);
+        make.right.mas_equalTo(0);
     }];
-    
+
     //失效时间
     UILabel *shareEndDateTipLab = [[UILabel alloc] init];
     shareEndDateTipLab.font = [UIFont systemFontOfSize:14.f];
     [shareEndDateTipLab setTextColor:[UIColor hwColor:@"#999999"]];
     shareEndDateTipLab.text =  NSLocalizedString(@"copy_share_link_Invalid_tip3",nil);
-    [_shareEndDateBgView addSubview:shareEndDateTipLab];
+    [_whiteBgView addSubview:shareEndDateTipLab];
     
     [shareEndDateTipLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(15);
+        make.left.mas_equalTo(32);
         make.width.mas_equalTo(80);
-        make.top.mas_equalTo(0);
-        make.bottom.mas_equalTo(0);
+        make.top.equalTo(_lineImageView.mas_bottom).offset(8);
+        make.height.mas_equalTo(20);
     }];
     
-
     _shareEndDateLabel = [[UILabel alloc] init];
     //_shareEndDateLabel.text = @"2024/04/25 19:45";
     //_shareEndDateLabel.textAlignment = NSTextAlignmentCenter;
     _shareEndDateLabel.textColor = HW0A132BColor;
-    _shareEndDateLabel.font = [UIFont systemFontOfSize:14.0];
-    [_shareEndDateBgView addSubview:_shareEndDateLabel];
+    _shareEndDateLabel.font = [UIFont boldSystemFontOfSize:14.0];
+    [_whiteBgView addSubview:_shareEndDateLabel];
     //_shareEndDateLabel.backgroundColor = [UIColor greenColor];
     
     [_shareEndDateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(shareEndDateTipLab.mas_right);
         make.right.mas_equalTo(0);
-        make.top.mas_equalTo(0);
-        make.bottom.mas_equalTo(0);
+        make.top.mas_equalTo(shareEndDateTipLab.mas_top);
+        make.height.mas_equalTo(20);
+    }];
+    
+    
+    //剩余次数
+    UILabel *remainingNumberTipLabel = [[UILabel alloc] init];
+    remainingNumberTipLabel.font = [UIFont systemFontOfSize:14.f];
+    [remainingNumberTipLabel setTextColor:[UIColor hwColor:@"#999999"]];
+    remainingNumberTipLabel.text =  NSLocalizedString(@"share_number_remainingNumber_tip",nil);
+    [_whiteBgView addSubview:remainingNumberTipLabel];
+    
+    [remainingNumberTipLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(32);
+        make.width.mas_equalTo(80);
+        make.top.equalTo(shareEndDateTipLab.mas_bottom).offset(10);
+        make.height.mas_equalTo(20);
+    }];
+    
+    _remainingNumberLabel = [[UILabel alloc] init];
+    _remainingNumberLabel.font = [UIFont boldSystemFontOfSize:14.f];
+    _remainingNumberLabel.text = @"80";
+    [_remainingNumberLabel setTextColor:HW0A132BColor];
+    [_whiteBgView addSubview:_remainingNumberLabel];
+
+    [_remainingNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(remainingNumberTipLabel.mas_right);
+        make.right.mas_equalTo(-20);
+        make.top.equalTo(remainingNumberTipLabel.mas_top);
+        make.height.mas_equalTo(20);
+    }];
+    
+    //提取码
+    _extractCodeTipLab = [[UILabel alloc] init];
+    _extractCodeTipLab.font = [UIFont systemFontOfSize:14.f];
+    [_extractCodeTipLab setTextColor:[UIColor hwColor:@"#999999"]];
+    _extractCodeTipLab.text =  NSLocalizedString(@"share_Extract_code_tip",nil);
+    [_whiteBgView addSubview:_extractCodeTipLab];
+    
+    [_extractCodeTipLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(32);
+        make.width.mas_equalTo(80);
+        make.top.equalTo(remainingNumberTipLabel.mas_bottom).offset(10);
+        make.height.mas_equalTo(20);
+    }];
+    
+    _extractCodeTip2Lab = [[UILabel alloc] init];
+    _extractCodeTip2Lab.font = [UIFont boldSystemFontOfSize:14.f];
+    [_extractCodeTip2Lab setTextColor:HW0A132BColor];
+    [_whiteBgView addSubview:_extractCodeTip2Lab];
+  
+    [_extractCodeTip2Lab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(_extractCodeTipLab.mas_right);
+        make.right.mas_equalTo(-20);
+        make.top.equalTo(_extractCodeTipLab.mas_top);
+        make.height.mas_equalTo(20);
+    }];
+    
+    //封禁原因
+    _reportTipLabel = [[UILabel alloc] init];
+    _reportTipLabel.font = [UIFont systemFontOfSize:14.f];
+    [_reportTipLabel setTextColor:[UIColor hwColor:@"#999999"]];
+    _reportTipLabel.text =  NSLocalizedString(@"share_report_tip1",nil);
+    [_whiteBgView addSubview:_reportTipLabel];
+    
+    [_reportTipLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(32);
+        make.width.mas_equalTo(80);
+        make.top.equalTo(_extractCodeTipLab.mas_bottom).offset(10);
+        make.height.mas_equalTo(20);
+    }];
+    
+    _reportLabel = [[UILabel alloc] init];
+    _reportLabel.font = [UIFont boldSystemFontOfSize:14.f];
+    _reportLabel.text =  NSLocalizedString(@"share_report_tip2",nil);
+    [_reportLabel setTextColor:HW0A132BColor];
+    [_whiteBgView addSubview:_reportLabel];
+    
+    [_reportLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(_reportTipLabel.mas_right);
+        make.right.mas_equalTo(-20);
+        make.top.equalTo(_reportTipLabel.mas_top);
+        make.height.mas_equalTo(20);
     }];
     
     CGFloat shareButW = (SCREEN_W - 20 -20 -15)/2.0;
@@ -234,7 +294,7 @@
     _cancelShareLinkButton.titleLabel.font = [UIFont systemFontOfSize:14.0];
     [_cancelShareLinkButton addTarget:self action:@selector(didClickButtonFun:) forControlEvents:UIControlEventTouchUpInside];
     _cancelShareLinkButton.tag = 10;
-    [self.view addSubview:_cancelShareLinkButton];
+    [_BgScrollView addSubview:_cancelShareLinkButton];
     _cancelShareLinkButton.layer.cornerRadius = 8;
     _cancelShareLinkButton.layer.masksToBounds = YES;
     _cancelShareLinkButton.backgroundColor = [UIColor hwColor:@"#E3E8F1"];
@@ -267,12 +327,13 @@
     _shareLinkCopyButton.clipsToBounds = YES;
     _shareLinkCopyButton.tag = 11;
     
-    [self.view addSubview:_shareLinkCopyButton];
+    [_BgScrollView addSubview:_shareLinkCopyButton];
 
     [_shareLinkCopyButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(-20);
+        //make.right.mas_equalTo(-20);
+        make.left.equalTo(_cancelShareLinkButton.mas_right).offset(15);
         make.width.mas_equalTo(w_btn);
-        make.top.equalTo(_whiteBgView.mas_bottom).offset(25);
+        make.top.equalTo(_cancelShareLinkButton.mas_top).offset(0);
         make.height.mas_equalTo(48);
     }];
     
@@ -327,7 +388,7 @@
 {
     //_dataModel = dataModel;
     
-    if(!_dataModel.expirationStatus){
+    if(!_dataModel.expirationStatus && !_dataModel.reportStatus){
        _cancelShareLinkButton.hidden = NO;
        _shareLinkCopyButton.hidden = NO;
         
@@ -368,42 +429,76 @@
     
     _extractCodeTip2Lab.text = _dataModel.extractionCode;
     
+    CGFloat whiteBgViewH = 558;
     if(_dataModel.platformType == 4){
         
+        if (_dataModel.reportStatus) {
+            _reportTipLabel.hidden = NO;
+            _reportLabel.hidden = NO;
+        }
+        else{
+            _reportTipLabel.hidden = YES;
+            _reportLabel.hidden = YES;
+            whiteBgViewH -= 30;
+        }
+        
+       
+        
         [_whiteBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(15);
-            make.right.mas_equalTo(-15);
-            make.top.equalTo(self.navBarBGView.mas_bottom).offset(40.f);
-            make.height.mas_equalTo(508);
+            //make.right.mas_equalTo(-15);
+            make.width.mas_equalTo(SCREEN_W - 30);
+            //make.top.equalTo(self.navBarBGView.mas_bottom).offset(40.f);
+            make.top.mas_equalTo(40);
+            make.height.mas_equalTo(whiteBgViewH);
         }];
         
-        _extractCodeBgView.hidden = NO;
         
-        [_shareEndDateBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(50);
-            make.right.mas_equalTo(-50);
-            make.top.equalTo(_extractCodeBgView.mas_bottom).offset(15);
-            make.height.mas_equalTo(40);
-        }];
     }
     else{
         
+        _extractCodeTipLab.hidden = YES;
+        _extractCodeTip2Lab.hidden = YES;
+        whiteBgViewH -= 30;
+        
+        if (_dataModel.reportStatus) {
+            _reportTipLabel.hidden = NO;
+            _reportLabel.hidden = NO;
+            
+            [_reportTipLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+                make.left.mas_equalTo(32);
+                make.width.mas_equalTo(80);
+                make.top.equalTo(_remainingNumberLabel.mas_bottom).offset(10);
+                make.height.mas_equalTo(20);
+            }];
+            
+            [_reportLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+                make.left.mas_equalTo(_reportTipLabel.mas_right);
+                make.right.mas_equalTo(-20);
+                make.top.equalTo(_reportTipLabel.mas_top);
+                make.height.mas_equalTo(20);
+            }];
+            
+        }
+        else{
+            _reportTipLabel.hidden = YES;
+            _reportLabel.hidden = YES;
+            whiteBgViewH -= 30;
+        }
+
         [_whiteBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(15);
-            make.right.mas_equalTo(-15);
-            make.top.equalTo(self.navBarBGView.mas_bottom).offset(40.f);
-            make.height.mas_equalTo(448);
+            //make.right.mas_equalTo(-15);
+            make.width.mas_equalTo(SCREEN_W - 30);
+            //make.top.equalTo(self.navBarBGView.mas_bottom).offset(40.f);
+            make.top.mas_equalTo(40);
+            make.height.mas_equalTo(whiteBgViewH);
         }];
         
-        _extractCodeBgView.hidden = YES;
-        
-        [_shareEndDateBgView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(50);
-            make.right.mas_equalTo(-50);
-            make.top.equalTo(_checkShareLinkButton.mas_bottom).offset(15);
-            make.height.mas_equalTo(40);
-        }];
+       
     }
+    
+    _BgScrollView.contentSize = CGSizeMake(SCREEN_W, 40 + whiteBgViewH + 75);
 }
 
 #pragma mark 取消分享
@@ -459,7 +554,7 @@
     }];
 }
 
-#pragma mark 分享信息重新获取
+#pragma mark 取消分享信息重新获取
 - (void)getShareOneFileListFun
 {
     _dataModel.expirationStatus = 1;

创维盒子/双子星云手机/Class/Set/previewFile/view/shareRecordTableViewCell.m

@@ -171,9 +171,9 @@
     _selectButton.selected = _dataModel.isSelectType;
     
     //剩余次数
-    _remainingNumberLabel.text = [[NSString alloc] initWithFormat:@"%@:%ld",NSLocalizedString(@"share_number_remainingNumber_tip",nil),_dataModel.remainingNumber];
+    _remainingNumberLabel.text = [[NSString alloc] initWithFormat:@"%@ %ld",NSLocalizedString(@"share_number_remainingNumber_tip",nil),_dataModel.remainingNumber];
     
-    if(_dataModel.expirationStatus){
+    if(_dataModel.expirationStatus || _dataModel.reportStatus){
         _stateLabel.text = NSLocalizedString(@"copy_share_link_Invalid_tip",nil);
         [_stateLabel setTextColor:HW666666Color]; //#01B7EA
     }

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

@@ -558,4 +558,6 @@
 "mine_sn_cancel_title"   = "注销";
 "share_number_limit_title"   = "文件分享次数";
 "share_number_limit_error_tip"   = "文件分享次数最大不能超过80次";
-"share_number_remainingNumber_tip"   = "剩余次数";
+"share_number_remainingNumber_tip"   = "剩余次数:";
+"share_report_tip1"   = "封禁原因：";
+"share_report_tip2"   = "投诉封禁";