【iOS】版本规划 相关的动态显示异常 - 差两个 icon: task_activity_icon_add_milestone / task_activity_icon_remove_milestone

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -1350,6 +1350,7 @@
 		B1AB5CB9202D7D500075A669 /* button_file_move_enable@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1AB5CAE202D7D4F0075A669 /* button_file_move_enable@3x.png */; };
 		B1AB5CBA202D7D500075A669 /* button_file_move_unable@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1AB5CAF202D7D4F0075A669 /* button_file_move_unable@3x.png */; };
 		B1AB5CBB202D7D500075A669 /* button_file_createFolder_unable@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1AB5CB0202D7D500075A669 /* button_file_createFolder_unable@3x.png */; };
+		B1ACFE0D20A975E2000BC41E /* EAMilestone.m in Sources */ = {isa = PBXBuildFile; fileRef = B1ACFE0C20A975E2000BC41E /* EAMilestone.m */; };
 		B1BCB87D1FCD006C0098B87B /* icon_file_doc_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1BCB8701FCD006A0098B87B /* icon_file_doc_big@2x.png */; };
 		B1BCB87E1FCD006C0098B87B /* icon_file_zip_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1BCB8711FCD006B0098B87B /* icon_file_zip_big@2x.png */; };
 		B1BCB87F1FCD006C0098B87B /* icon_file_pdf_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1BCB8721FCD006B0098B87B /* icon_file_pdf_big@2x.png */; };
@@ -3517,6 +3518,8 @@
 		B1AB5CAE202D7D4F0075A669 /* button_file_move_enable@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_move_enable@3x.png"; sourceTree = "<group>"; };
 		B1AB5CAF202D7D4F0075A669 /* button_file_move_unable@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_move_unable@3x.png"; sourceTree = "<group>"; };
 		B1AB5CB0202D7D500075A669 /* button_file_createFolder_unable@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_createFolder_unable@3x.png"; sourceTree = "<group>"; };
+		B1ACFE0B20A975E2000BC41E /* EAMilestone.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EAMilestone.h; sourceTree = "<group>"; };
+		B1ACFE0C20A975E2000BC41E /* EAMilestone.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EAMilestone.m; sourceTree = "<group>"; };
 		B1B2BDB01F79E74000645EAD /* net_route.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_route.h; sourceTree = "<group>"; };
 		B1BCB8701FCD006A0098B87B /* icon_file_doc_big@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_file_doc_big@2x.png"; sourceTree = "<group>"; };
 		B1BCB8711FCD006B0098B87B /* icon_file_zip_big@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_file_zip_big@2x.png"; sourceTree = "<group>"; };
@@ -6320,6 +6323,8 @@
 				B1890C342015D87800F52ABA /* EAWiki.m */,
 				B152ED582092BF46004A6E8A /* EABoardTaskList.h */,
 				B152ED592092BF46004A6E8A /* EABoardTaskList.m */,
+				B1ACFE0B20A975E2000BC41E /* EAMilestone.h */,
+				B1ACFE0C20A975E2000BC41E /* EAMilestone.m */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -8728,6 +8733,7 @@
 				D09AA5BD1BFDE5F5008CA9EB /* TweetSearchCell.m in Sources */,
 				4E6BA2E01A1EE6AF005FD721 /* AFURLResponseSerialization.m in Sources */,
 				8E59F1031A0120F1009A905F /* CodeFile.m in Sources */,
+				B1ACFE0D20A975E2000BC41E /* EAMilestone.m in Sources */,
 				4E0BD8801B6C7F0A0061CAA6 /* CSSearchCell.m in Sources */,
 				4E996BCA1ABA754600C704F1 /* JDStatusBarView.m in Sources */,
 				4E4D6A881B1C6E1B00FD2E49 /* MRPRAcceptEditCell.m in Sources */,

Coding_iOS/Models/EAMilestone.h

@@ -0,0 +1,17 @@
+//
+//  EAMilestone.h
+//  Coding_iOS
+//
+//  Created by Easeeeeeeeee on 2018/5/14.
+//  Copyright © 2018年 Coding. All rights reserved.
+//
+
+#import "EABasePageModel.h"
+
+@interface EAMilestone : EABasePageModel
+@property (strong, nonatomic) NSNumber *id, *project_id, *status, *processing, *finished, *percentage, *remaining_days, *expire_days;
+@property (strong, nonatomic) NSString *name, *description_mine, *start_date, *publish_date;
+@end
+
+//"start_date": "2018-05-14",
+//"publish_date": "2018-05-30",

Coding_iOS/Models/EAMilestone.m

@@ -0,0 +1,13 @@
+//
+//  EAMilestone.m
+//  Coding_iOS
+//
+//  Created by Easeeeeeeeee on 2018/5/14.
+//  Copyright © 2018年 Coding. All rights reserved.
+//
+
+#import "EAMilestone.h"
+
+@implementation EAMilestone
+
+@end

Coding_iOS/Models/ProjectActivity.h

@@ -14,6 +14,7 @@
 #import "FileComment.h"
 #import "ProjectFile.h"
 #import "ProjectTag.h"
+#import "EAMilestone.h"
 
 @class Task;
 @class ProjectTopic;
@@ -36,6 +37,7 @@
 @property (strong, nonatomic) Commit *commit;
 @property (strong, nonatomic) FileComment *projectFileComment;
 @property (strong, nonatomic) ProjectFile *projectFile;
+@property (strong, nonatomic) EAMilestone *milestone;
 
 @property (readwrite, strong, nonatomic) NSString *content;
 @property (readwrite, nonatomic, strong) HtmlMedia *htmlMedia;

Coding_iOS/Models/ProjectActivity.m

@@ -100,6 +100,8 @@ - (NSMutableString *)actionStr{
             }else if ([_action isEqualToString:@"remove_watcher"]){
                 [_actionStr saveAppendString:_action_msg];
                 [self addActionUser:_watcher];
+            }else if ([_action isEqualToString:@"add_milestone"] || [_action isEqualToString:@"remove_milestone"]){
+                [_actionStr appendFormat:@"在任务「%@」中%@", _task.title, _action_msg];
             }else{
                 [_actionStr saveAppendString:_action_msg];
                 if (_origin_task.owner) {
@@ -163,6 +165,8 @@ - (NSMutableString *)actionStr{
                     }
                 }else if ([_target_type isEqualToString:@"Wiki"]){
                     [_actionStr appendString:@"wiki"];
+                }else if ([_target_type isEqualToString:@"Milestone"]){
+
                 }else{
                     [_actionStr appendString:@"项目"];
                     if ([_target_type isEqualToString:@"Project"]){
@@ -209,6 +213,8 @@ - (NSMutableString *)contentStr{
                 }else{
                     [_contentStr appendFormat:@"移除了任务的所有标签"];
                 }
+            }else if ([_action isEqualToString:@"add_milestone"] || [_action isEqualToString:@"remove_milestone"]){
+                [_contentStr saveAppendString:_milestone.name];
             }else{
                 [_contentStr saveAppendString:_task.title];
             }
@@ -276,6 +282,8 @@ - (NSMutableString *)contentStr{
                 }
             }else if ([_target_type isEqualToString:@"ProtectedBranch"]){
                 [_contentStr saveAppendString:self.ref_name];
+            }else if ([_target_type isEqualToString:@"Milestone"]){
+                [_contentStr saveAppendString:_milestone.name];
             }else{
                 [_contentStr appendString:@"**未知**"];
             }

Coding_iOS/Views/Cell/TaskActivityCell.m

@@ -136,6 +136,8 @@ + (NSAttributedString *)attrContentWithObj:(ProjectActivity *)curActivity{
             contentStr = [NSString stringWithFormat:@"%@「%@」 - %@", curActivity.action_msg, curActivity.watcher.name, [curActivity.created_at stringDisplay_HHmm]];
         }else if ([curActivity.action isEqualToString:@"remove_watcher"]){
             contentStr = [NSString stringWithFormat:@"%@「%@」 - %@", curActivity.action_msg, curActivity.watcher.name, [curActivity.created_at stringDisplay_HHmm]];
+        }else if ([curActivity.action isEqualToString:@"add_milestone"] || [curActivity.action isEqualToString:@"remove_milestone"]){
+            contentStr = [NSString stringWithFormat:@"%@「%@」 - %@", curActivity.action_msg, curActivity.milestone.name, [curActivity.created_at stringDisplay_HHmm]];
         }
     }else if ([curActivity.target_type isEqualToString:@"MergeRequestBean"]){
         contentStr = [NSString stringWithFormat:@"%@ 合并请求「%@」 - %@", curActivity.action_msg, curActivity.merge_request_title, [curActivity.created_at stringDisplay_HHmm]];