Skip to content

Commit cde85f1

Browse files
wanghenghengwanghengheng
committed
添加对任务动态的两个新类型的处理 & 处理 app.dsym 警告
1 parent da37db4 commit cde85f1

4 files changed

Lines changed: 40 additions & 35 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5819,6 +5819,7 @@
58195819
"$(inherited)",
58205820
"$(PROJECT_DIR)",
58215821
);
5822+
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
58225823
GCC_PRECOMPILE_PREFIX_HEADER = YES;
58235824
GCC_PREFIX_HEADER = "Coding_iOS/Coding_iOS-Prefix.pch";
58245825
HEADER_SEARCH_PATHS = (
@@ -5856,6 +5857,7 @@
58565857
"$(inherited)",
58575858
"$(PROJECT_DIR)",
58585859
);
5860+
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
58595861
GCC_PRECOMPILE_PREFIX_HEADER = YES;
58605862
GCC_PREFIX_HEADER = "Coding_iOS/Coding_iOS-Prefix.pch";
58615863
HEADER_SEARCH_PATHS = (

‎Coding_iOS/.DS_Store‎

0 Bytes
Binary file not shown.

‎Coding_iOS/Models/ProjectActivity.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@interface ProjectActivity : NSObject
2222
@property (readwrite, nonatomic, strong) NSNumber *id;
2323
@property (readwrite, nonatomic, strong) NSString *target_type, *action, *action_msg, *type, *ref, *ref_type, *ref_path, *pull_request_title, *merge_request_title, *comment_content, *merge_request_path, *pull_request_path, *version;
24-
@property (readwrite, nonatomic, strong) User *user, *target_user;
24+
@property (readwrite, nonatomic, strong) User *user, *target_user, *watcher;
2525
@property (readwrite, nonatomic, strong) NSDate *created_at;
2626
@property (readwrite, nonatomic, strong) Task *origin_task, *task;
2727
@property (readwrite, nonatomic, strong) TaskComment *taskComment, *origin_taskComment;

‎Coding_iOS/Views/Cell/TaskActivityCell.m‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,14 @@ - (void)setCurActivity:(ProjectActivity *)curActivity{
5757
if (!_curActivity) {
5858
return;
5959
}
60+
#warning 这里缺少两张图片 task_activity_icon_add_watcher , task_activity_icon_MergeRequestBean
6061
NSString *tipIconImageName;
6162
if ([curActivity.target_type isEqualToString:@"Task"]) {
6263
tipIconImageName = [NSString stringWithFormat:@"task_activity_icon_%@", _curActivity.action];
6364
}else if ([curActivity.target_type isEqualToString:@"ProjectFile"]){
6465
tipIconImageName = [NSString stringWithFormat:@"file_activity_icon_%@", _curActivity.action];
66+
}else if ([curActivity.target_type isEqualToString:@"MergeRequestBean"]){
67+
tipIconImageName = [NSString stringWithFormat:@"task_activity_icon_%@", _curActivity.target_type];
6568
}
6669
_tipIconView.image = [UIImage imageNamed:tipIconImageName];
6770
NSAttributedString *attrContent = [[self class] attrContentWithObj:_curActivity];
@@ -85,46 +88,46 @@ - (void)configTop:(BOOL)isTop andBottom:(BOOL)isBottom{
8588
}
8689

8790
+ (NSAttributedString *)attrContentWithObj:(ProjectActivity *)curActivity{
88-
if (![curActivity.target_type isEqualToString:@"Task"]) {
89-
return nil;
90-
}
91-
9291
NSString *userName, *contentStr;
9392
userName = curActivity.user.name? curActivity.user.name: @"";
9493
NSMutableAttributedString *attrContent;
9594

96-
if ([curActivity.action isEqualToString:@"create"]) {
97-
contentStr = [NSString stringWithFormat:@"创建了任务 - %@", [curActivity.created_at stringDisplay_HHmm]];
98-
}else if ([curActivity.action isEqualToString:@"update"]) {
99-
contentStr = [NSString stringWithFormat:@"更新了任务 - %@", [curActivity.created_at stringDisplay_HHmm]];
100-
}else if ([curActivity.action isEqualToString:@"update_priority"]) {
101-
contentStr = [NSString stringWithFormat:@"更新了任务优先级为 「%@」 - %@", kTaskPrioritiesDisplay[curActivity.task.priority.intValue], [curActivity.created_at stringDisplay_HHmm]];
102-
}else if ([curActivity.action isEqualToString:@"update_deadline"]) {
103-
if (curActivity.task.deadline_date) {
104-
contentStr = [NSString stringWithFormat:@"更新了任务截止日期为 「%@」 - %@", [NSDate convertStr_yyyy_MM_ddToDisplay:curActivity.task.deadline], [curActivity.created_at stringDisplay_HHmm]];
105-
}else{
106-
contentStr = [NSString stringWithFormat:@"移除了任务的截止日期 - %@", [curActivity.created_at stringDisplay_HHmm]];
107-
}
108-
}else if ([curActivity.action isEqualToString:@"update_description"]) {
109-
contentStr = [NSString stringWithFormat:@"更新了任务描述 - %@", [curActivity.created_at stringDisplay_HHmm]];
110-
}else if ([curActivity.action isEqualToString:@"update_label"]) {
111-
if (curActivity.labels.count > 0) {
112-
contentStr = [NSString stringWithFormat:@"更新了任务标签为 「%@」 - %@", [[curActivity.labels valueForKey:@"name"] componentsJoinedByString:@","], [curActivity.created_at stringDisplay_HHmm]];
113-
}else{
114-
contentStr = [NSString stringWithFormat:@"移除了任务的所有标签 - %@", [curActivity.created_at stringDisplay_HHmm]];
95+
if ([curActivity.target_type isEqualToString:@"Task"]) {
96+
if ([curActivity.action isEqualToString:@"create"]) {
97+
contentStr = [NSString stringWithFormat:@"创建了任务 - %@", [curActivity.created_at stringDisplay_HHmm]];
98+
}else if ([curActivity.action isEqualToString:@"update"]) {
99+
contentStr = [NSString stringWithFormat:@"更新了任务 - %@", [curActivity.created_at stringDisplay_HHmm]];
100+
}else if ([curActivity.action isEqualToString:@"update_priority"]) {
101+
contentStr = [NSString stringWithFormat:@"更新了任务优先级为 「%@」 - %@", kTaskPrioritiesDisplay[curActivity.task.priority.intValue], [curActivity.created_at stringDisplay_HHmm]];
102+
}else if ([curActivity.action isEqualToString:@"update_deadline"]) {
103+
if (curActivity.task.deadline_date) {
104+
contentStr = [NSString stringWithFormat:@"更新了任务截止日期为 「%@」 - %@", [NSDate convertStr_yyyy_MM_ddToDisplay:curActivity.task.deadline], [curActivity.created_at stringDisplay_HHmm]];
105+
}else{
106+
contentStr = [NSString stringWithFormat:@"移除了任务的截止日期 - %@", [curActivity.created_at stringDisplay_HHmm]];
107+
}
108+
}else if ([curActivity.action isEqualToString:@"update_description"]) {
109+
contentStr = [NSString stringWithFormat:@"更新了任务描述 - %@", [curActivity.created_at stringDisplay_HHmm]];
110+
}else if ([curActivity.action isEqualToString:@"update_label"]) {
111+
if (curActivity.labels.count > 0) {
112+
contentStr = [NSString stringWithFormat:@"更新了任务标签为 「%@」 - %@", [[curActivity.labels valueForKey:@"name"] componentsJoinedByString:@","], [curActivity.created_at stringDisplay_HHmm]];
113+
}else{
114+
contentStr = [NSString stringWithFormat:@"移除了任务的所有标签 - %@", [curActivity.created_at stringDisplay_HHmm]];
115+
}
116+
}else if ([curActivity.action isEqualToString:@"reassign"]) {
117+
contentStr = [NSString stringWithFormat:@"重新指派了任务给了 「%@」 - %@", curActivity.task.owner.name, [curActivity.created_at stringDisplay_HHmm]];
118+
}else if ([curActivity.action isEqualToString:@"finish"]) {
119+
contentStr = [NSString stringWithFormat:@"完成了任务 - %@", [curActivity.created_at stringDisplay_HHmm]];
120+
}else if ([curActivity.action isEqualToString:@"restore"]) {
121+
contentStr = [NSString stringWithFormat:@"重新开启了任务 - %@", [curActivity.created_at stringDisplay_HHmm]];
122+
}else if ([curActivity.action isEqualToString:@"commit_refer"]) {
123+
contentStr = [NSString stringWithFormat:@"在分支 %@ 中提交的代码提到了任务「%@」 - %@", curActivity.commit.ref, curActivity.commit.contentStr, [curActivity.created_at stringDisplay_HHmm]];
124+
}else if ([curActivity.action isEqualToString:@"add_watcher"]){
125+
contentStr = [NSString stringWithFormat:@"%@「%@」 - %@", curActivity.action_msg, curActivity.watcher.name, [curActivity.created_at stringDisplay_HHmm]];
115126
}
116-
}else if ([curActivity.action isEqualToString:@"reassign"]) {
117-
contentStr = [NSString stringWithFormat:@"重新指派了任务给了 「%@」 - %@", curActivity.task.owner.name, [curActivity.created_at stringDisplay_HHmm]];
118-
}else if ([curActivity.action isEqualToString:@"finish"]) {
119-
contentStr = [NSString stringWithFormat:@"完成了任务 - %@", [curActivity.created_at stringDisplay_HHmm]];
120-
}else if ([curActivity.action isEqualToString:@"restore"]) {
121-
contentStr = [NSString stringWithFormat:@"重新开启了任务 - %@", [curActivity.created_at stringDisplay_HHmm]];
122-
}else if ([curActivity.action isEqualToString:@"commit_refer"]) {
123-
contentStr = [NSString stringWithFormat:@"在分支 %@ 中提交的代码提到了任务 - %@\n%@", curActivity.commit.ref, [curActivity.created_at stringDisplay_HHmm], curActivity.commit.contentStr];
124-
}else{
125-
contentStr = @"...";
127+
}else if ([curActivity.target_type isEqualToString:@"MergeRequestBean"]){
128+
contentStr = [NSString stringWithFormat:@"%@ 合并请求「%@」 - %@", curActivity.action_msg, curActivity.merge_request_title, [curActivity.created_at stringDisplay_HHmm]];
126129
}
127-
130+
contentStr = contentStr? contentStr: @"...";
128131
attrContent = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@", userName, contentStr]];
129132
[attrContent addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:13],
130133
NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x222222"]}

0 commit comments

Comments
 (0)