Skip to content

Commit 5ce0049

Browse files
committed
常用地区&项目权限。。改
1 parent bb4c418 commit 5ce0049

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
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>3.9</string>
20+
<string>3.9.5</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>3.9.201604201040</string>
39+
<string>3.9.5.201605191700</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>

Coding_iOS/Controllers/CountryCodeListViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger
104104
UILabel *titleL = [UILabel new];
105105
titleL.font = [UIFont systemFontOfSize:12];
106106
titleL.textColor = [UIColor colorWithHexString:@"0x999999"];
107-
titleL.text = [_keyList[section+ 1] isEqualToString:@"#"]? @"常用地区": _keyList[section+ 1];
107+
titleL.text = [_keyList[section+ 1] isEqualToString:@"#"]? @"常用": _keyList[section+ 1];
108108
[headerV addSubview:titleL];
109109
[titleL mas_makeConstraints:^(MASConstraintMaker *make) {
110110
make.edges.equalTo(headerV).insets(UIEdgeInsetsMake(4, 15, 4, 15));

Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,15 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
228228
}
229229

230230
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
231+
// current_user_role_id = 75 是受限成员,不可访问代码
231232
CGFloat cellHeight = 0;
232233
if (indexPath.section == 0) {
233234
cellHeight = indexPath.row == 0? [ProjectInfoCell cellHeight]: [ProjectDescriptionCell cellHeightWithObj:_myProject];
235+
}else if (indexPath.section == 1){
236+
NSInteger codeNum = _myProject.is_public.boolValue? 2: 4;
237+
cellHeight = (indexPath.row == codeNum && _myProject.current_user_role_id.integerValue <= 75)? 0: [NProjectItemCell cellHeight];
234238
}else{
235-
cellHeight = [NProjectItemCell cellHeight];
239+
cellHeight = _myProject.current_user_role_id.integerValue <= 75? 0: [NProjectItemCell cellHeight];
236240
}
237241
return cellHeight;
238242
}

Coding_iOS/Controllers/ProjectMemberListViewController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,10 @@ - (void)editAliasOfMember:(ProjectMember *)curMember{
372372
}
373373

374374
- (void)editTypeOfMember:(ProjectMember *)curMember{
375+
if (_myProject.is_public.boolValue) {
376+
[NSObject showHudTipStr:@"公开项目不开放项目权限"];
377+
return;
378+
}
375379
__weak typeof(self) weakSelf = self;
376380
__weak typeof(curMember) weakMember = curMember;
377381
ValueListViewController *vc = [ValueListViewController new];

Coding_iOS/Views/Cell/NProjectItemCell.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
5050
[self.rightLabel setHidden:YES];
5151
[self.contentView addSubview:_rightLabel];
5252
}
53+
self.clipsToBounds = YES;
5354
}
5455
return self;
5556
}

0 commit comments

Comments
 (0)