Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 9fc892c

Browse files
文件数量 api & 姓名长度适应
1 parent cac9e8c commit 9fc892c

File tree

4 files changed

+26
-25
lines changed

4 files changed

+26
-25
lines changed

‎Coding_iOS/Coding_iOS-Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>4.0</string>
20+
<string>4.0.8</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>4.0.201609242340</string>
39+
<string>4.0.8.201611031640</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>

‎Coding_iOS/Models/ProjectFolders.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ - (NSDictionary *)toFoldersParams{
6060
}
6161

6262
- (NSString *)toFoldersCountPathWithObj:(NSNumber *)project_id{
63-
return [NSString stringWithFormat:@"api/project/%@/folders/all_file_count", project_id.stringValue];//all-file-count-with-share
63+
return [NSString stringWithFormat:@"api/project/%@/folders/all-file-count-with-share", project_id.stringValue];
6464
}
6565

6666
@end

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -889,13 +889,13 @@ - (void)request_Folders:(ProjectFolders *)folders inProject:(Project *)project a
889889
[MobClick event:kUmeng_Event_Request_Get label:@"文件夹列表"];
890890

891891
//每个文件夹内的文件数量
892-
NSArray *countArray = [countData valueForKey:@"data"];
892+
countData = countData[@"data"];
893+
NSArray *countArray = [countData valueForKey:@"folders"];
893894
NSMutableDictionary *countDict = [[NSMutableDictionary alloc] initWithCapacity:countArray.count];
894895
for (NSDictionary *item in countArray) {
895896
[countDict setObject:[item objectForKey:@"count"] forKey:[item objectForKey:@"folder"]];
896897
}
897-
// countDict[@(-1)] = countData[@"shareCount"];//shareFolder 特殊处理下
898-
countDict[@(-1)] = @10;
898+
countDict[@(-1)] = countData[@"shareCount"];//shareFolder 特殊处理下
899899

900900
for (ProjectFolder *folder in proFolders.list) {
901901
folder.count = [countDict objectForKey:folder.file_id];

‎Coding_iOS/Views/Cell/MemberCell.m‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
3333
_memberNameLabel.font = [UIFont systemFontOfSize:17];
3434
_memberNameLabel.textColor = kColor222;
3535
[self.contentView addSubview:_memberNameLabel];
36-
[_memberNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
37-
make.left.equalTo(self.memberIconView.mas_right).offset(10);
38-
make.height.mas_equalTo(20);
39-
make.centerY.equalTo(self.contentView);
36+
}
37+
if (!_typeIconView) {
38+
_typeIconView = [UIImageView new];
39+
[self.contentView addSubview:_typeIconView];
40+
[_typeIconView mas_makeConstraints:^(MASConstraintMaker *make) {
41+
make.left.equalTo(self.memberNameLabel.mas_right).offset(10);
42+
make.centerY.equalTo(self.memberNameLabel);
43+
make.size.mas_equalTo(CGSizeMake(16, 16));
4044
}];
4145
}
4246
if (!_memberAliasLabel) {
@@ -75,29 +79,14 @@ - (void)setCurMember:(ProjectMember *)curMember{
7579
if (_curMember.alias.length > 0) {
7680
_memberAliasLabel.text = _curMember.alias;
7781
_memberAliasLabel.hidden = NO;
78-
[_memberNameLabel mas_updateConstraints:^(MASConstraintMaker *make) {
79-
make.centerY.equalTo(self.contentView).offset(-10);
80-
}];
8182
}else{
8283
_memberAliasLabel.hidden = YES;
83-
[_memberNameLabel mas_updateConstraints:^(MASConstraintMaker *make) {
84-
make.centerY.equalTo(self.contentView);
85-
}];
8684
}
8785
switch (_curMember.type.integerValue) {
8886
case 100://项目所有者
8987
case 90://项目管理员
9088
case 75://受限成员
9189
{
92-
if (!_typeIconView) {
93-
_typeIconView = [UIImageView new];
94-
[self.contentView addSubview:_typeIconView];
95-
[_typeIconView mas_makeConstraints:^(MASConstraintMaker *make) {
96-
make.left.equalTo(self.memberNameLabel.mas_right).offset(10);
97-
make.centerY.equalTo(self.memberNameLabel);
98-
make.size.mas_equalTo(CGSizeMake(16, 16));
99-
}];
100-
}
10190
[_typeIconView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"member_type_%ld", (long)_curMember.type.integerValue]]];
10291
_typeIconView.hidden = NO;
10392
}
@@ -131,6 +120,18 @@ - (void)setCurMember:(ProjectMember *)curMember{
131120
}else{
132121
_leftBtn.hidden = YES;
133122
}
123+
_leftBtn.hidden = rand()%2;
124+
125+
[_memberNameLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
126+
make.left.equalTo(self.memberIconView.mas_right).offset(10);
127+
make.height.mas_equalTo(20);
128+
make.centerY.equalTo(self.contentView).offset(_curMember.alias.length > 0? -10: 0);
129+
if (_leftBtn.hidden) {
130+
make.right.lessThanOrEqualTo(self.contentView).offset(_typeIconView.hidden? -15: -40);
131+
}else{
132+
make.right.lessThanOrEqualTo(_leftBtn.mas_left).offset(_typeIconView.hidden? -10: -35);
133+
}
134+
}];
134135
}
135136

136137
- (void)leftBtnClicked:(id)sender{

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /