1.分享相关1111

创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -90,12 +90,12 @@ isBangsScreen; \
 //#define CloudService           @"http://14.18.190.141:11180"
 //#define CloudService           @"http://14.18.190.141:1280"
 //创维盒子 测试地址
-//#define CloudService   @"http://14.18.190.141:1801"
-//#define shareService   @"http://testprivacy.phone.armclouding.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
+#define CloudService   @"http://14.18.190.141:1801"
+#define shareService   @"http://testprivacy.phone.armclouding.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //生产环境
-#define CloudService   @"http://hiboxde.armclouding.com:7780"
-#define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//#define CloudService   @"http://hiboxde.armclouding.com:7780"
+//#define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"
 

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

@@ -67,6 +67,12 @@ typedef enum{
 @property (nonatomic, copy) NSString* expirationTime;//
 @property (nonatomic, copy) NSString* createTime;
           
+//1.4.1 新增字段
+@property (nonatomic, assign) NSInteger remainingNumber;//剩余次数
+@property (nonatomic, assign) NSInteger shareNumber;//分享次数
+@property (nonatomic, assign) BOOL reportStatus;//举报状态 0=未举报 1=已举报
+@property (nonatomic, copy) NSString* reportTime;//举报时间
+
 @property (nonatomic, strong) NSArray<ShareFileDataModel>* fileListVOS;
 
 //自定义

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

@@ -19,7 +19,7 @@
 #import <TencentOpenAPI/QQApiInterface.h>
 #import <TencentOpenAPI/QQApiInterfaceObject.h>
 
-@interface editShareView ()
+@interface editShareView ()<UITextFieldDelegate>
 @property(nonatomic,strong) UIButton*day7Button;
 @property(nonatomic,strong) UIButton*dayForeverButton;
 
@@ -169,7 +169,7 @@
     _shareNumberTF.textAlignment = NSTextAlignmentCenter;
     _shareNumberTF.font = [UIFont systemFontOfSize:14.0];
     _shareNumberTF.text = @"80";
-    //_shareNumberTF.delegate = self;
+    _shareNumberTF.delegate = self;
     _shareNumberTF.keyboardType = UIKeyboardTypeNumberPad;
     [whiteBgView addSubview:_shareNumberTF];
     [_shareNumberTF setTintColor:[UIColor hwColor:@"#01B7EA" alpha:1.0]];
@@ -446,6 +446,12 @@
     [paraDict setValue:[NSNumber numberWithInteger:expirationDay] forKey:@"expirationDay"];
     [paraDict setValue:boxShareFileDTOList forKey:@"boxShareFileDTOList"];
     
+    //1.4.1 新增的字段
+    if(_shareNumberTF.text)
+    {
+        [paraDict setValue:_shareNumberTF.text forKey:@"shareNumber"];
+    }
+    
     KWeakSelf
     //[ showNewIndicatorWithCanBack:NO canTouch:NO];
     [[netWorkManager shareInstance] CommonPostCallBackCode:addShareInfoFun Parameters:paraDict success:^(id  _Nonnull responseObject) {
@@ -464,6 +470,8 @@
 
 - (void)gotoShareFunWith:(NSInteger)tag with:(addShareModel*)model
 {
+    [self removeFromSuperview];
+    
     //type1 朋友圈 2 微信好友 3 QQ
     NSInteger shareType = 1;
     if(tag == 10){
@@ -504,7 +512,7 @@
 
 - (void)showSecretShareViewFunwith:(addShareModel*)model
 {
-    [self removeFromSuperview];
+    
     
     shareBySecretView *secretView = [[shareBySecretView alloc] init];
     secretView.addShareMod = model;
@@ -518,5 +526,16 @@
         make.bottom.mas_equalTo(0);
     }];
 }
+
+#pragma mark 分享次数编辑完成
+- (void)textFieldDidEndEditing:(UITextField *)textField
+{
+    NSInteger shareNum = textField.text.integerValue;
+    if(shareNum > 80){
+        textField.text = @"80";
+        
+        [[iToast makeText:NSLocalizedString(@"share_number_limit_error_tip",nil)] show];
+    }
+}
 @end
 

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

@@ -16,6 +16,7 @@
 @property (nonatomic, strong) UIButton *selectButton;
 @property(nonatomic,strong)UIImageView *lockImageView;
 @property(nonatomic,strong)UILabel *stateLabel;
+@property(nonatomic,strong)UILabel *remainingNumberLabel;//剩余分享次数
 @end
 
 @implementation shareRecordTableViewCell
@@ -81,16 +82,29 @@
     
     self.selectButton = but;
     
+    _remainingNumberLabel = [[UILabel alloc] init];
+    [self.contentView addSubview:_remainingNumberLabel];
+    _remainingNumberLabel.textAlignment = NSTextAlignmentRight;
+    _remainingNumberLabel.font = [UIFont systemFontOfSize:12.f];
+    [_remainingNumberLabel setTextColor:HW666666Color]; //#01B7EA
+    [_remainingNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(80);
+        make.right.equalTo(_rightImage.mas_left).offset(-5.f);
+        //make.centerY.equalTo(self.mas_centerY);
+        make.top.mas_equalTo(15.f);
+    }];
+    
     _stateLabel = [[UILabel alloc] init];
     [self.contentView addSubview:_stateLabel];
     _stateLabel.textAlignment = NSTextAlignmentRight;
-    _stateLabel.font = [UIFont systemFontOfSize:11.f];
+    _stateLabel.font = [UIFont systemFontOfSize:12.f];
     [_stateLabel setTextColor:HW666666Color]; //#01B7EA
     [_stateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(80);
         make.right.equalTo(_rightImage.mas_left).offset(-5.f);
-        make.centerY.equalTo(self.mas_centerY);
+        //make.centerY.equalTo(self.mas_centerY);
         //make.top.mas_equalTo(15.f);
+        make.top.equalTo(_remainingNumberLabel.mas_bottom).offset(7);
     }];
     
     
@@ -156,6 +170,9 @@
     
     _selectButton.selected = _dataModel.isSelectType;
     
+    //剩余次数
+    _remainingNumberLabel.text = [[NSString alloc] initWithFormat:@"%@:%ld",NSLocalizedString(@"share_number_remainingNumber_tip",nil),_dataModel.remainingNumber];
+    
     if(_dataModel.expirationStatus){
         _stateLabel.text = NSLocalizedString(@"copy_share_link_Invalid_tip",nil);
         [_stateLabel setTextColor:HW666666Color]; //#01B7EA

创维盒子/双子星云手机/netWork/netWorkManager.m

@@ -101,11 +101,11 @@ static netWorkManager *Game_NetWorkShareInstance = nil;
     //[manager.requestSerializer setValue:@"1.0" forHTTPHeaderField:@"rc-sdk"];
     //[manager.requestSerializer setValue:@"1" forHTTPHeaderField:@"rc-platform"]; //iOS 1 安卓0
     
-//    NSString *version = [NSString stringWithFormat:@"v%@", [IPhoneInfoAndToolsManager appVersion]];
+   // NSString *version = [NSString stringWithFormat:@"v%@", [IPhoneInfoAndToolsManager appVersion]];
 //    NSString *uuid    = [IPhoneInfoAndToolsManager phoneDeviceUuid];
-//    [manager.requestSerializer setValue:version forHTTPHeaderField:@"versionName"];
+   // [manager.requestSerializer setValue:version forHTTPHeaderField:@"versionName"];
 //    [manager.requestSerializer setValue:uuid forHTTPHeaderField:@"devicesId"];
-//    [manager.requestSerializer setValue:@"4" forHTTPHeaderField:@"client"];
+    [manager.requestSerializer setValue:@"ios" forHTTPHeaderField:@"Source-Type"];
     
     if ([mCloudService rangeOfString:@"https"].location != NSNotFound)
     {

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

@@ -557,3 +557,5 @@
 "mine_newuser_title"   = "新手引导";
 "mine_sn_cancel_title"   = "注销";
 "share_number_limit_title"   = "文件分享次数";
+"share_number_limit_error_tip"   = "文件分享次数最大不能超过80次";
+"share_number_remainingNumber_tip"   = "剩余次数";