Skip to content

Commit 2d7ad5f

Browse files
wanghenghengwanghengheng
committed
项目成员 - 设置备注名&成员类型
1 parent 54c234c commit 2d7ad5f

18 files changed

+261
-68
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

+32
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,12 @@
458458
4EAE06C31B7B51AF00179F4B /* file_activity_icon_upload_file@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAE06BF1B7B51AF00179F4B /* file_activity_icon_upload_file@2x.png */; };
459459
4EAE06C51B7B587200179F4B /* button_file_comment@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAE06C41B7B587200179F4B /* button_file_comment@2x.png */; };
460460
4EAE06C81B7C9EFF00179F4B /* FileVersionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EAE06C71B7C9EFF00179F4B /* FileVersionCell.m */; };
461+
4EAECBC21C44CB860096CA74 /* member_cell_edit_alias@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAECBBC1C44CB860096CA74 /* member_cell_edit_alias@2x.png */; };
462+
4EAECBC31C44CB860096CA74 /* member_cell_edit_alias@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAECBBD1C44CB860096CA74 /* member_cell_edit_alias@3x.png */; };
463+
4EAECBC41C44CB860096CA74 /* member_cell_edit_remove@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAECBBE1C44CB860096CA74 /* member_cell_edit_remove@2x.png */; };
464+
4EAECBC51C44CB860096CA74 /* member_cell_edit_remove@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAECBBF1C44CB860096CA74 /* member_cell_edit_remove@3x.png */; };
465+
4EAECBC61C44CB860096CA74 /* member_cell_edit_type@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAECBC01C44CB860096CA74 /* member_cell_edit_type@2x.png */; };
466+
4EAECBC71C44CB860096CA74 /* member_cell_edit_type@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAECBC11C44CB860096CA74 /* member_cell_edit_type@3x.png */; };
461467
4EB0C2001A807ED00042FC4F /* NSURL+Common.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0C1FF1A807ED00042FC4F /* NSURL+Common.m */; };
462468
4EB5A9421BF1DB4600C23AC3 /* libSocialSinaSSO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EB5A9341BF1DB4600C23AC3 /* libSocialSinaSSO.a */; };
463469
4EB5A9431BF1DB4600C23AC3 /* libWeiboSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EB5A9351BF1DB4600C23AC3 /* libWeiboSDK.a */; };
@@ -1727,6 +1733,12 @@
17271733
4EAE06C41B7B587200179F4B /* button_file_comment@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_comment@2x.png"; sourceTree = "<group>"; };
17281734
4EAE06C61B7C9EFF00179F4B /* FileVersionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileVersionCell.h; sourceTree = "<group>"; };
17291735
4EAE06C71B7C9EFF00179F4B /* FileVersionCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileVersionCell.m; sourceTree = "<group>"; };
1736+
4EAECBBC1C44CB860096CA74 /* member_cell_edit_alias@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_cell_edit_alias@2x.png"; sourceTree = "<group>"; };
1737+
4EAECBBD1C44CB860096CA74 /* member_cell_edit_alias@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_cell_edit_alias@3x.png"; sourceTree = "<group>"; };
1738+
4EAECBBE1C44CB860096CA74 /* member_cell_edit_remove@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_cell_edit_remove@2x.png"; sourceTree = "<group>"; };
1739+
4EAECBBF1C44CB860096CA74 /* member_cell_edit_remove@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_cell_edit_remove@3x.png"; sourceTree = "<group>"; };
1740+
4EAECBC01C44CB860096CA74 /* member_cell_edit_type@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_cell_edit_type@2x.png"; sourceTree = "<group>"; };
1741+
4EAECBC11C44CB860096CA74 /* member_cell_edit_type@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_cell_edit_type@3x.png"; sourceTree = "<group>"; };
17301742
4EB0C1FE1A807ED00042FC4F /* NSURL+Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+Common.h"; sourceTree = "<group>"; };
17311743
4EB0C1FF1A807ED00042FC4F /* NSURL+Common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+Common.m"; sourceTree = "<group>"; };
17321744
4EB5A9341BF1DB4600C23AC3 /* libSocialSinaSSO.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSocialSinaSSO.a; sourceTree = "<group>"; };
@@ -3462,6 +3474,19 @@
34623474
path = file_activity_icon;
34633475
sourceTree = "<group>";
34643476
};
3477+
4EAECBBB1C44CB860096CA74 /* member_cell_edit */ = {
3478+
isa = PBXGroup;
3479+
children = (
3480+
4EAECBBC1C44CB860096CA74 /* member_cell_edit_alias@2x.png */,
3481+
4EAECBBD1C44CB860096CA74 /* member_cell_edit_alias@3x.png */,
3482+
4EAECBBE1C44CB860096CA74 /* member_cell_edit_remove@2x.png */,
3483+
4EAECBBF1C44CB860096CA74 /* member_cell_edit_remove@3x.png */,
3484+
4EAECBC01C44CB860096CA74 /* member_cell_edit_type@2x.png */,
3485+
4EAECBC11C44CB860096CA74 /* member_cell_edit_type@3x.png */,
3486+
);
3487+
path = member_cell_edit;
3488+
sourceTree = "<group>";
3489+
};
34653490
4EB5A9331BF1DB4600C23AC3 /* SinaSSO */ = {
34663491
isa = PBXGroup;
34673492
children = (
@@ -4325,6 +4350,7 @@
43254350
8EA6CF5D19E240C40076D59C /* Images */ = {
43264351
isa = PBXGroup;
43274352
children = (
4353+
4EAECBBB1C44CB860096CA74 /* member_cell_edit */,
43284354
4E2F6A651C43CA4B00A25502 /* member_type */,
43294355
927AFF451BFF6DAD00AAE593 /* shop */,
43304356
4E4972E51BB5446900F3AC15 /* tips_menu */,
@@ -5382,6 +5408,7 @@
53825408
4E93F23E1B84356500017916 /* file_menu_icon_share@2x.png in Resources */,
53835409
8EA6D14C19E240C40076D59C /* btn_delete_tweetimage@2x.png in Resources */,
53845410
4EC5AD931A258DF8006FA97C /* icon_file_cell_move@2x.png in Resources */,
5411+
4EAECBC31C44CB860096CA74 /* member_cell_edit_alias@3x.png in Resources */,
53855412
4EC5AD941A258DF8006FA97C /* icon_file_cell_rename@2x.png in Resources */,
53865413
8E97CE9A1A0C7E26006F9AD7 /* coding_emoji_03@2x.png in Resources */,
53875414
4ED618241C3CB1AF0017946C /* taskWatchers@2x.png in Resources */,
@@ -5492,6 +5519,7 @@
54925519
8EF6434119FE696B00F7EEB0 /* cell_checkmark@2x.png in Resources */,
54935520
4EF17ED61B3C3112003CDD2D /* intro_icon_3@3x.png in Resources */,
54945521
8EA6D17319E240C40076D59C /* placeholder_coding_square_150@2x.png in Resources */,
5522+
4EAECBC41C44CB860096CA74 /* member_cell_edit_remove@2x.png in Resources */,
54955523
8EA6D17619E240C40076D59C /* placeholder_monkey_round_25@2x.png in Resources */,
54965524
4E2DB34A1BA6AEB4002F27C4 /* coding_emoji_gif_05@2x.png in Resources */,
54975525
8E97CEAD1A0C7E26006F9AD7 /* coding_emoji_22@2x.png in Resources */,
@@ -5562,6 +5590,7 @@
55625590
D0C447F51C02DCA200DC1C4B /* addUserBtn_Nav@2x.png in Resources */,
55635591
4E4D6AC11B252CD400FD2E49 /* icon_code_file@2x.png in Resources */,
55645592
4E5D13101C0ECB3400985AEB /* tweet_btn_reward@3x.png in Resources */,
5593+
4EAECBC51C44CB860096CA74 /* member_cell_edit_remove@3x.png in Resources */,
55655594
4EF17EE71B3C3112003CDD2D /* intro_tip_5@3x.png in Resources */,
55665595
8E97CEB91A0C7E26006F9AD7 /* coding_emoji_34@2x.png in Resources */,
55675596
4EF17ED81B3C3112003CDD2D /* intro_icon_4@3x.png in Resources */,
@@ -5601,6 +5630,7 @@
56015630
4E03AC9A1A5BDDF9002B000B /* STARTIMAGE.jpg in Resources */,
56025631
8E97CE991A0C7E26006F9AD7 /* coding_emoji_02@2x.png in Resources */,
56035632
4E6383E91B32791600D98648 /* checkbox_checked@2x.png in Resources */,
5633+
4EAECBC71C44CB860096CA74 /* member_cell_edit_type@3x.png in Resources */,
56045634
4E217F1A1A71007800F6DF88 /* SVWebViewController.strings in Resources */,
56055635
4EF17ED01B3C3112003CDD2D /* intro_icon_0@3x.png in Resources */,
56065636
8EA6D17719E240C40076D59C /* placeholder_monkey_round_33@2x.png in Resources */,
@@ -5630,6 +5660,7 @@
56305660
4E6383DB1B3266C200D98648 /* mrpr_icon_commit@2x.png in Resources */,
56315661
D0C447C51C02DB5400DC1C4B /* pop_User@2x.png in Resources */,
56325662
8E97CE611A0A3424006F9AD7 /* keyboard_add_photo@2x.png in Resources */,
5663+
4EAECBC61C44CB860096CA74 /* member_cell_edit_type@2x.png in Resources */,
56335664
4E93F23B1B84356500017916 /* file_menu_icon_edit@2x.png in Resources */,
56345665
8E1C3DF619E7F4CA00EF3032 /* address.json in Resources */,
56355666
4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */,
@@ -5666,6 +5697,7 @@
56665697
8E64ED8B19EE484A006E99DA /* README.textile in Resources */,
56675698
8E97CE9D1A0C7E26006F9AD7 /* coding_emoji_06@2x.png in Resources */,
56685699
4E0849821A918A7F00BD27F6 /* coding_emoji_40@2x.png in Resources */,
5700+
4EAECBC21C44CB860096CA74 /* member_cell_edit_alias@2x.png in Resources */,
56695701
4E6383BA1B32640900D98648 /* messageRight_bg_img@2x.png in Resources */,
56705702
4E9113AC1A1CB19900AC9431 /* icon_file_state_pause@2x.png in Resources */,
56715703
D0C447E41C02DB8900DC1C4B /* tweet_normal@3x.png in Resources */,

‎Coding_iOS/Controllers/MeSetting/SettingTextViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ typedef NS_ENUM(NSInteger, SettingType)
1818
};
1919

2020
@interface SettingTextViewController : BaseViewController<UITableViewDataSource, UITableViewDelegate>
21-
@property (strong, nonatomic) NSString *textValue;
21+
@property (strong, nonatomic) NSString *textValue, *placeholderStr;
2222
@property (copy, nonatomic) void(^doneBlock)(NSString *textValue);
2323
@property (assign, nonatomic) SettingType settingType;
2424

‎Coding_iOS/Controllers/MeSetting/SettingTextViewController.m

+2-5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ + (instancetype)settingTextVCWithTitle:(NSString *)title textValue:(NSString *)t
2626
+(void)showSettingFolderNameVCFromVC:(UIViewController *)preVc withTitle:(NSString *)title textValue:(NSString *)textValue type:(SettingType)type doneBlock:(void(^)(NSString *textValue))block{
2727
SettingTextViewController *vc = [self settingTextVCWithTitle:title textValue:textValue doneBlock:block];
2828
vc.settingType = type;
29+
vc.placeholderStr = @"文件夹名称";
2930
if (preVc) {
3031
UINavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:vc];
3132
[preVc presentViewController:nav animated:YES completion:nil];
@@ -105,11 +106,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
105106
[cell setTextValue:_textValue andTextChangeBlock:^(NSString *textValue) {
106107
weakSelf.myTextValue = textValue;
107108
}];
108-
if (self.settingType == SettingTypeNewFolderName) {
109-
cell.textField.placeholder = @"文件夹名称";
110-
}else{
111-
cell.textField.placeholder = @"未填写";
112-
}
109+
cell.textField.placeholder = self.placeholderStr ?: @"未填写";
113110
return cell;
114111
}
115112

‎Coding_iOS/Controllers/NewProject/NewProject.storyboard

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<rect key="frame" x="0.0" y="22" width="320" height="80"/>
2222
<autoresizingMask key="autoresizingMask"/>
2323
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NCB-uM-JeI" id="AGo-cn-Hlv">
24-
<rect key="frame" x="0.0" y="0.0" width="320" height="79.5"/>
24+
<rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
2525
<autoresizingMask key="autoresizingMask"/>
2626
<subviews>
2727
<imageView clipsSubviews="YES" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gEV-Jy-c1F">
@@ -67,7 +67,7 @@
6767
<rect key="frame" x="0.0" y="102" width="320" height="120"/>
6868
<autoresizingMask key="autoresizingMask"/>
6969
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vWq-sb-hDA" id="bll-G0-AM2">
70-
<rect key="frame" x="0.0" y="0.0" width="320" height="119.5"/>
70+
<rect key="frame" x="0.0" y="0.0" width="320" height="120"/>
7171
<autoresizingMask key="autoresizingMask"/>
7272
<subviews>
7373
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="apI-xl-HB2">
@@ -104,7 +104,7 @@
104104
<rect key="frame" x="0.0" y="244" width="320" height="44"/>
105105
<autoresizingMask key="autoresizingMask"/>
106106
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Vxv-hb-Gy3" id="539-D8-tG7">
107-
<rect key="frame" x="0.0" y="0.0" width="287" height="43.5"/>
107+
<rect key="frame" x="0.0" y="0.0" width="287" height="44"/>
108108
<autoresizingMask key="autoresizingMask"/>
109109
<subviews>
110110
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="项目类型" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mqK-Pz-sv5">
@@ -158,7 +158,7 @@
158158
<rect key="frame" x="0.0" y="288" width="320" height="44"/>
159159
<autoresizingMask key="autoresizingMask"/>
160160
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oTi-YB-9hH" id="92L-4e-VEo">
161-
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
161+
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
162162
<autoresizingMask key="autoresizingMask"/>
163163
<subviews>
164164
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="启用 README.md 文件初始化项目" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7ii-Mr-f2e">
@@ -233,7 +233,7 @@
233233
<rect key="frame" x="0.0" y="22" width="320" height="44"/>
234234
<autoresizingMask key="autoresizingMask"/>
235235
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xHN-2n-1RB" id="3rC-YE-NlS">
236-
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
236+
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
237237
<autoresizingMask key="autoresizingMask"/>
238238
</tableViewCellContentView>
239239
<color key="tintColor" red="0.0" green="0.65206263646560858" blue="0.010473827086913459" alpha="1" colorSpace="calibratedRGB"/>

0 commit comments

Comments
 (0)