UI完善

WSCloudStorage.xcworkspace/xcuserdata/jonathanh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -115,5 +115,21 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "WSCloudStorage/VC/TabBarMore/RecyleViewController.m"
+            timestampString = "524727186.264506"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "28"
+            endingLineNumber = "28"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

WSCloudStorage/CloudStorage/CSTabBarController.m

@@ -52,14 +52,14 @@
     [nv3.tabBarItem setTitleTextAttributes:attributes forState:UIControlStateSelected];
     
     BaseViewController *vc4 = [[PreferencesViewController alloc] init];
-    IWNavigationController *nv4 = [self allocNavgationController:vc4];
+    //IWNavigationController *nv4 = [self allocNavgationController:vc4];
     
     UIImage* nv4Img = [UIImage imageNamed:@"msg_icon"];
     UIImage* nv4SelImg = [[UIImage imageNamed:@"msg_icon_sel"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-    nv4.tabBarItem = [[UITabBarItem alloc]initWithTitle:@"更多" image:nv4Img selectedImage:nv4SelImg];
-    nv4.tabBarItem.tag=3;//113, 200, 242
-    [nv4.tabBarItem setTitleTextAttributes:attributes forState:UIControlStateSelected];
-    self.viewControllers = @[nv1, nv2,nv3,nv4];
+    vc4.tabBarItem = [[UITabBarItem alloc]initWithTitle:@"更多" image:nv4Img selectedImage:nv4SelImg];
+    vc4.tabBarItem.tag=3;//113, 200, 242
+    [vc4.tabBarItem setTitleTextAttributes:attributes forState:UIControlStateSelected];
+    self.viewControllers = @[nv1, nv2,nv3,vc4];
     
     
     //认证

WSCloudStorage/VC/TabBarMore/PreferencesViewController.m

@@ -52,23 +52,23 @@ static NSString * const kCellID = @"PreferencesViewControllerCellID";
         NSArray *array = @[@{
                                @"title":@"联系人列表",
                                @"image":tmpimage,
-                               @"class":[NSObject class]},//ContactListClass
+                               @"class":@"ContactListClass class"},//ContactListClass
                            @{
                                @"title":@"回收站",
                                @"image":tmpimage,
-                               @"class":[RecyleViewController class]},
+                               @"class":@"RecyleViewController"},
                            @{
                                @"title":@"主题",
                                @"image":tmpimage,
-                               @"class":[NSObject class]},//ThemeViewController
+                               @"class":@"ThemeViewController"},//ThemeViewController
                            @{
                                @"title":@"通讯录同步",
                                @"image":tmpimage,
-                               @"class":[NSObject class]},//SyncAddressBookViewController
+                               @"class":@"SyncAddressBookViewController"},//SyncAddressBookViewController
                            @{
                                @"title":@"正在研发",
                                @"image":tmpimage,
-                               @"class":[NSObject class]}//DevelopingViewController
+                               @"class":@"DevelopingViewController"}//DevelopingViewController
                            ];
         for (NSDictionary *dict in array) {
             BAGridItemModel *model = [BAGridItemModel new];
@@ -180,23 +180,29 @@ static NSString * const kCellID = @"PreferencesViewControllerCellID";
         weakSelf.gridView = tempView;
         
     } block:^(BAGridItemModel *model, NSIndexPath *indexPath) {
-        //const char className = model.className;
-        UIViewController *kclass = [model.classWithName new];
-        if (kclass) {
-            [weakSelf.navigationController pushViewController:kclass animated:YES];
+
+        Class objclass = NSClassFromString(model.classWithName);
+        if (objclass) {
+            id viewcontroller = [[objclass alloc]init];
+            UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:viewcontroller];
+            [weakSelf presentViewController:nav animated:YES completion:nil];
+             
         }
 
         NSLog(@"tap:%@",indexPath);
         //            BAKit_ShowAlertWithMsg_ios8(model.titleString);
     }];
-    gridview.frame = CGRectMake(0, CGRectGetMaxY(avatarview.frame)+20, screenW, kGridView_H);
-    [self.view addSubview:gridview];
+    gridview.frame = CGRectMake(0, CGRectGetMaxY(avatarview.frame)+20, screenW, kGridView_H+20);
+    //[self.view addSubview:gridview];
     self.gridView = gridview;
-    
+    CALayer *garylayer = [CALayer layer];
+    garylayer.frame = CGRectMake(0, kGridView_H, screenW, 10);
+    garylayer.backgroundColor = self.view.backgroundColor.CGColor;
+    [gridview.layer addSublayer:garylayer];
     residualRightH =screenH - CGRectGetMaxY(gridview.frame) +20;
     
     
-    UITableView *tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(gridview.frame)+20, screenW, residualRightH) style:UITableViewStylePlain];
+    UITableView *tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(avatarview.frame)+20, screenW, screenH- CGRectGetMaxY(avatarview.frame) -64) style:UITableViewStylePlain];
     //footview
     UIView *footview = [[UIView alloc]initWithFrame:CGRectMake(0, 0, screenW, 54)];
     UIButton *exitBtn = [UIButton buttonWithType:UIButtonTypeSystem];
@@ -207,6 +213,7 @@ static NSString * const kCellID = @"PreferencesViewControllerCellID";
     
     [footview addSubview:exitBtn];
     tableView.backgroundColor = [UIColor clearColor];
+    tableView.tableHeaderView = gridview;
     tableView.tableFooterView = footview;
     [self.view addSubview:tableView];
     tableView.dataSource = self;
@@ -217,7 +224,7 @@ static NSString * const kCellID = @"PreferencesViewControllerCellID";
     [self.progressview setProgress:.34 animated:YES];
 }
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    return 3;
+    return self.tableDataArray.count;
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellID];

WSCloudStorage/VC/TabBarMore/RecyleViewController.m

@@ -13,11 +13,18 @@
 @end
 
 @implementation RecyleViewController
-
+-(void)dismisself{
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = @"回收站";
+    //self.navigationController.navigationItem.leftBarButtonItem =
+    UIBarButtonItem *leftback = [[UIBarButtonItem alloc]initWithTitle:@"返回" style:UIBarButtonItemStylePlain target:self action:@selector(dismisself)];
+    self.navigationItem.leftBarButtonItem = leftback;
+    self.navigationItem.leftItemsSupplementBackButton = YES;
     // Do any additional setup after loading the view.
+    
     [self initSubView];
 }