文件数量 api & 姓名长度适应

Author: wanghengheng

Coding_iOS/Coding_iOS-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0</string>
+	<string>4.0.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.0.201609242340</string>
+	<string>4.0.8.201611031640</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

Coding_iOS/Models/ProjectFolders.m

@@ -60,7 +60,7 @@ - (NSDictionary *)toFoldersParams{
 }
 
 - (NSString *)toFoldersCountPathWithObj:(NSNumber *)project_id{
-    return [NSString stringWithFormat:@"api/project/%@/folders/all_file_count", project_id.stringValue];//all-file-count-with-share
+    return [NSString stringWithFormat:@"api/project/%@/folders/all-file-count-with-share", project_id.stringValue];
 }
 
 @end

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -889,13 +889,13 @@ - (void)request_Folders:(ProjectFolders *)folders inProject:(Project *)project a
                     [MobClick event:kUmeng_Event_Request_Get label:@"文件夹列表"];
 
                     //每个文件夹内的文件数量
-                    NSArray *countArray = [countData valueForKey:@"data"];
+                    countData = countData[@"data"];
+                    NSArray *countArray = [countData valueForKey:@"folders"];
                     NSMutableDictionary *countDict = [[NSMutableDictionary alloc] initWithCapacity:countArray.count];
                     for (NSDictionary *item in countArray) {
                         [countDict setObject:[item objectForKey:@"count"] forKey:[item objectForKey:@"folder"]];
                     }
-//                    countDict[@(-1)] = countData[@"shareCount"];//shareFolder 特殊处理下
-                    countDict[@(-1)] = @10;
+                    countDict[@(-1)] = countData[@"shareCount"];//shareFolder 特殊处理下
 
                     for (ProjectFolder *folder in proFolders.list) {
                         folder.count = [countDict objectForKey:folder.file_id];

Coding_iOS/Views/Cell/MemberCell.m

@@ -33,10 +33,14 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             _memberNameLabel.font = [UIFont systemFontOfSize:17];
             _memberNameLabel.textColor = kColor222;
             [self.contentView addSubview:_memberNameLabel];
-            [_memberNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.left.equalTo(self.memberIconView.mas_right).offset(10);
-                make.height.mas_equalTo(20);
-                make.centerY.equalTo(self.contentView);
+        }
+        if (!_typeIconView) {
+            _typeIconView = [UIImageView new];
+            [self.contentView addSubview:_typeIconView];
+            [_typeIconView mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.left.equalTo(self.memberNameLabel.mas_right).offset(10);
+                make.centerY.equalTo(self.memberNameLabel);
+                make.size.mas_equalTo(CGSizeMake(16, 16));
             }];
         }
         if (!_memberAliasLabel) {
@@ -75,29 +79,14 @@ - (void)setCurMember:(ProjectMember *)curMember{
     if (_curMember.alias.length > 0) {
         _memberAliasLabel.text = _curMember.alias;
         _memberAliasLabel.hidden = NO;
-        [_memberNameLabel mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.centerY.equalTo(self.contentView).offset(-10);
-        }];
     }else{
         _memberAliasLabel.hidden = YES;
-        [_memberNameLabel mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.centerY.equalTo(self.contentView);
-        }];
     }
     switch (_curMember.type.integerValue) {
         case 100://项目所有者
         case 90://项目管理员
         case 75://受限成员
         {
-            if (!_typeIconView) {
-                _typeIconView = [UIImageView new];
-                [self.contentView addSubview:_typeIconView];
-                [_typeIconView mas_makeConstraints:^(MASConstraintMaker *make) {
-                    make.left.equalTo(self.memberNameLabel.mas_right).offset(10);
-                    make.centerY.equalTo(self.memberNameLabel);
-                    make.size.mas_equalTo(CGSizeMake(16, 16));
-                }];
-            }
             [_typeIconView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"member_type_%ld", (long)_curMember.type.integerValue]]];
             _typeIconView.hidden = NO;
         }
@@ -131,6 +120,18 @@ - (void)setCurMember:(ProjectMember *)curMember{
     }else{
         _leftBtn.hidden = YES;
     }
+    _leftBtn.hidden = rand()%2;
+    
+    [_memberNameLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.memberIconView.mas_right).offset(10);
+        make.height.mas_equalTo(20);
+        make.centerY.equalTo(self.contentView).offset(_curMember.alias.length > 0? -10: 0);
+        if (_leftBtn.hidden) {
+            make.right.lessThanOrEqualTo(self.contentView).offset(_typeIconView.hidden? -15: -40);
+        }else{
+            make.right.lessThanOrEqualTo(_leftBtn.mas_left).offset(_typeIconView.hidden? -10: -35);
+        }
+    }];
 }
 
 - (void)leftBtnClicked:(id)sender{