Skip to content

Commit 486653e

Browse files
wanghenghengwanghengheng
committed
动态里面不显示代码内容，用‘代码’代替
1 parent 0b01f07 commit 486653e

8 files changed

Lines changed: 125 additions & 4 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,9 @@
291291
4EE548281AE9166B00A92306 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EE548261AE9166B00A92306 /* [email protected] */; };
292292
4EE548291AE9166B00A92306 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EE548271AE9166B00A92306 /* [email protected] */; };
293293
4EF818161B049C89005F974B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EF818151B049C89005F974B /* [email protected] */; };
294+
4EF818191B05C984005F974B /* ProjectTopicActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EF818181B05C984005F974B /* ProjectTopicActivity.m */; };
295+
4EF8181C1B05C9AE005F974B /* TaskCommentActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EF8181B1B05C9AE005F974B /* TaskCommentActivity.m */; };
296+
4EF8181F1B05C9D8005F974B /* ProjectLineNoteActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EF8181E1B05C9D8005F974B /* ProjectLineNoteActivity.m */; };
294297
4EF91F631B00B62B0021C951 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EF91F611B00B62A0021C951 /* [email protected] */; };
295298
4EF91F641B00B62B0021C951 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EF91F621B00B62A0021C951 /* [email protected] */; };
296299
68D9A2AD062641F5BCA573C5 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B024F2227BD4152BC7C9A7A /* libPods.a */; };
@@ -1085,6 +1088,12 @@
10851088
4EE548261AE9166B00A92306 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
10861089
4EE548271AE9166B00A92306 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
10871090
4EF818151B049C89005F974B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1091+
4EF818171B05C984005F974B /* ProjectTopicActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectTopicActivity.h; sourceTree = "<group>"; };
1092+
4EF818181B05C984005F974B /* ProjectTopicActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectTopicActivity.m; sourceTree = "<group>"; };
1093+
4EF8181A1B05C9AE005F974B /* TaskCommentActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskCommentActivity.h; sourceTree = "<group>"; };
1094+
4EF8181B1B05C9AE005F974B /* TaskCommentActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskCommentActivity.m; sourceTree = "<group>"; };
1095+
4EF8181D1B05C9D8005F974B /* ProjectLineNoteActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectLineNoteActivity.h; sourceTree = "<group>"; };
1096+
4EF8181E1B05C9D8005F974B /* ProjectLineNoteActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectLineNoteActivity.m; sourceTree = "<group>"; };
10881097
4EF91F611B00B62A0021C951 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
10891098
4EF91F621B00B62A0021C951 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
10901099
8B18B0211092D3903D031B13 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
@@ -2804,6 +2813,12 @@
28042813
4EACB4451A2C60110097ABB3 /* ProjectActivities.m */,
28052814
4E787DE31B03342000F06E83 /* ProjectActivity.h */,
28062815
4E787DE41B03342000F06E83 /* ProjectActivity.m */,
2816+
4EF818171B05C984005F974B /* ProjectTopicActivity.h */,
2817+
4EF818181B05C984005F974B /* ProjectTopicActivity.m */,
2818+
4EF8181A1B05C9AE005F974B /* TaskCommentActivity.h */,
2819+
4EF8181B1B05C9AE005F974B /* TaskCommentActivity.m */,
2820+
4EF8181D1B05C9D8005F974B /* ProjectLineNoteActivity.h */,
2821+
4EF8181E1B05C9D8005F974B /* ProjectLineNoteActivity.m */,
28072822
4E787DE01B0329B300F06E83 /* ProjectLineNote.h */,
28082823
4E787DE11B0329B300F06E83 /* ProjectLineNote.m */,
28092824
8EA6CFE619E240C40076D59C /* ProjectTopic.h */,
@@ -3642,6 +3657,7 @@
36423657
8EF643C619FF7E2900F7EEB0 /* TitleValueCell.m in Sources */,
36433658
4EA7F1671A6D192B00A046BD /* ODRefreshControl.m in Sources */,
36443659
8EA6D20C19E240C40076D59C /* RDVTabBarItem.m in Sources */,
3660+
4EF818191B05C984005F974B /* ProjectTopicActivity.m in Sources */,
36453661
4E996BE21ABA957B00C704F1 /* ProjectListViewController.m in Sources */,
36463662
4E743E6D1A88A3CC00DADDE5 /* EaseMarkdownTextView.m in Sources */,
36473663
8EA6D1B519E240C40076D59C /* ListGroupItem.m in Sources */,
@@ -3697,6 +3713,7 @@
36973713
4E5C06EB1AC4009100F427C5 /* CannotLoginViewController.m in Sources */,
36983714
8EA6D12819E240C40076D59C /* AppDelegate.m in Sources */,
36993715
4ECE8AFF1A3946C10021E29C /* Coding_NetAPIManager.m in Sources */,
3716+
4EF8181C1B05C9AE005F974B /* TaskCommentActivity.m in Sources */,
37003717
8E59F0FA1A00F3F3009A905F /* FileListFileCell.m in Sources */,
37013718
8EA6D14219E240C40076D59C /* TipsViewController.m in Sources */,
37023719
8EA6D1CA19E240C40076D59C /* UIPlaceHolderTextView.m in Sources */,
@@ -3890,6 +3907,7 @@
38903907
4E996BD91ABA776500C704F1 /* UserInfoTextCell.m in Sources */,
38913908
8E1C3E0819E8DFE300EF3032 /* AboutViewController.m in Sources */,
38923909
4E6BA2D71A1EE6AF005FD721 /* AFHTTPRequestOperation.m in Sources */,
3910+
4EF8181F1B05C9D8005F974B /* ProjectLineNoteActivity.m in Sources */,
38933911
8EF643A919FF7E2900F7EEB0 /* MessageMediaItemCCell.m in Sources */,
38943912
4ECE8AE41A3943E80021E29C /* UIImage+Common.m in Sources */,
38953913
8EF643D619FF7E9F00F7EEB0 /* ProjectTopicCell.m in Sources */,

‎Coding_iOS/Models/ProjectActivity.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
//
88

99
#import <Foundation/Foundation.h>
10+
#import "ProjectTopicActivity.h"
11+
#import "TaskCommentActivity.h"
12+
#import "ProjectLineNoteActivity.h"
13+
1014
#import "Projects.h"
11-
#import "ProjectLineNote.h"
1215

1316
@class Task;
1417
@class ProjectTopic;
@@ -19,15 +22,15 @@
1922
@property (readwrite, nonatomic, strong) User *user, *target_user;
2023
@property (readwrite, nonatomic, strong) NSDate *created_at;
2124
@property (readwrite, nonatomic, strong) Task *origin_task, *task;
22-
@property (readwrite, nonatomic, strong) TaskComment *taskComment, *origin_taskComment;
25+
@property (readwrite, nonatomic, strong) TaskCommentActivity *taskComment, *origin_taskComment;
2326
@property (readwrite, nonatomic, strong) Project *project;
24-
@property (readwrite, nonatomic, strong) ProjectTopic *project_topic;
27+
@property (readwrite, nonatomic, strong) ProjectTopicActivity *project_topic;
2528
@property (readwrite, nonatomic, strong) File *file;
2629
@property (readwrite, nonatomic, strong) QcTask *qc_task;
2730
@property (readwrite, nonatomic, strong) Depot *depot, *source_depot;
2831
@property (readwrite, nonatomic, strong) NSMutableArray *commits;
2932
@property (readwrite, nonatomic, strong) NSDictionary *propertyArrayMap;
30-
@property (readwrite, nonatomic, strong) ProjectLineNote *line_note;
33+
@property (readwrite, nonatomic, strong) ProjectLineNoteActivity *line_note;
3134

3235
@property (readonly, nonatomic, strong) NSMutableArray *actionMediaItems, *contentMediaItems;
3336
@property (readonly, nonatomic, strong) NSMutableString *actionStr, *contentStr;

‎Coding_iOS/Models/ProjectLineNoteActivity.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// ProjectLineNoteActivity.h
3+
// Coding_iOS
4+
//
5+
// Created by Ease on 15/5/15.
6+
// Copyright (c) 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
@interface ProjectLineNoteActivity : NSObject
12+
@property (readwrite, strong, nonatomic) NSString *commit_id, *commit_path, *content, *path;
13+
@property (readwrite, strong, nonatomic) NSNumber *id;
14+
@property (readwrite, nonatomic, strong) HtmlMedia *htmlMedia;
15+
@end

‎Coding_iOS/Models/ProjectLineNoteActivity.m‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// ProjectLineNoteActivity.m
3+
// Coding_iOS
4+
//
5+
// Created by Ease on 15/5/15.
6+
// Copyright (c) 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import "ProjectLineNoteActivity.h"
10+
11+
@implementation ProjectLineNoteActivity
12+
- (void)setContent:(NSString *)content{
13+
if (_content != content) {
14+
_htmlMedia = [HtmlMedia htmlMediaWithString:content showType:MediaShowTypeImageAndMonkey];
15+
_content = _htmlMedia.contentDisplay;
16+
}
17+
}
18+
@end

‎Coding_iOS/Models/ProjectTopicActivity.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//
2+
// ProjectTopicActivity.h
3+
// Coding_iOS
4+
//
5+
// Created by Ease on 15/5/15.
6+
// Copyright (c) 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
@interface ProjectTopicActivity : NSObject
12+
@property (readwrite, nonatomic, strong) NSString *title, *content, *path;
13+
@property (readwrite, nonatomic, strong) HtmlMedia *htmlMedia;
14+
@property (readwrite, nonatomic, strong) ProjectTopicActivity *parent;
15+
16+
@end

‎Coding_iOS/Models/ProjectTopicActivity.m‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// ProjectTopicActivity.m
3+
// Coding_iOS
4+
//
5+
// Created by Ease on 15/5/15.
6+
// Copyright (c) 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import "ProjectTopicActivity.h"
10+
11+
@implementation ProjectTopicActivity
12+
- (void)setContent:(NSString *)content{
13+
if (_content != content) {
14+
_htmlMedia = [HtmlMedia htmlMediaWithString:content showType:MediaShowTypeImageAndMonkey];
15+
_content = _htmlMedia.contentDisplay;
16+
}
17+
}
18+
@end

‎Coding_iOS/Models/TaskCommentActivity.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// TaskCommentActivity.h
3+
// Coding_iOS
4+
//
5+
// Created by Ease on 15/5/15.
6+
// Copyright (c) 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
@interface TaskCommentActivity : NSObject
12+
@property (readwrite, nonatomic, strong) NSNumber *id;
13+
@property (readwrite, nonatomic, strong) NSString *content;
14+
@property (readwrite, nonatomic, strong) HtmlMedia *htmlMedia;
15+
@end

‎Coding_iOS/Models/TaskCommentActivity.m‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// TaskCommentActivity.m
3+
// Coding_iOS
4+
//
5+
// Created by Ease on 15/5/15.
6+
// Copyright (c) 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import "TaskCommentActivity.h"
10+
11+
@implementation TaskCommentActivity
12+
- (void)setContent:(NSString *)content{
13+
if (_content != content) {
14+
_htmlMedia = [HtmlMedia htmlMediaWithString:content showType:MediaShowTypeImageAndMonkey];
15+
_content = _htmlMedia.contentDisplay;
16+
}
17+
}
18+
@end

0 commit comments

Comments
 (0)