修复云测bug

yanglingyu
1 parent ed888a12
Showing 6 changed files with 144 additions and 115 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.m
CNLiveCMineModule/Classes/CNCSubMine/View/CNMineInfoCell.m
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineCodeVC.m
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMinePersonInfoController.m
Example/CNLiveCMineModule/CNLIVEAppDelegate.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.5.8'
+  s.version          = '0.5.9'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -158,6 +158,7 @@
 {
     _titleLabel.font = UIFontCNMake(17);
     [self.iconImage sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:[UIImage imageNamed:@"mine_no_Avatar"]];
+    [self.mineListView uploadViews];
     if (![NSString isEmpty:CNUserShareModel.nickname]) {
         [self.titleLabel setText:CNUserShareModel.nickname];
     } else {
@@ -13,7 +13,6 @@
 @property (nonatomic ,strong) QMUILabel        *detailLbl;
 @property (nonatomic ,strong) UIImageView      *detailIcon;
 @property (nonatomic ,strong) UIView           *lineV;
-@property (nonatomic ,strong) UIView           *thickLineV;
 @property (nonatomic ,strong) UIImageView      *QRCodeImgV;
 @end
@@ -34,8 +33,13 @@
     [self.contentView addSubview:self.detailLbl];
     [self.contentView addSubview:self.detailIcon];
     [self.contentView addSubview:self.lineV];
-    [self.contentView addSubview:self.thickLineV];
     [self.contentView addSubview:self.QRCodeImgV];
+    [self.lineV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.equalTo(self.contentView);
+        make.left.equalTo(self.contentView).offset(10);
+        make.right.equalTo(self.contentView).offset(-10);
+        make.height.mas_equalTo(1);
+    }];
 }
 - (void)layoutSubviews {
@@ -48,7 +52,6 @@
     self.iconImageView.hidden = YES;
     self.detailLbl.hidden = YES;
     self.lineV.hidden = YES;
-    self.thickLineV.hidden = YES;
     self.QRCodeImgV.hidden = YES;
     [self.titleLbl mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.contentView).offset(20);
@@ -63,6 +66,7 @@
         case MineInfoCellTypeIcon:
         {
             self.iconImageView.hidden = NO;
+            self.lineV.hidden = NO;
             [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:model.faceUrl] placeholderImage:kCNLiveDefaultUserCircleIcon];
             [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.top.equalTo(self.contentView).offset(10);
@@ -81,12 +85,6 @@
                 make.right.equalTo(self.contentView).offset(-33);
                 make.left.equalTo(self.titleLbl.mas_right).offset(10);
             }];
-            [self.lineV mas_remakeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(self.contentView);
-                make.left.equalTo(self.contentView).offset(10);
-                make.right.equalTo(self.contentView).offset(-10);
-                make.height.mas_equalTo(1);
-            }];
         }
             break;
         case MineInfoCellTypeSex:
@@ -108,20 +106,8 @@
             break;
         case MineInfoCellTypeQR_code:
         {
-            self.thickLineV.hidden = NO;
             self.lineV.hidden = NO;
             self.QRCodeImgV.hidden = NO;
-            [self.thickLineV mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(self.contentView);
-                make.left.right.equalTo(self.contentView);
-                make.height.mas_equalTo(10);
-            }];
-            [self.lineV mas_remakeConstraints:^(MASConstraintMaker *make) {
-                make.bottom.equalTo(self.contentView);
-                make.left.equalTo(self.contentView).offset(10);
-                make.right.equalTo(self.contentView).offset(-10);
-                make.height.mas_equalTo(1);
-            }];
             [self.QRCodeImgV mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.centerY.equalTo(self.contentView);
                 make.right.equalTo(self.contentView).offset(-33);
@@ -133,6 +119,7 @@
         case MineInfoCellTypeLocation:
         {
             self.detailLbl.hidden = NO;
+            self.lineV.hidden = NO;
             self.detailLbl.text = [NSString isEmpty:model.location] ? @"中国" : model.location;
             [self.detailLbl mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.centerY.mas_equalTo(self.mas_centerY);
@@ -156,7 +143,6 @@
         case MineInfoCellTypeSignature:
         {
             self.detailLbl.hidden = NO;
-            self.thickLineV.hidden = NO;
             self.lineV.hidden = NO;
             NSString *signature = model.signature;
             if (signature) {
@@ -168,17 +154,7 @@
                 make.right.equalTo(self.contentView).offset(-33);
                 make.left.equalTo(self.titleLbl.mas_right).offset(10);
             }];
-            [self.thickLineV mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(self.contentView);
-                make.left.right.equalTo(self.contentView);
-                make.height.mas_equalTo(10);
-            }];
-            [self.lineV mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.bottom.equalTo(self.contentView);
-                make.left.equalTo(self.contentView).offset(10);
-                make.right.equalTo(self.contentView).offset(-10);
-                make.height.mas_equalTo(1);
-            }];
+           
         }
             break;
         default:
@@ -233,14 +209,6 @@
     return _lineV;
 }
-- (UIView *)thickLineV {
-    if (!_thickLineV) {
-        _thickLineV = [[UIView alloc] init];
-        _thickLineV.backgroundColor = RGB(242, 242, 242);
-    }
-    return _thickLineV;
-}
-
 - (UIImageView *)QRCodeImgV {
     if (!_QRCodeImgV) {
         _QRCodeImgV = [[UIImageView alloc] init];
@@ -56,8 +56,9 @@
     self.userModel = CNUserShareModel;
     [self.iconView sd_setImageWithURL:[NSURL URLWithString:self.userModel.faceUrl] placeholderImage:kDefaultPicIcon(60)];
     self.nameLabel.text = self.userModel.nickname;
-    self.localLabel.text = self.userModel.location;
-    
+    if (![self.userModel.location isEqualToString:@"未知"]) {
+        self.localLabel.text = self.userModel.location;
+    }
     switch (_qrCodeType) {
         case CNQrCodeTypeDefualt:
         {
@@ -37,7 +37,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.title = @"个人资料";
-    _data = [NSMutableArray arrayWithObjects:@"头像",@"昵称",@"性别",@"二维码",@"地区",@"详细地址",@"个性签名", nil];
+    _data = [NSMutableArray arrayWithObjects:@[@"头像",@"昵称",@"性别"],@[@"二维码",@"地区",@"详细地址"],@[@"个性签名"], nil];
 }
@@ -51,9 +51,12 @@
 #pragma mark - UITableViewDataSource
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    NSArray *arr = _data[section];
+    return arr.count;
+}
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
     return _data.count;
 }
-
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *identifierNormal = @"CNMineInfoCell";
@@ -61,109 +64,165 @@
     if (!cell) {
         cell = [[CNMineInfoCell alloc] initForTableView:tableView withStyle:UITableViewCellStyleSubtitle reuseIdentifier:identifierNormal];
     }
-    switch (indexPath.row) {
+    switch (indexPath.section) {
         case 0:
-        {//头像
-            cell.type = MineInfoCellTypeIcon;
+        {
+            switch (indexPath.row) {
+                case 0:
+                    //头像
+                    cell.type = MineInfoCellTypeIcon;
+                    break;
+                case 1:
+                    //昵称
+                        cell.type = MineInfoCellTypeNick;
+                    break;
+                case 2:
+                    //性别
+                        cell.type = MineInfoCellTypeSex;
+                    break;
+                    
+                default:
+                    break;
+            }
+            
         }
             break;
         case 1:
-        {//昵称
-            cell.type = MineInfoCellTypeNick;
+        {
+            switch (indexPath.row) {
+                case 0:
+                    //二维码
+                        cell.type = MineInfoCellTypeQR_code;
+                    break;
+                case 1:
+                    //地区
+                        cell.type = MineInfoCellTypeLocation;
+                    break;
+                case 2:
+                    //详细地址
+                        cell.type = MineInfoCellTypeAddress;
+                    break;
+                    
+                default:
+                    break;
+            }
         }
             break;
         case 2:
-        {//性别
-            cell.type = MineInfoCellTypeSex;
-        }
-            break;
-        case 3:
-        {//二维码
-            cell.type = MineInfoCellTypeQR_code;
-        }
-            break;
-        case 4:
-        {//地区
-            cell.type = MineInfoCellTypeLocation;
-        }
-            break;
-        case 5:
-        {//详细地址
-            cell.type = MineInfoCellTypeAddress;
-        }
-            break;
-        case 6:
-        {//个人标签
-            cell.type = MineInfoCellTypeSignature;
+        {
+            switch (indexPath.row) {
+                case 0:
+                    //个人标签
+                        cell.type = MineInfoCellTypeSignature;
+                    break;
+                    
+                default:
+                    break;
+            }
         }
             break;
-            
         default:
             break;
     }
-    cell.titleLbl.text = [_data objectAtIndex:indexPath.row];
+    cell.titleLbl.text = [_data objectAtIndex:indexPath.section][indexPath.row];
     cell.model = CNUserShareModel;
     return cell;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (indexPath.row == 0) {
+    if (indexPath.section == 0 && indexPath.row == 0) {
         return 80;
     }
-    else if (indexPath.row == 1 || indexPath.row == 2 || indexPath.row == 4) {
-        return 60;
-    }
-    else if (indexPath.row == 3 || indexPath.row == 5) {
-        return 70;
-    }
-    else return 52;
+    else return 60;
 }
 #pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView estimatedHeightForHeaderInSection:(NSInteger)section{
+    if (section == 0) {
+        return 0;
+    }
+    return 10;
+}
+- (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    UIView *view = [tableView dequeueReusableCellWithIdentifier:@"headerView"];
+    if (!view) {
+        view = [UIView new];
+        view.backgroundColor = RGB(242, 242, 242);
+    }
+    return view;
+}
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     [self.tableView qmui_clearsSelection];
-    switch (indexPath.row) {
+    switch (indexPath.section) {
         case 0:
         {
-            CNMinePersonIconController *iconVC = [[CNMinePersonIconController alloc] init];
-            [self.navigationController pushViewController:iconVC animated:YES];
+            switch (indexPath.row) {
+                case 0:
+                {
+                    CNMinePersonIconController *iconVC = [[CNMinePersonIconController alloc] init];
+                    [self.navigationController pushViewController:iconVC animated:YES];
+                }
+                    break;
+                case 1:
+                {
+                    CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeNick content:CNUserShareModel.nickname];
+                    [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
+                }
+                    break;
+                case 2:
+                {
+                    CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeSex content:CNUserShareModel.gender];
+                    [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
+                }
+                    break;
+                    
+                default:
+                    break;
+            }
+            
         }
             break;
         case 1:
         {
-            CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeNick content:CNUserShareModel.nickname];
-            [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
+            switch (indexPath.row) {
+                case 0:
+                {
+                    CNMineCodeVC *vc = [[CNMineCodeVC alloc] init];
+                    [[BaseAppDelegate sharedAppDelegate] pushViewController:vc withBackTitle:@" "];
+                }
+                    break;
+                case 1:
+                {
+                    CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeLocation content:CNUserShareModel.location];
+                    [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
+                }
+                    break;
+                case 2:
+                {
+                    CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeAddress content:CNUserShareModel.address];
+                    [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
+                }
+                    break;
+                    
+                default:
+                    break;
+            }
         }
             break;
         case 2:
         {
-            CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeSex content:CNUserShareModel.gender];
-            [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
-        }
-            break;
-        case 3:
-        {
-            CNMineCodeVC *vc = [[CNMineCodeVC alloc] init];
-            [[BaseAppDelegate sharedAppDelegate] pushViewController:vc withBackTitle:@" "];
-        }
-            break;
-        case 4:
-        {
-            CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeLocation content:CNUserShareModel.location];
-            [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
-        }
-            break;
-        case 5:
-        {
-            CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeAddress content:CNUserShareModel.address];
-            [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
-        }
-            break;
-        case 6:
-        {
-            CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeSignature content:CNUserShareModel.signature];
-            [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
+            switch (indexPath.row) {
+                case 0:
+                {
+                    CNMinePersonNicknameController *nickVC = [[CNMinePersonNicknameController alloc] initWithType:SettingTypeSignature content:CNUserShareModel.signature];
+                    [[BaseAppDelegate sharedAppDelegate] presentViewController:nickVC animated:YES completion:nil];
+                }
+                    break;
+                    
+                default:
+                    break;
+            }
         }
             break;
@@ -28,7 +28,7 @@
     [super application:application didFinishLaunchingWithOptions:launchOptions];
-    [CNUserInfoManager manager].userInfoModel.uid = @"11174272";//@"10510277";//11174272//12857262
+    [CNUserInfoManager manager].userInfoModel.uid = @"396682";//@"10510277";//11174272//12857262
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.backgroundColor = [UIColor whiteColor];