PreferencesViewController .initSubViews part1

WSCloudStorage.xcodeproj/project.pbxproj

@@ -70,7 +70,6 @@
 		AC73C7DE1F2890BA00155E1F /* NSDictionary+JSON.m in Sources */ = {isa = PBXBuildFile; fileRef = AC73C7DD1F2890BA00155E1F /* NSDictionary+JSON.m */; };
 		AC73C7E11F28910300155E1F /* NSString+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = AC73C7E01F28910300155E1F /* NSString+Extension.m */; };
 		AC84AD9D1F31B4B500C3562B /* PreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AC84AD9C1F31B4B500C3562B /* PreferencesViewController.m */; };
-		AC84ADA21F31B67500C3562B /* ItemListView.m in Sources */ = {isa = PBXBuildFile; fileRef = AC84ADA11F31B67500C3562B /* ItemListView.m */; };
 		AC91F09B1F2979550034ADBE /* StitchingImage.m in Sources */ = {isa = PBXBuildFile; fileRef = AC91F09A1F2979550034ADBE /* StitchingImage.m */; };
 		AC91F09E1F297B4E0034ADBE /* NSMutableDictionary+MuiltKeyValue.m in Sources */ = {isa = PBXBuildFile; fileRef = AC91F09D1F297B4E0034ADBE /* NSMutableDictionary+MuiltKeyValue.m */; };
 		AC91F0A11F297BDB0034ADBE /* CustomButton.m in Sources */ = {isa = PBXBuildFile; fileRef = AC91F0A01F297BDB0034ADBE /* CustomButton.m */; };
@@ -239,8 +238,6 @@
 		AC73C7E01F28910300155E1F /* NSString+Extension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Extension.m"; path = "CloudStorage/Category/NSString+Extension.m"; sourceTree = "<group>"; };
 		AC84AD9B1F31B4B500C3562B /* PreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesViewController.h; sourceTree = "<group>"; };
 		AC84AD9C1F31B4B500C3562B /* PreferencesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesViewController.m; sourceTree = "<group>"; };
-		AC84ADA01F31B67500C3562B /* ItemListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ItemListView.h; sourceTree = "<group>"; };
-		AC84ADA11F31B67500C3562B /* ItemListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ItemListView.m; sourceTree = "<group>"; };
 		AC91F0991F2979550034ADBE /* StitchingImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StitchingImage.h; path = 3rd/StitchingImage.h; sourceTree = "<group>"; };
 		AC91F09A1F2979550034ADBE /* StitchingImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StitchingImage.m; path = 3rd/StitchingImage.m; sourceTree = "<group>"; };
 		AC91F09C1F297B4E0034ADBE /* NSMutableDictionary+MuiltKeyValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSMutableDictionary+MuiltKeyValue.h"; path = "CloudStorage/Category/NSMutableDictionary+MuiltKeyValue.h"; sourceTree = "<group>"; };
@@ -672,8 +669,6 @@
 		AC84AD9F1F31B60300C3562B /* view */ = {
 			isa = PBXGroup;
 			children = (
-				AC84ADA01F31B67500C3562B /* ItemListView.h */,
-				AC84ADA11F31B67500C3562B /* ItemListView.m */,
 			);
 			path = view;
 			sourceTree = "<group>";
@@ -1057,7 +1052,6 @@
 				AC91F0A41F297EAB0034ADBE /* UIView+extra.m in Sources */,
 				AC91F0A71F2980D10034ADBE /* CustomSearchBar.m in Sources */,
 				AC91F0AA1F29821D0034ADBE /* MyColors.m in Sources */,
-				AC84ADA21F31B67500C3562B /* ItemListView.m in Sources */,
 				AC73C77D1F28747600155E1F /* CSAlertView.m in Sources */,
 				AC73C7751F28747600155E1F /* CSFileModel.m in Sources */,
 				AC73C79C1F287ED100155E1F /* HttpRequest.m in Sources */,

WSCloudStorage/VC/More/PreferencesViewController.h

@@ -6,8 +6,7 @@
 //  Copyright © 2017年 wswinsoft. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
-
-@interface PreferencesViewController : BaseTableViewController
+#import "BaseViewController.h"
+@interface PreferencesViewController : BaseViewController
 
 @end

WSCloudStorage/VC/More/PreferencesViewController.m

@@ -7,11 +7,48 @@
 //
 
 #import "PreferencesViewController.h"
-
+#define AvatarWH 80
+#define MaxX(view) CGRectGetMaxX(view.frame)
+#define EqualY(view) view.frame.origin.y
+//#define MaxXPlus(MaxX(v),plusnumber) (MaxX(v) + plusnumber)
+//Avatar frame
+#define MarginLeft 20
+@interface PreferencesViewController()<UITableViewDelegate,UITableViewDataSource>
+@property(nonatomic,weak)UIImageView *avatarview;
+@property(nonatomic,weak)UIProgressView *progressview;
+@property(nonatomic,weak)UITableView *tableview;
+@end
 @implementation PreferencesViewController
 -(void)viewDidLoad{
     [super viewDidLoad];
     
+    
+}
+-(void)initSubViews{
+    //|----|namelabel
+    //|头像 |progress
+    //|____|descritionlabel
+    CGFloat screenW = SCREEN_WIDTH;
+    CGFloat leftRightW;
+    UIImageView *avatarview = [[UIImageView alloc]init];
+    avatarview.layer.cornerRadius = AvatarWH/2;
+    avatarview.layer.masksToBounds = YES;
+    avatarview.frame = CGRectMake(MarginLeft, 20, AvatarWH, AvatarWH);
+    avatarview.backgroundColor = [UIColor grayColor];
+    [self.view addSubview:avatarview];
+    self.avatarview = avatarview;
+    
+    leftRightW = screenW - MaxX(avatarview) - 10;//10 为何下一个控件的x距离
+    
+    UILabel *namelab = [[UILabel alloc]init];
+    namelab.textColor = [UIColor blackColor];
+    namelab.font = [UIFont boldSystemFontOfSize:18];
+    namelab.text = [userDefaults objectForKey:@"displayName"];
+    namelab.frame = CGRectMake(MaxX(avatarview)+ 10, EqualY(avatarview), 200, 30);//临时写死
+    [self.view addSubview:namelab];
+    
+    UIProgressView *progressview = [[UIProgressView alloc]initWithFrame:CGRectMake(screenW-leftRightW,avatarview.centerY -2 , leftRightW, 4)];
+    progressview.progressTintColor = RGB(<#r#>, <#g#>, <#b#>)    progressview.backgroundColor = [UIColor lightGrayColor]
 }
 
 @end

WSCloudStorage/VC/More/view/ItemListView.m

@@ -54,6 +54,7 @@
     if (self =[self init]) {
         if (!array) {
             self.itemTypeArray = array;
+            
         }
         else{
             //未传入则不填充;
@@ -86,13 +87,13 @@
                                 ,...以此类推
          }
          */
-        NSArray *iconArray = @[@"itemtype_SyncContact",@"itemType_Recycle",@"itemType_Theme",@"itemType_Developing"];
-        NSArray *titleArray = @[@"通讯录",@"照片",@"文档",@"视频",@"音频"];
-        self.itemTypeArray = @[@(CSFileTypeAll),@(CSFileTypePic),@(CSFileTypeDoc),@(CSFileTypeVideo),@(CSFileTypeAudio)];
+        //NSArray *iconArray = @[@"itemtype_SyncContact",@"itemType_Recycle",@"itemType_Theme",@"itemType_Developing"];
+        //NSArray *titleArray = @[@"通讯录",@"照片",@"文档",@"视频",@"音频"];
+        //self.itemTypeArray = @[@(CSFileTypeAll),@(CSFileTypePic),@(CSFileTypeDoc),@(CSFileTypeVideo),@(CSFileTypeAudio)];
         
         //实际多少页
-        NSInteger pageCount = (iconArray.count / (LineNum * RowNum));
-        if (iconArray.count % (LineNum * RowNum) != 0) {
+        NSInteger pageCount = (_itemTypeArray.count / (LineNum * RowNum));
+        if (_itemTypeArray.count % (LineNum * RowNum) != 0) {
             pageCount += 1;
         }
         self.utilityPagesCount = pageCount;
@@ -171,11 +172,11 @@
     cell.utilityOperateBlock = ^(ItemType type)
     {
         
-        if (weakself.utilityOperateBlock && weakself.currentPageIndex * (LineNum * RowNum - 1) + type < weakself.fileTypeArray.count) {
+        if (weakself.utilityOperateBlock && weakself.currentPageIndex * (LineNum * RowNum - 1) + type < weakself.itemTypeArray.count) {
             
-            NSNumber *typeNum = weakself.fileTypeArray[weakself.currentPageIndex * (LineNum * RowNum - 1) + type];
+            NSNumber *typeNum = weakself.itemTypeArray[weakself.currentPageIndex * (LineNum * RowNum - 1) + type];
             
-            weakself.utilityOperateBlock((CSFileType)typeNum.integerValue);
+            weakself.utilityOperateBlock((ItemType)typeNum.integerValue);
         }
     };
     
@@ -193,7 +194,7 @@
 #pragma mark - uicollectionviewlayoutdatasource
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    return CGSizeMake(UtilityCellWidth ,OnePageUtilityCellHeight);
+    return CGSizeMake(UtilityCellWidth ,UtilityCellHeight);
 }
 
 -(UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
@@ -238,24 +239,24 @@
 
 @end
 
-@interface CSFileOnePageUtilityCell()
-@property (nonatomic , weak)CSFileOnePageUtilityView *pageUtilityView;
+@interface PageUtilityCell()
+@property (nonatomic , weak)PageUtilityView *pageUtilityView;
 @end
-@implementation CSFileOnePageUtilityCell
+@implementation PageUtilityCell
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
         
-        CSFileOnePageUtilityView *pageUtilityView = [[CSFileOnePageUtilityView alloc]init];
+        PageUtilityView *pageUtilityView = [[PageUtilityView alloc]init];
         
         
         __weak typeof(self)weakself = self;
         
-        pageUtilityView.utilityOperateBlock = ^(CSFileType csFileType){
+        pageUtilityView.utilityOperateBlock = ^(ItemType itemtype){
             
             if (weakself.utilityOperateBlock) {
                 
-                weakself.utilityOperateBlock(csFileType);
+                weakself.utilityOperateBlock(itemtype);
             }
             
         };
@@ -267,8 +268,12 @@
     return self;
 }
 
+- (void)setUitilityIconsArray:(NSDictionary *)itemListDic{
+    NSArray *array
+}
 - (void)setUitilityIconsArray:(NSArray *)iconArray titlesArray:(NSArray *)titleArray
 {
+    
     [self.pageUtilityView setUitilityIconsArray:iconArray titlesArray:titleArray];
 }
 
@@ -281,13 +286,13 @@
 @end
 
 
-@interface CSFileOnePageUtilityView()
+@interface PageUtilityView()
 
 
 @end
 
 
-@implementation CSFileOnePageUtilityView
+@implementation PageUtilityView
 - (instancetype)init
 {
     if(self = [super init])
@@ -324,7 +329,7 @@
 - (void)utilityAction:(CustomButton *)btn
 {
     if (self.utilityOperateBlock) {
-        self.utilityOperateBlock((CSFileType)btn.tag);
+        self.utilityOperateBlock((ItemType)btn.tag);
     }
 }