瀏覽代碼

1.设置上传文件部分UI

huangxiaodong 2 年之前
父節點
當前提交
1f309b1ee7

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

@@ -137,6 +137,10 @@
 		18FCE5452AD136FF0020F623 /* ShortcutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FCE5432AD136FF0020F623 /* ShortcutManager.m */; };
 		18FCE5482AD15E750020F623 /* PlayerViewController+AppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 18FCE5462AD15E730020F623 /* PlayerViewController+AppDelegate.h */; };
 		18FCE5492AD15E750020F623 /* PlayerViewController+AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FCE5472AD15E750020F623 /* PlayerViewController+AppDelegate.m */; };
+		6B05815B2AFC851E00D37290 /* mySetHeadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B0581592AFC851E00D37290 /* mySetHeadView.h */; };
+		6B05815C2AFC851E00D37290 /* mySetHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B05815A2AFC851E00D37290 /* mySetHeadView.m */; };
+		6B0581602AFCD0DF00D37290 /* uploadImageOrVideoViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B05815E2AFCD0DF00D37290 /* uploadImageOrVideoViewController.h */; };
+		6B0581612AFCD0DF00D37290 /* uploadImageOrVideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B05815F2AFCD0DF00D37290 /* uploadImageOrVideoViewController.m */; };
 		6B3F96342AD2A15A008E349E /* netWorkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96322AD2A15A008E349E /* netWorkManager.h */; };
 		6B3F96352AD2A15A008E349E /* netWorkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B3F96332AD2A15A008E349E /* netWorkManager.m */; };
 		6B3F963A2AD2AD0B008E349E /* newWorkInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96392AD2AD0B008E349E /* newWorkInterface.h */; };
@@ -458,6 +462,10 @@
 		30A0956AAA5C7A03B5DB1B27 /* libPods-隐私保护.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-隐私保护.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		34FDFD4EDCAAF106290BB4FC /* Pods-隐私保护.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-隐私保护.debug.xcconfig"; path = "Target Support Files/Pods-隐私保护/Pods-隐私保护.debug.xcconfig"; sourceTree = "<group>"; };
 		5A7C795CAC690A410AE1E306 /* libPods-隐私保护-双子星云手机UITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-隐私保护-双子星云手机UITests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6B0581592AFC851E00D37290 /* mySetHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mySetHeadView.h; sourceTree = "<group>"; };
+		6B05815A2AFC851E00D37290 /* mySetHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mySetHeadView.m; sourceTree = "<group>"; };
+		6B05815E2AFCD0DF00D37290 /* uploadImageOrVideoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadImageOrVideoViewController.h; sourceTree = "<group>"; };
+		6B05815F2AFCD0DF00D37290 /* uploadImageOrVideoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadImageOrVideoViewController.m; sourceTree = "<group>"; };
 		6B3F96322AD2A15A008E349E /* netWorkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = netWorkManager.h; sourceTree = "<group>"; };
 		6B3F96332AD2A15A008E349E /* netWorkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = netWorkManager.m; sourceTree = "<group>"; };
 		6B3F96392AD2AD0B008E349E /* newWorkInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = newWorkInterface.h; sourceTree = "<group>"; };
@@ -969,14 +977,14 @@
 		18C4754C2A8E0D9B006129C0 /* Set */ = {
 			isa = PBXGroup;
 			children = (
+				6B05815D2AFCD0A900D37290 /* uploadFile */,
+				6B0581582AFC84EE00D37290 /* view */,
 				18F9CB012ABD77EF003FF71A /* ChangeDevice */,
 				18F9CAF82ABD35A2003FF71A /* ModifyPWD */,
 				184C8AD22A949D2B00F26650 /* appUpdate */,
 				184C8ACE2A94980C00F26650 /* CustomerWebViewController.h */,
 				184C8ACF2A94980D00F26650 /* CustomerWebViewController.m */,
 				181E84F82A8F577D00292B96 /* ChangeLogo */,
-				181E84F52A8F451D00292B96 /* MineViewCell.h */,
-				181E84F42A8F451C00292B96 /* MineViewCell.m */,
 				18C4754D2A8E0DB5006129C0 /* MySetViewController.h */,
 				18C4754E2A8E0DB5006129C0 /* MySetViewController.m */,
 				181E84F02A8F0A9A00292B96 /* HelpDownScrollView.h */,
@@ -1052,6 +1060,34 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		6B0581582AFC84EE00D37290 /* view */ = {
+			isa = PBXGroup;
+			children = (
+				181E84F52A8F451D00292B96 /* MineViewCell.h */,
+				181E84F42A8F451C00292B96 /* MineViewCell.m */,
+				6B0581592AFC851E00D37290 /* mySetHeadView.h */,
+				6B05815A2AFC851E00D37290 /* mySetHeadView.m */,
+			);
+			path = view;
+			sourceTree = "<group>";
+		};
+		6B05815D2AFCD0A900D37290 /* uploadFile */ = {
+			isa = PBXGroup;
+			children = (
+				6B0581622AFCDB4300D37290 /* photoView */,
+				6B05815E2AFCD0DF00D37290 /* uploadImageOrVideoViewController.h */,
+				6B05815F2AFCD0DF00D37290 /* uploadImageOrVideoViewController.m */,
+			);
+			path = uploadFile;
+			sourceTree = "<group>";
+		};
+		6B0581622AFCDB4300D37290 /* photoView */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = photoView;
+			sourceTree = "<group>";
+		};
 		6B3F96312AD2A0FA008E349E /* netWork */ = {
 			isa = PBXGroup;
 			children = (
@@ -1507,6 +1543,7 @@
 				18C4754F2A8E0DB5006129C0 /* MySetViewController.h in Headers */,
 				18FCE53F2AD136670020F623 /* PlayerViewController+TouchPointXD.h in Headers */,
 				18FCE53E2AD136670020F623 /* PlayerViewController+AdjustBtnFrame.h in Headers */,
+				6B05815B2AFC851E00D37290 /* mySetHeadView.h in Headers */,
 				6BF52CAD2AD82EA500A617DB /* PlayerControlButTipView.h in Headers */,
 				6BF52C972AD5546500A617DB /* SimplePing.h in Headers */,
 				6B3F96342AD2A15A008E349E /* netWorkManager.h in Headers */,
@@ -1523,6 +1560,7 @@
 				18BB18412AC417CB00A36F63 /* RYShearDeviceUDPManager.h in Headers */,
 				184C8AD52A949D5900F26650 /* AboutViewController.h in Headers */,
 				187076772A9F400300F15F7F /* PlayerLoadingView.h in Headers */,
+				6B0581602AFCD0DF00D37290 /* uploadImageOrVideoViewController.h in Headers */,
 				18F9CB092ABD7835003FF71A /* TipsQRCodeForChangeDeviceViewController.h in Headers */,
 				18963B462AB84398006E7C50 /* GuideView.h in Headers */,
 				18A909982ABC4A3300E6D2BE /* ComontAlretViewController.h in Headers */,
@@ -1928,6 +1966,7 @@
 				1823A8262A8601A500CE2913 /* GuideViewController.m in Sources */,
 				18A909992ABC4A3300E6D2BE /* ComontAlretViewController.m in Sources */,
 				18FCE5402AD136670020F623 /* PlayerViewController+TouchPointXD.m in Sources */,
+				6B0581612AFCD0DF00D37290 /* uploadImageOrVideoViewController.m in Sources */,
 				18E5572C2A3C6127005CC84B /* ForbidMenuTextField.m in Sources */,
 				6B3F96352AD2A15A008E349E /* netWorkManager.m in Sources */,
 				A031DD7127EC34E500909527 /* HWBookmarkHeader.m in Sources */,
@@ -1949,6 +1988,7 @@
 				A003F6A927D841C800715CBF /* BaseTabBarController.m in Sources */,
 				A003F6C027D841FF00715CBF /* FLAnimatedImage.m in Sources */,
 				A02FF6AC27D7054700D59D3F /* main.m in Sources */,
+				6B05815C2AFC851E00D37290 /* mySetHeadView.m in Sources */,
 				A08A94DB27E97DB800C544BB /* HWPageViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

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

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

二進制
创维盒子/双子星云手机/Assets.xcassets/Set/icon_image_upload.imageset/icon_image_upload@2x.png


二進制
创维盒子/双子星云手机/Assets.xcassets/Set/icon_image_upload.imageset/icon_image_upload@3x.png


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

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

二進制
创维盒子/双子星云手机/Assets.xcassets/Set/icon_video_upload.imageset/icon_video_upload@2x.png


二進制
创维盒子/双子星云手机/Assets.xcassets/Set/icon_video_upload.imageset/icon_video_upload@3x.png


+ 33 - 0
创维盒子/双子星云手机/Class/Set/MySetViewController.m

@@ -20,6 +20,8 @@
 #import "ModifyPWDFirstViewController.h"
 #import "TipsQRCodeForChangeDeviceViewController.h"
 #import "connectDeviceManager.h"
+#import "mySetHeadView.h"
+#import "uploadImageOrVideoViewController.h"
 
 @interface MySetViewController ()<HelpDownScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,ComontAlretViewControllerDelegate>
 {
@@ -57,6 +59,35 @@
 }
 
 
+
+- (UIView *)tableHeadView{
+    UIView *bgView = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, SCREEN_W, 108.f + 15))];
+    [bgView setBackgroundColor:[UIColor clearColor]];
+    
+    mySetHeadView *headView = [[mySetHeadView alloc] init];
+    [bgView addSubview:headView];
+    headView.layer.cornerRadius = 8;
+    headView.layer.masksToBounds = YES;
+    
+    [headView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(15);
+        make.right.mas_equalTo(-15);
+        make.top.mas_equalTo(0);
+        make.bottom.mas_equalTo(-15);
+    }];
+    
+#pragma mark 上传文件相关处理
+    headView.didClickBut = ^(NSInteger tag) {
+        
+        if(tag ==2 || tag ==3){
+            uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+    };
+    
+    return bgView;
+}
+
 - (UIView *)tableFoorView{
     UIView *bgView = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, SCREEN_W, 68.f))];
     [bgView setBackgroundColor:[UIColor clearColor]];
@@ -148,6 +179,7 @@
         }
         
         [_tableView setTableFooterView:[self tableFoorView]];
+        [_tableView setTableHeaderView:[self tableHeadView]];
     }
     
     return _tableView;
@@ -247,6 +279,7 @@
     return 60;
 }
 
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     

+ 16 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.h

@@ -0,0 +1,16 @@
+//
+//  uploadImageOrVideoViewController.h
+//  隐私保护
+//
+//  Created by xd h on 2023/11/9.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface uploadImageOrVideoViewController : BaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 43 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.m

@@ -0,0 +1,43 @@
+//
+//  uploadImageOrVideoViewController.m
+//  隐私保护
+//
+//  Created by xd h on 2023/11/9.
+//
+
+#import "uploadImageOrVideoViewController.h"
+#import <AssetsLibrary/AssetsLibrary.h>
+
+@interface uploadImageOrVideoViewController ()
+
+@property (weak, nonatomic) UILabel *titleLabel;
+@end
+
+@implementation uploadImageOrVideoViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    
+    [self.view setBackgroundColor:HWF5F7FAColor];
+    
+    [self.toolBar setHidden:YES];
+    [self.navigationBar setHidden:YES];
+    [self.navBarBGView setHidden:NO];
+    
+    [self initBaselUIFun];
+}
+
+- (void)initBaselUIFun
+{
+    //title
+    UILabel *titleLabel = [[UILabel alloc] init];
+    titleLabel.textAlignment = NSTextAlignmentCenter;
+    titleLabel.textColor = [UIColor whiteColor];
+    titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
+    [self.navBarBGView addSubview:titleLabel];
+
+    self.titleLabel = titleLabel;
+}
+
+@end

创维盒子/双子星云手机/Class/Set/MineViewCell.h → 创维盒子/双子星云手机/Class/Set/view/MineViewCell.h


创维盒子/双子星云手机/Class/Set/MineViewCell.m → 创维盒子/双子星云手机/Class/Set/view/MineViewCell.m


+ 18 - 0
创维盒子/双子星云手机/Class/Set/view/mySetHeadView.h

@@ -0,0 +1,18 @@
+//
+//  mySetHeadView.h
+//  隐私保护
+//
+//  Created by xd h on 2023/11/9.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface mySetHeadView : UIView
+
+//
+@property (nonatomic,copy) void (^didClickBut)(NSInteger tag);
+@end
+
+NS_ASSUME_NONNULL_END

+ 129 - 0
创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m

@@ -0,0 +1,129 @@
+//
+//  mySetHeadView.m
+//  隐私保护
+//
+//  Created by xd h on 2023/11/9.
+//
+
+#import "mySetHeadView.h"
+
+@implementation mySetHeadView
+
+- (id)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    
+    [self drawAnyView];
+    
+    return self;
+}
+
+- (void)drawAnyView{
+    [self setBackgroundColor:[UIColor whiteColor]];
+    
+    //文件上传
+    UILabel *titleLabel = [[UILabel alloc] init];
+    titleLabel.text = NSLocalizedString(@"my_set_no_File_upload",nil) ;
+    titleLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    [self addSubview:titleLabel];
+    
+    [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(20);
+    }];
+    
+    //上传记录
+    UIImageView *arrowImageView = [[UIImageView alloc] init];
+    arrowImageView.image = [UIImage imageNamed:@"cell_right_access"];
+    [self addSubview:arrowImageView];
+    
+    [arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-10);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(20);
+        make.height.mas_equalTo(20);
+    }];
+    
+    UILabel *rightLabel = [[UILabel alloc] init];
+    rightLabel.text = NSLocalizedString(@"my_set_no_File_upload_record",nil) ;
+    rightLabel.font = [UIFont systemFontOfSize:14.0];
+    rightLabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
+    rightLabel.textAlignment = NSTextAlignmentRight;
+    [self addSubview:rightLabel];
+    
+    [rightLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(arrowImageView.mas_left).offset(-2);
+        make.top.mas_equalTo(10);
+        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(20);
+    }];
+    
+    UIButton *recordBut = [[UIButton alloc] init];
+    //recordBut.backgroundColor = [UIColor greenColor];
+    recordBut.tag = 1;
+    [recordBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    [self addSubview:recordBut];
+    
+    [recordBut mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(0);
+        make.top.mas_equalTo(0);
+        make.width.mas_equalTo(150);
+        make.height.mas_equalTo(40);
+    }];
+    
+    //图片上传
+    NSString* curImgUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"  ",NSLocalizedString(@"my_set_no_image_upload",nil)];
+    UIButton *imageUploadBut = [[UIButton alloc] init];
+    [imageUploadBut setImage:[UIImage imageNamed:@"icon_image_upload"] forState:UIControlStateNormal];
+    [imageUploadBut setTitle:curImgUploadStr forState:UIControlStateNormal];
+    imageUploadBut.backgroundColor = [UIColor hwColor:@"#00D1C1" alpha:0.1];
+    imageUploadBut.layer.cornerRadius = 4;
+    [imageUploadBut setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    imageUploadBut.titleLabel.font = [UIFont systemFontOfSize:13.0];
+    imageUploadBut.tag = 2;
+    [imageUploadBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    [self addSubview:imageUploadBut];
+    
+    [imageUploadBut mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.right.mas_equalTo(self.mas_centerX).offset(-10);
+        make.bottom.mas_equalTo(-10);
+        make.height.mas_equalTo(48);
+    }];
+    
+    //视频上传
+    NSString* curVidelUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"  ",NSLocalizedString(@"my_set_no_video_upload",nil)];
+    UIButton *videoUploadBut = [[UIButton alloc] init];
+    [videoUploadBut setImage:[UIImage imageNamed:@"icon_video_upload"] forState:UIControlStateNormal];
+    [videoUploadBut setTitle:curVidelUploadStr forState:UIControlStateNormal];
+    videoUploadBut.backgroundColor = [UIColor hwColor:@"#00D8FF" alpha:0.1];
+    videoUploadBut.layer.cornerRadius = 4;
+    [videoUploadBut setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    videoUploadBut.titleLabel.font = [UIFont systemFontOfSize:13.0];
+    videoUploadBut.tag = 3;
+    [videoUploadBut addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
+    [self addSubview:videoUploadBut];
+    
+    [videoUploadBut mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-10);
+        make.left.mas_equalTo(self.mas_centerX).offset(10);
+        make.bottom.mas_equalTo(-10);
+        make.height.mas_equalTo(48);
+    }];
+}
+
+
+#pragma mark  按钮点击事件
+- (void)didClickButFun:(UIButton*)but
+{
+    NSInteger tag = but.tag;
+    
+    //HLog(@"xxxx:%ld",tag)
+    
+    if(_didClickBut){
+        _didClickBut(tag);
+    }
+}
+
+@end

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

@@ -252,3 +252,7 @@
 "my_set_no_Restore_Factory_ok_tips" = "恢复出厂设置成功";
 "my_set_no_Restore_Factory_ok_msg" = "恢复完成,将跳转到首页。";
 "my_set_no_Restore_FactoryOK" = "好的";
+"my_set_no_File_upload"   = "文件上传";
+"my_set_no_File_upload_record"   = "上传记录";
+"my_set_no_image_upload"   = "上传图片";
+"my_set_no_video_upload"   = "上传视频";