Skip to content

Commit 54c234c

Browse files
wanghenghengwanghengheng
committed
项目成员 - 备注的显示
1 parent 52e7724 commit 54c234c

11 files changed

+111
-49
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@
145145
4E2DB34D1BA6AEB4002F27C4 /* coding_emoji_gif_01@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E2DB3461BA6AEB4002F27C4 /* coding_emoji_gif_01@2x.png */; };
146146
4E2ECEAD1BD4D51000CB6EC9 /* ProjectTransferSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E2ECEAC1BD4D51000CB6EC9 /* ProjectTransferSettingViewController.m */; };
147147
4E2F6A571C437D1D00A25502 /* EditCodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E2F6A561C437D1D00A25502 /* EditCodeViewController.m */; };
148+
4E2F6A6C1C43CA4B00A25502 /* member_type_100@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E2F6A661C43CA4B00A25502 /* member_type_100@2x.png */; };
149+
4E2F6A6D1C43CA4B00A25502 /* member_type_100@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E2F6A671C43CA4B00A25502 /* member_type_100@3x.png */; };
150+
4E2F6A6E1C43CA4B00A25502 /* member_type_75@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E2F6A681C43CA4B00A25502 /* member_type_75@2x.png */; };
151+
4E2F6A6F1C43CA4B00A25502 /* member_type_75@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E2F6A691C43CA4B00A25502 /* member_type_75@3x.png */; };
152+
4E2F6A701C43CA4B00A25502 /* member_type_90@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E2F6A6A1C43CA4B00A25502 /* member_type_90@2x.png */; };
153+
4E2F6A711C43CA4B00A25502 /* member_type_90@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E2F6A6B1C43CA4B00A25502 /* member_type_90@3x.png */; };
148154
4E35A99F1A3EC47E00CE35F1 /* FileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E35A99E1A3EC47E00CE35F1 /* FileViewController.m */; };
149155
4E38CF5F1A7A28AF005536C0 /* CodeBranchTagButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E38CF5E1A7A28AF005536C0 /* CodeBranchTagButton.m */; };
150156
4E38CF621A7B7C99005536C0 /* CodeBranchOrTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E38CF611A7B7C99005536C0 /* CodeBranchOrTag.m */; };
@@ -678,7 +684,6 @@
678684
8E64ED8B19EE484A006E99DA /* README.textile in Resources */ = {isa = PBXBuildFile; fileRef = 8E64ED8919EE484A006E99DA /* README.textile */; };
679685
8E6F1C951A03BD6000BF79C8 /* ProjectMemberActivityListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6F1C941A03BD6000BF79C8 /* ProjectMemberActivityListViewController.m */; };
680686
8E7612F41A08B1EA005BE797 /* tipIcon_TaskComment@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E7612F31A08B1EA005BE797 /* tipIcon_TaskComment@2x.png */; };
681-
8E80296D19F4E23100A470A2 /* creator_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E80296C19F4E23100A470A2 /* creator_image@2x.png */; };
682687
8E872D0019EFEFF7002C8F34 /* tweet_more_comment_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E872CFF19EFEFF7002C8F34 /* tweet_more_comment_icon@2x.png */; };
683688
8E8F7B2C19EF6306006BA8BD /* btn_followed_both@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E8F7B2219EF6306006BA8BD /* btn_followed_both@2x.png */; };
684689
8E8F7B2D19EF6306006BA8BD /* btn_followed_not@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E8F7B2319EF6306006BA8BD /* btn_followed_not@2x.png */; };
@@ -1246,6 +1251,12 @@
12461251
4E2ECEAC1BD4D51000CB6EC9 /* ProjectTransferSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectTransferSettingViewController.m; sourceTree = "<group>"; };
12471252
4E2F6A551C437D1D00A25502 /* EditCodeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditCodeViewController.h; sourceTree = "<group>"; };
12481253
4E2F6A561C437D1D00A25502 /* EditCodeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditCodeViewController.m; sourceTree = "<group>"; };
1254+
4E2F6A661C43CA4B00A25502 /* member_type_100@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_type_100@2x.png"; sourceTree = "<group>"; };
1255+
4E2F6A671C43CA4B00A25502 /* member_type_100@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_type_100@3x.png"; sourceTree = "<group>"; };
1256+
4E2F6A681C43CA4B00A25502 /* member_type_75@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_type_75@2x.png"; sourceTree = "<group>"; };
1257+
4E2F6A691C43CA4B00A25502 /* member_type_75@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_type_75@3x.png"; sourceTree = "<group>"; };
1258+
4E2F6A6A1C43CA4B00A25502 /* member_type_90@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_type_90@2x.png"; sourceTree = "<group>"; };
1259+
4E2F6A6B1C43CA4B00A25502 /* member_type_90@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_type_90@3x.png"; sourceTree = "<group>"; };
12491260
4E35A99D1A3EC47E00CE35F1 /* FileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileViewController.h; sourceTree = "<group>"; };
12501261
4E35A99E1A3EC47E00CE35F1 /* FileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileViewController.m; sourceTree = "<group>"; };
12511262
4E38CF5D1A7A28AF005536C0 /* CodeBranchTagButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeBranchTagButton.h; sourceTree = "<group>"; };
@@ -2075,7 +2086,6 @@
20752086
8E6F1C931A03BD6000BF79C8 /* ProjectMemberActivityListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectMemberActivityListViewController.h; sourceTree = "<group>"; };
20762087
8E6F1C941A03BD6000BF79C8 /* ProjectMemberActivityListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectMemberActivityListViewController.m; sourceTree = "<group>"; };
20772088
8E7612F31A08B1EA005BE797 /* tipIcon_TaskComment@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tipIcon_TaskComment@2x.png"; sourceTree = "<group>"; };
2078-
8E80296C19F4E23100A470A2 /* creator_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "creator_image@2x.png"; sourceTree = "<group>"; };
20792089
8E872CFF19EFEFF7002C8F34 /* tweet_more_comment_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tweet_more_comment_icon@2x.png"; sourceTree = "<group>"; };
20802090
8E8F7B2219EF6306006BA8BD /* btn_followed_both@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn_followed_both@2x.png"; sourceTree = "<group>"; };
20812091
8E8F7B2319EF6306006BA8BD /* btn_followed_not@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn_followed_not@2x.png"; sourceTree = "<group>"; };
@@ -2872,6 +2882,19 @@
28722882
path = emotion_monkey_gif;
28732883
sourceTree = "<group>";
28742884
};
2885+
4E2F6A651C43CA4B00A25502 /* member_type */ = {
2886+
isa = PBXGroup;
2887+
children = (
2888+
4E2F6A661C43CA4B00A25502 /* member_type_100@2x.png */,
2889+
4E2F6A671C43CA4B00A25502 /* member_type_100@3x.png */,
2890+
4E2F6A681C43CA4B00A25502 /* member_type_75@2x.png */,
2891+
4E2F6A691C43CA4B00A25502 /* member_type_75@3x.png */,
2892+
4E2F6A6A1C43CA4B00A25502 /* member_type_90@2x.png */,
2893+
4E2F6A6B1C43CA4B00A25502 /* member_type_90@3x.png */,
2894+
);
2895+
path = member_type;
2896+
sourceTree = "<group>";
2897+
};
28752898
4E4972E51BB5446900F3AC15 /* tips_menu */ = {
28762899
isa = PBXGroup;
28772900
children = (
@@ -4302,6 +4325,7 @@
43024325
8EA6CF5D19E240C40076D59C /* Images */ = {
43034326
isa = PBXGroup;
43044327
children = (
4328+
4E2F6A651C43CA4B00A25502 /* member_type */,
43054329
927AFF451BFF6DAD00AAE593 /* shop */,
43064330
4E4972E51BB5446900F3AC15 /* tips_menu */,
43074331
4E2BF3C61B96CDF800A5A0A8 /* share_btn */,
@@ -4364,7 +4388,6 @@
43644388
8E872CFF19EFEFF7002C8F34 /* tweet_more_comment_icon@2x.png */,
43654389
8EA6CFC319E240C40076D59C /* xtsegment_bordor_left@2x.png */,
43664390
8EA6CFC419E240C40076D59C /* xtsegment_bordor_right@2x.png */,
4367-
8E80296C19F4E23100A470A2 /* creator_image@2x.png */,
43684391
8ED2AAF819F60D5200607A1D /* loading_loop@2x.png */,
43694392
8ED2AAF919F60D5200607A1D /* loading_monkey@2x.png */,
43704393
8EF6433B19FE696B00F7EEB0 /* cell_checkmark@2x.png */,
@@ -5273,6 +5296,7 @@
52735296
4E6383BB1B32640900D98648 /* messageSystem@2x.png in Resources */,
52745297
4ED618251C3CB1AF0017946C /* taskWatchers@3x.png in Resources */,
52755298
4E095A851B6B24DE008DC439 /* topic_comment_icon@2x.png in Resources */,
5299+
4E2F6A6F1C43CA4B00A25502 /* member_type_75@3x.png in Resources */,
52765300
7E8E59841B6F91C40083CA02 /* bubble_right_play_2@2x.png in Resources */,
52775301
4E2BF3CF1B96CDF800A5A0A8 /* share_btn_coding@2x.png in Resources */,
52785302
8EA6D15019E240C40076D59C /* commentOrLikeBeginImg@2x.png in Resources */,
@@ -5318,6 +5342,7 @@
53185342
8E62ADDA19E28DA800963870 /* tipIcon_User@2x.png in Resources */,
53195343
4E6383A71B3262D300D98648 /* taskPriority0_small@2x.png in Resources */,
53205344
8E8F7B3519EF6306006BA8BD /* btn_project_quit@2x.png in Resources */,
5345+
4E2F6A6C1C43CA4B00A25502 /* member_type_100@2x.png in Resources */,
53215346
4ED558321B4FA68400FC10CB /* dismissBtn_Nav@2x.png in Resources */,
53225347
4E0849801A918A7F00BD27F6 /* coding_emoji_38@2x.png in Resources */,
53235348
8E97CE661A0A3424006F9AD7 /* keyboard_emotion_emoji@2x.png in Resources */,
@@ -5434,6 +5459,7 @@
54345459
927AFF521BFF6DAD00AAE593 /* shop_nar_history_icon@2x.png in Resources */,
54355460
4E6383AD1B3262D300D98648 /* taskPriority3_small@2x.png in Resources */,
54365461
8E97CEA91A0C7E26006F9AD7 /* coding_emoji_18@2x.png in Resources */,
5462+
4E2F6A711C43CA4B00A25502 /* member_type_90@3x.png in Resources */,
54375463
4EF17ECB1B3C3112003CDD2D /* intro_dot_selected@2x.png in Resources */,
54385464
0A6E6BBB1AB168B0004C0107 /* location_checkmark@2x.png in Resources */,
54395465
8EA6D16919E240C40076D59C /* nav_project_task@2x.png in Resources */,
@@ -5525,6 +5551,7 @@
55255551
4E96E7DE1A1B537E0037C098 /* icon_file_music@2x.png in Resources */,
55265552
927AFF541BFF6DAD00AAE593 /* shop_unexchange_icon@2x.png in Resources */,
55275553
8EA6D1A119E240C40076D59C /* tipIcon_UserFollow@2x.png in Resources */,
5554+
4E2F6A6D1C43CA4B00A25502 /* member_type_100@3x.png in Resources */,
55285555
4E095A7F1B6B1E40008DC439 /* calendar_0xF5A523@2x.png in Resources */,
55295556
4E5D13181C0EF48200985AEB /* button_close@2x.png in Resources */,
55305557
4EF17EDC1B3C3112003CDD2D /* intro_tip_0@2x.png in Resources */,
@@ -5612,6 +5639,7 @@
56125639
7E8E597F1B6F91C40083CA02 /* bubble_left_play_0@2x.png in Resources */,
56135640
4E96E7E11A1B537E0037C098 /* icon_file_ppt@2x.png in Resources */,
56145641
8EA6D16619E240C40076D59C /* nav_arrow_down@2x.png in Resources */,
5642+
4E2F6A6E1C43CA4B00A25502 /* member_type_75@2x.png in Resources */,
56155643
D0C448141C02F76600DC1C4B /* icon_search_searchbar@2x.png in Resources */,
56165644
4EC480111C2A909D005F1772 /* register_step_ed@2x.png in Resources */,
56175645
D0C447E01C02DB8900DC1C4B /* project_normal@3x.png in Resources */,
@@ -5633,6 +5661,7 @@
56335661
4E2719C71AB07ED6006AE214 /* dot_line@2x.png in Resources */,
56345662
4E2DB34D1BA6AEB4002F27C4 /* coding_emoji_gif_01@2x.png in Resources */,
56355663
4E8F92DF1B67BE3C00033D8F /* icon_user_monkey_i6p@3x.png in Resources */,
5664+
4E2F6A701C43CA4B00A25502 /* member_type_90@2x.png in Resources */,
56365665
4E5D131B1C11865D00985AEB /* share_btn_inform@2x.png in Resources */,
56375666
8E64ED8B19EE484A006E99DA /* README.textile in Resources */,
56385667
8E97CE9D1A0C7E26006F9AD7 /* coding_emoji_06@2x.png in Resources */,
@@ -5675,7 +5704,6 @@
56755704
4EF17EE21B3C3112003CDD2D /* intro_tip_3@2x.png in Resources */,
56765705
4E5D130F1C0ECB3400985AEB /* tweet_btn_reward@2x.png in Resources */,
56775706
4E6383D51B32665700D98648 /* project_item_mr_pr@2x.png in Resources */,
5678-
8E80296D19F4E23100A470A2 /* creator_image@2x.png in Resources */,
56795707
D0C447B41C02B1DE00DC1C4B /* btn_fliter_down@2x.png in Resources */,
56805708
8EA6D16719E240C40076D59C /* nav_project_activity@2x.png in Resources */,
56815709
4EFE8DAD1B394A0D004B7559 /* file_changeType_RENAME@2x.png in Resources */,

‎Coding_iOS/Images/creator_image@2x.png

-1.92 KB
Binary file not shown.

‎Coding_iOS/Images/member_type/member_type_100@2x.png

702 Bytes
Loading

‎Coding_iOS/Images/member_type/member_type_100@3x.png

1.04 KB
Loading

‎Coding_iOS/Images/member_type/member_type_75@2x.png

780 Bytes
Loading

‎Coding_iOS/Images/member_type/member_type_75@3x.png

1.31 KB
Loading

‎Coding_iOS/Images/member_type/member_type_90@2x.png

735 Bytes
Loading

‎Coding_iOS/Images/member_type/member_type_90@3x.png

1.09 KB
Loading

‎Coding_iOS/Models/ProjectMember.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
@property (readwrite, nonatomic, strong) NSNumber *id, *project_id, *user_id, *type, *done, *processing;//type:80是member，100是creater
1414
@property (readwrite, nonatomic, strong) User *user;
1515
@property (readwrite, nonatomic, strong) NSDate *created_at, *last_visit_at;
16+
@property (strong, nonatomic) NSString *alias;
1617
+ (ProjectMember *)member_All;
1718
- (NSString *)toQuitPath;
1819
- (NSString *)toKickoutPath;

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -569,17 +569,15 @@ - (void)request_ProjectMembers_WithObj:(Project *)project andBlock:(void (^)(id
569569
resultData = [resultData objectForKey:@"list"];
570570

571571
NSMutableArray *resultA = [NSObject arrayFromJSON:resultData ofObjects:@"ProjectMember"];
572-
573-
__block NSUInteger mineIndex = 0;
574-
[resultA enumerateObjectsUsingBlock:^(ProjectMember *obj, NSUInteger idx, BOOL *stop) {
575-
if (obj.user_id.integerValue == [Login curLoginUser].id.integerValue) {
576-
mineIndex = idx;
577-
*stop = YES;
572+
[resultA sortUsingComparator:^NSComparisonResult(ProjectMember *obj1, ProjectMember *obj2) {
573+
if ([obj1.user_id isEqualToNumber:[Login curLoginUser].id]) {
574+
return NSOrderedAscending;
575+
}else if ([obj2.user_id isEqualToNumber:[Login curLoginUser].id]){
576+
return NSOrderedDescending;
577+
}else{
578+
return obj1.type.intValue < obj2.type.intValue;
578579
}
579580
}];
580-
if (mineIndex > 0) {
581-
[resultA exchangeObjectAtIndex:mineIndex withObjectAtIndex:0];
582-
}
583581
block(resultA, nil);
584582
}else{
585583
block(nil, error);

0 commit comments

Comments
 (0)