Explorar el Código

1.分享添加分成次数----进行中(暂停处理线上问题)

huangxiaodong hace 1 año
padre
commit
7b9955f871
Se han modificado 15 ficheros con 190 adiciones y 10 borrados
  1. 8 8
      创维盒子/双子星云手机.xcodeproj/project.pbxproj
  2. 22 0
      创维盒子/双子星云手机/Assets.xcassets/common/common_add_N.imageset/Contents.json
  3. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_add_N.imageset/common_add_N@2x.png
  4. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_add_N.imageset/common_add_N@3x.png
  5. 22 0
      创维盒子/双子星云手机/Assets.xcassets/common/common_add_d.imageset/Contents.json
  6. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_add_d.imageset/common_add_d@2x.png
  7. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_add_d.imageset/common_add_d@3x.png
  8. 22 0
      创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_N.imageset/Contents.json
  9. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_N.imageset/common_reduce_N@2x.png
  10. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_N.imageset/common_reduce_N@3x.png
  11. 22 0
      创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_d.imageset/Contents.json
  12. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_d.imageset/common_reduce_d@2x.png
  13. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_d.imageset/common_reduce_d@3x.png
  14. 93 2
      创维盒子/双子星云手机/Class/Set/previewFile/view/editShareView.m
  15. 1 0
      创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

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

@@ -5083,7 +5083,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5144,7 +5144,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5166,7 +5166,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5227,7 +5227,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5364,7 +5364,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5421,7 +5421,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5445,7 +5445,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5502,7 +5502,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 22 - 0
创维盒子/双子星云手机/Assets.xcassets/common/common_add_N.imageset/Contents.json

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

BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_add_N.imageset/common_add_N@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_add_N.imageset/common_add_N@3x.png


+ 22 - 0
创维盒子/双子星云手机/Assets.xcassets/common/common_add_d.imageset/Contents.json

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

BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_add_d.imageset/common_add_d@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_add_d.imageset/common_add_d@3x.png


+ 22 - 0
创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_N.imageset/Contents.json

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

BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_N.imageset/common_reduce_N@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_N.imageset/common_reduce_N@3x.png


+ 22 - 0
创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_d.imageset/Contents.json

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

BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_d.imageset/common_reduce_d@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_reduce_d.imageset/common_reduce_d@3x.png


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

@@ -23,6 +23,10 @@
 @property(nonatomic,strong) UIButton*day7Button;
 @property(nonatomic,strong) UIButton*dayForeverButton;
 
+@property(nonatomic,strong) UIButton*addButton;//+
+@property(nonatomic,strong) UITextField *shareNumberTF;
+@property(nonatomic,strong) UIButton*reduceButton;//-
+
 @property(nonatomic,strong) UIButton*PrivacyShareButton;
 @end
 
@@ -47,7 +51,7 @@
         make.left.mas_equalTo(0);
         make.right.mas_equalTo(0);
         make.bottom.mas_equalTo(0);
-        make.height.mas_equalTo(305 + AdaptTabHeight);
+        make.height.mas_equalTo(345 + AdaptTabHeight);
     }];
     
  
@@ -126,6 +130,73 @@
         make.height.mas_equalTo(25);
     }];
     
+    //1.4.1 添加分享次数限制
+    NSString *thridTitleStr = NSLocalizedString(@"share_number_limit_title",nil);
+    UILabel *thridTitleLabel = [[UILabel alloc] init];
+    thridTitleLabel.font = [UIFont systemFontOfSize:14.0];
+    thridTitleLabel.textColor = [UIColor hwColor:@"#666666" alpha:1.0];
+    thridTitleLabel.text = thridTitleStr;
+    [whiteBgView addSubview:thridTitleLabel];
+    
+    CGFloat thridWith = [thridTitleStr boundingRectWithSize:CGSizeMake(300, 20) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14.0]} context:nil].size.width + 10;
+    
+    [thridTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(25);
+        make.width.mas_equalTo(thridWith);
+        make.top.equalTo(secondTitleLabel.mas_bottom).offset(10);
+        make.height.mas_equalTo(25);
+    }];
+    
+    _addButton = [[UIButton alloc] init];
+    [_addButton setImage:[UIImage imageNamed:@"common_add_d"] forState:UIControlStateDisabled];
+    [_addButton setImage:[UIImage imageNamed:@"common_add_N"] forState:UIControlStateNormal];
+    [_addButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    _addButton.tag = 3;
+    [whiteBgView addSubview:_addButton];
+    _addButton.enabled = NO;
+    
+    [_addButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-20);
+        make.centerY.equalTo(thridTitleLabel.mas_centerY).offset(0);
+        make.width.mas_equalTo(30);
+        make.height.mas_equalTo(30);
+    }];
+    
+    _shareNumberTF = [[UITextField alloc] init];
+    _shareNumberTF.backgroundColor = [UIColor hwColor:@"#F1F2F3" alpha:1.0];
+    _shareNumberTF.layer.cornerRadius = 8;
+    _shareNumberTF.textColor = [UIColor blackColor];
+    _shareNumberTF.textAlignment = NSTextAlignmentCenter;
+    _shareNumberTF.font = [UIFont systemFontOfSize:14.0];
+    _shareNumberTF.text = @"80";
+    //_shareNumberTF.delegate = self;
+    _shareNumberTF.keyboardType = UIKeyboardTypeNumberPad;
+    [whiteBgView addSubview:_shareNumberTF];
+    [_shareNumberTF setTintColor:[UIColor hwColor:@"#01B7EA" alpha:1.0]];
+    
+    [_shareNumberTF mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(_addButton.mas_left).offset(-5);
+        make.centerY.equalTo(thridTitleLabel.mas_centerY).offset(0);
+        make.width.mas_equalTo(50);
+        make.height.mas_equalTo(25);
+    }];
+    
+    _reduceButton = [[UIButton alloc] init];
+    [_reduceButton setImage:[UIImage imageNamed:@"common_reduce_d"] forState:UIControlStateDisabled];
+    [_reduceButton setImage:[UIImage imageNamed:@"common_reduce_N"] forState:UIControlStateNormal];
+    [_reduceButton addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    _reduceButton.tag = 4;
+    [whiteBgView addSubview:_reduceButton];
+   
+    [_reduceButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(_shareNumberTF.mas_left).offset(-5);
+        make.centerY.equalTo(thridTitleLabel.mas_centerY).offset(0);
+        make.width.mas_equalTo(30);
+        make.height.mas_equalTo(30);
+    }];
+    
+    
+    
     NSArray *titleArr = @[NSLocalizedString(@"share_by_weixin",nil),
                           NSLocalizedString(@"share_by_QQ",nil),
                           NSLocalizedString(@"share_by_timeLine",nil),
@@ -149,7 +220,7 @@
             make.width.mas_equalTo(curButFullWidth);
             make.left.mas_equalTo(i*curButFullWidth);
             make.height.mas_equalTo(80);
-            make.top.equalTo(secondTitleLabel.mas_bottom).offset(20);
+            make.top.equalTo(thridTitleLabel.mas_bottom).offset(20);
         }];
         
         if(i== titleArr.count -1){
@@ -264,6 +335,26 @@
         //私密分享
         _PrivacyShareButton.hidden = YES;
     }
+    else if(tag==3){
+        NSInteger number = _shareNumberTF.text.integerValue;
+        number ++;
+        _shareNumberTF.text = [[NSString alloc] initWithFormat:@"%ld",number];
+        if(number == 80){
+            _addButton.enabled = NO;
+        }
+        
+        _reduceButton.enabled = YES;
+    }
+    else if(tag==4){
+        NSInteger number = _shareNumberTF.text.integerValue;
+        number --;
+        _shareNumberTF.text = [[NSString alloc] initWithFormat:@"%ld",number];
+        if(number == 1){
+            _reduceButton.enabled = NO;
+        }
+        
+        _addButton.enabled = YES;
+    }
     else if(tag == 100){
         [self removeFromSuperview];
     }

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

@@ -556,3 +556,4 @@
 "mine_help_title"   = "帮助与反馈";
 "mine_newuser_title"   = "新手引导";
 "mine_sn_cancel_title"   = "注销";
+"share_number_limit_title"   = "文件分享次数";