FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

【iOS】版本规划 相关的动态显示异常 - 差两个 icon: task_activity_icon_add_milestone / ta… · Nododo/Coding-iOS@ef26bc1 · GitHub

/ Coding-iOS Public
forked from coding/Coding-iOS

Commit ef26bc1

Browse files
wanghengheng
committed
【iOS】版本规划 相关的动态显示异常 - 差两个 icon: task_activity_icon_add_milestone / task_activity_icon_remove_milestone
1 parent e2dcce6 commit ef26bc1

6 files changed

Lines changed: 48 additions & 0 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,6 +1350,7 @@
13501350
B1AB5CB9202D7D500075A669 /* button_file_move_enable@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1AB5CAE202D7D4F0075A669 /* button_file_move_enable@3x.png */; };
13511351
B1AB5CBA202D7D500075A669 /* button_file_move_unable@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1AB5CAF202D7D4F0075A669 /* button_file_move_unable@3x.png */; };
13521352
B1AB5CBB202D7D500075A669 /* button_file_createFolder_unable@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1AB5CB0202D7D500075A669 /* button_file_createFolder_unable@3x.png */; };
1353+
B1ACFE0D20A975E2000BC41E /* EAMilestone.m in Sources */ = {isa = PBXBuildFile; fileRef = B1ACFE0C20A975E2000BC41E /* EAMilestone.m */; };
13531354
B1BCB87D1FCD006C0098B87B /* icon_file_doc_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1BCB8701FCD006A0098B87B /* icon_file_doc_big@2x.png */; };
13541355
B1BCB87E1FCD006C0098B87B /* icon_file_zip_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1BCB8711FCD006B0098B87B /* icon_file_zip_big@2x.png */; };
13551356
B1BCB87F1FCD006C0098B87B /* icon_file_pdf_big@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1BCB8721FCD006B0098B87B /* icon_file_pdf_big@2x.png */; };
@@ -3517,6 +3518,8 @@
35173518
B1AB5CAE202D7D4F0075A669 /* button_file_move_enable@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_move_enable@3x.png"; sourceTree = "<group>"; };
35183519
B1AB5CAF202D7D4F0075A669 /* button_file_move_unable@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_move_unable@3x.png"; sourceTree = "<group>"; };
35193520
B1AB5CB0202D7D500075A669 /* button_file_createFolder_unable@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_file_createFolder_unable@3x.png"; sourceTree = "<group>"; };
3521+
B1ACFE0B20A975E2000BC41E /* EAMilestone.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EAMilestone.h; sourceTree = "<group>"; };
3522+
B1ACFE0C20A975E2000BC41E /* EAMilestone.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EAMilestone.m; sourceTree = "<group>"; };
35203523
B1B2BDB01F79E74000645EAD /* net_route.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_route.h; sourceTree = "<group>"; };
35213524
B1BCB8701FCD006A0098B87B /* icon_file_doc_big@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_file_doc_big@2x.png"; sourceTree = "<group>"; };
35223525
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 @@
63206323
B1890C342015D87800F52ABA /* EAWiki.m */,
63216324
B152ED582092BF46004A6E8A /* EABoardTaskList.h */,
63226325
B152ED592092BF46004A6E8A /* EABoardTaskList.m */,
6326+
B1ACFE0B20A975E2000BC41E /* EAMilestone.h */,
6327+
B1ACFE0C20A975E2000BC41E /* EAMilestone.m */,
63236328
);
63246329
path = Models;
63256330
sourceTree = "<group>";
@@ -8728,6 +8733,7 @@
87288733
D09AA5BD1BFDE5F5008CA9EB /* TweetSearchCell.m in Sources */,
87298734
4E6BA2E01A1EE6AF005FD721 /* AFURLResponseSerialization.m in Sources */,
87308735
8E59F1031A0120F1009A905F /* CodeFile.m in Sources */,
8736+
B1ACFE0D20A975E2000BC41E /* EAMilestone.m in Sources */,
87318737
4E0BD8801B6C7F0A0061CAA6 /* CSSearchCell.m in Sources */,
87328738
4E996BCA1ABA754600C704F1 /* JDStatusBarView.m in Sources */,
87338739
4E4D6A881B1C6E1B00FD2E49 /* MRPRAcceptEditCell.m in Sources */,

‎Coding_iOS/Models/EAMilestone.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//
2+
// EAMilestone.h
3+
// Coding_iOS
4+
//
5+
// Created by Easeeeeeeeee on 2018/5/14.
6+
// Copyright © 2018年 Coding. All rights reserved.
7+
//
8+
9+
#import "EABasePageModel.h"
10+
11+
@interface EAMilestone : EABasePageModel
12+
@property (strong, nonatomic) NSNumber *id, *project_id, *status, *processing, *finished, *percentage, *remaining_days, *expire_days;
13+
@property (strong, nonatomic) NSString *name, *description_mine, *start_date, *publish_date;
14+
@end
15+
16+
//"start_date": "2018-05-14",
17+
//"publish_date": "2018-05-30",

‎Coding_iOS/Models/EAMilestone.m‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//
2+
// EAMilestone.m
3+
// Coding_iOS
4+
//
5+
// Created by Easeeeeeeeee on 2018/5/14.
6+
// Copyright © 2018年 Coding. All rights reserved.
7+
//
8+
9+
#import "EAMilestone.h"
10+
11+
@implementation EAMilestone
12+
13+
@end

‎Coding_iOS/Models/ProjectActivity.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#import "FileComment.h"
1515
#import "ProjectFile.h"
1616
#import "ProjectTag.h"
17+
#import "EAMilestone.h"
1718

1819
@class Task;
1920
@class ProjectTopic;
@@ -36,6 +37,7 @@
3637
@property (strong, nonatomic) Commit *commit;
3738
@property (strong, nonatomic) FileComment *projectFileComment;
3839
@property (strong, nonatomic) ProjectFile *projectFile;
40+
@property (strong, nonatomic) EAMilestone *milestone;
3941

4042
@property (readwrite, strong, nonatomic) NSString *content;
4143
@property (readwrite, nonatomic, strong) HtmlMedia *htmlMedia;

‎Coding_iOS/Models/ProjectActivity.m‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ - (NSMutableString *)actionStr{
100100
}else if ([_action isEqualToString:@"remove_watcher"]){
101101
[_actionStr saveAppendString:_action_msg];
102102
[self addActionUser:_watcher];
103+
}else if ([_action isEqualToString:@"add_milestone"] || [_action isEqualToString:@"remove_milestone"]){
104+
[_actionStr appendFormat:@"在任务「%@」中%@", _task.title, _action_msg];
103105
}else{
104106
[_actionStr saveAppendString:_action_msg];
105107
if (_origin_task.owner) {
@@ -163,6 +165,8 @@ - (NSMutableString *)actionStr{
163165
}
164166
}else if ([_target_type isEqualToString:@"Wiki"]){
165167
[_actionStr appendString:@"wiki"];
168+
}else if ([_target_type isEqualToString:@"Milestone"]){
169+
166170
}else{
167171
[_actionStr appendString:@"项目"];
168172
if ([_target_type isEqualToString:@"Project"]){
@@ -209,6 +213,8 @@ - (NSMutableString *)contentStr{
209213
}else{
210214
[_contentStr appendFormat:@"移除了任务的所有标签"];
211215
}
216+
}else if ([_action isEqualToString:@"add_milestone"] || [_action isEqualToString:@"remove_milestone"]){
217+
[_contentStr saveAppendString:_milestone.name];
212218
}else{
213219
[_contentStr saveAppendString:_task.title];
214220
}
@@ -276,6 +282,8 @@ - (NSMutableString *)contentStr{
276282
}
277283
}else if ([_target_type isEqualToString:@"ProtectedBranch"]){
278284
[_contentStr saveAppendString:self.ref_name];
285+
}else if ([_target_type isEqualToString:@"Milestone"]){
286+
[_contentStr saveAppendString:_milestone.name];
279287
}else{
280288
[_contentStr appendString:@"**未知**"];
281289
}

‎Coding_iOS/Views/Cell/TaskActivityCell.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ + (NSAttributedString *)attrContentWithObj:(ProjectActivity *)curActivity{
136136
contentStr = [NSString stringWithFormat:@"%@「%@」 - %@", curActivity.action_msg, curActivity.watcher.name, [curActivity.created_at stringDisplay_HHmm]];
137137
}else if ([curActivity.action isEqualToString:@"remove_watcher"]){
138138
contentStr = [NSString stringWithFormat:@"%@「%@」 - %@", curActivity.action_msg, curActivity.watcher.name, [curActivity.created_at stringDisplay_HHmm]];
139+
}else if ([curActivity.action isEqualToString:@"add_milestone"] || [curActivity.action isEqualToString:@"remove_milestone"]){
140+
contentStr = [NSString stringWithFormat:@"%@「%@」 - %@", curActivity.action_msg, curActivity.milestone.name, [curActivity.created_at stringDisplay_HHmm]];
139141
}
140142
}else if ([curActivity.target_type isEqualToString:@"MergeRequestBean"]){
141143
contentStr = [NSString stringWithFormat:@"%@ 合并请求「%@」 - %@", curActivity.action_msg, curActivity.merge_request_title, [curActivity.created_at stringDisplay_HHmm]];

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL