Skip to content

Commit 31f2db1

Browse files
liao3841054liao3841054
committed
merge nothing error
2 parents b2117db + 5fea3bb commit 31f2db1

20 files changed

+179
-120
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
4E095A831B6B24DE008DC439 /* task_description_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A801B6B24DE008DC439 /* task_description_icon@2x.png */; };
7575
4E095A841B6B24DE008DC439 /* time_clock_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A811B6B24DE008DC439 /* time_clock_icon@2x.png */; };
7676
4E095A851B6B24DE008DC439 /* topic_comment_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A821B6B24DE008DC439 /* topic_comment_icon@2x.png */; };
77+
4E09DCA51C156387001C9392 /* hot_topic_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */; };
78+
4E09DCA61C156387001C9392 /* hot_topic_Nav@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */; };
79+
4E09DCA91C15662E001C9392 /* share_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA71C15662E001C9392 /* share_Nav@2x.png */; };
80+
4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA81C15662E001C9392 /* share_Nav@3x.png */; };
7781
4E0B9A341BAC1CD100D57D54 /* ForkTreeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0B9A331BAC1CD100D57D54 /* ForkTreeViewController.m */; };
7882
4E0B9A371BAD377600D57D54 /* ForkTreeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0B9A361BAD377600D57D54 /* ForkTreeCell.m */; };
7983
4E0BD8561B6C7DFD0061CAA6 /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD8551B6C7DFD0061CAA6 /* UIView+Frame.m */; };
@@ -1118,6 +1122,10 @@
11181122
4E095A801B6B24DE008DC439 /* task_description_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "task_description_icon@2x.png"; sourceTree = "<group>"; };
11191123
4E095A811B6B24DE008DC439 /* time_clock_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "time_clock_icon@2x.png"; sourceTree = "<group>"; };
11201124
4E095A821B6B24DE008DC439 /* topic_comment_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "topic_comment_icon@2x.png"; sourceTree = "<group>"; };
1125+
4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hot_topic_Nav@2x.png"; sourceTree = "<group>"; };
1126+
4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hot_topic_Nav@3x.png"; sourceTree = "<group>"; };
1127+
4E09DCA71C15662E001C9392 /* share_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "share_Nav@2x.png"; sourceTree = "<group>"; };
1128+
4E09DCA81C15662E001C9392 /* share_Nav@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "share_Nav@3x.png"; sourceTree = "<group>"; };
11211129
4E0B9A321BAC1CD100D57D54 /* ForkTreeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForkTreeViewController.h; sourceTree = "<group>"; };
11221130
4E0B9A331BAC1CD100D57D54 /* ForkTreeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ForkTreeViewController.m; sourceTree = "<group>"; };
11231131
4E0B9A351BAD377600D57D54 /* ForkTreeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForkTreeCell.h; sourceTree = "<group>"; };
@@ -3939,6 +3947,10 @@
39393947
8E97CE4B1A0A3410006F9AD7 /* nav_button */ = {
39403948
isa = PBXGroup;
39413949
children = (
3950+
4E09DCA71C15662E001C9392 /* share_Nav@2x.png */,
3951+
4E09DCA81C15662E001C9392 /* share_Nav@3x.png */,
3952+
4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */,
3953+
4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */,
39423954
D0C447FE1C02DCAC00DC1C4B /* addBtn_Nav@3x.png */,
39433955
D0C447FF1C02DCAC00DC1C4B /* addUserBtn_Nav@3x.png */,
39443956
D0C448001C02DCAC00DC1C4B /* filterBtn_selected_Nav@3x.png */,
@@ -5119,8 +5131,6 @@
51195131
8E47700D198770E700997D05 /* Frameworks */,
51205132
8E47700E198770E700997D05 /* Resources */,
51215133
96A9263FF11A4AA8B5F6BB6B /* Copy Pods Resources */,
5122-
4D377102C370B11E75B90434 /* Embed Pods Frameworks */,
5123-
E02AF118462CF977ED1C152E /* Embed Pods Frameworks */,
51245134
);
51255135
buildRules = (
51265136
);
@@ -5172,6 +5182,7 @@
51725182
isa = PBXResourcesBuildPhase;
51735183
buildActionMask = 2147483647;
51745184
files = (
5185+
4E09DCA51C156387001C9392 /* hot_topic_Nav@2x.png in Resources */,
51755186
8E97CE6C1A0B243B006F9AD7 /* keyboard_add@2x.png in Resources */,
51765187
4E6383FD1B33C18700D98648 /* task_activity_icon_restore@2x.png in Resources */,
51775188
4E9F5D201C03051D007CCDCC /* tipIcon_tweetReward@2x.png in Resources */,
@@ -5240,7 +5251,9 @@
52405251
4E996C071ABBF56A00C704F1 /* user_info_detail@2x.png in Resources */,
52415252
4E8C51B01AC1081500B4C51F /* icon_recommended@2x.png in Resources */,
52425253
4E96E7DA1A1B537E0037C098 /* icon_file_doc@2x.png in Resources */,
5254+
4E09DCA61C156387001C9392 /* hot_topic_Nav@3x.png in Resources */,
52435255
4E4972DF1BB535B400F3AC15 /* tipIcon_ProjectTweet@2x.png in Resources */,
5256+
4E09DCA91C15662E001C9392 /* share_Nav@2x.png in Resources */,
52445257
8E62ADDA19E28DA800963870 /* tipIcon_User@2x.png in Resources */,
52455258
4E6383A71B3262D300D98648 /* taskPriority0_small@2x.png in Resources */,
52465259
8E8F7B3519EF6306006BA8BD /* btn_project_quit@2x.png in Resources */,
@@ -5526,6 +5539,7 @@
55265539
8E97CE611A0A3424006F9AD7 /* keyboard_add_photo@2x.png in Resources */,
55275540
4E93F23B1B84356500017916 /* file_menu_icon_edit@2x.png in Resources */,
55285541
8E1C3DF619E7F4CA00EF3032 /* address.json in Resources */,
5542+
4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */,
55295543
4E2BF3D01B96CDF800A5A0A8 /* share_btn_copylink@2x.png in Resources */,
55305544
4EF17ED41B3C3112003CDD2D /* intro_icon_2@3x.png in Resources */,
55315545
8EA6D18D19E240C40076D59C /* tabbar_background@2x.png in Resources */,
@@ -5685,21 +5699,6 @@
56855699
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
56865700
showEnvVarsInLog = 0;
56875701
};
5688-
4D377102C370B11E75B90434 /* Embed Pods Frameworks */ = {
5689-
isa = PBXShellScriptBuildPhase;
5690-
buildActionMask = 2147483647;
5691-
files = (
5692-
);
5693-
inputPaths = (
5694-
);
5695-
name = "Embed Pods Frameworks";
5696-
outputPaths = (
5697-
);
5698-
runOnlyForDeploymentPostprocessing = 0;
5699-
shellPath = /bin/sh;
5700-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
5701-
showEnvVarsInLog = 0;
5702-
};
57035702
96A9263FF11A4AA8B5F6BB6B /* Copy Pods Resources */ = {
57045703
isa = PBXShellScriptBuildPhase;
57055704
buildActionMask = 2147483647;
@@ -5715,21 +5714,6 @@
57155714
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
57165715
showEnvVarsInLog = 0;
57175716
};
5718-
E02AF118462CF977ED1C152E /* Embed Pods Frameworks */ = {
5719-
isa = PBXShellScriptBuildPhase;
5720-
buildActionMask = 2147483647;
5721-
files = (
5722-
);
5723-
inputPaths = (
5724-
);
5725-
name = "Embed Pods Frameworks";
5726-
outputPaths = (
5727-
);
5728-
runOnlyForDeploymentPostprocessing = 0;
5729-
shellPath = /bin/sh;
5730-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
5731-
showEnvVarsInLog = 0;
5732-
};
57335717
/* End PBXShellScriptBuildPhase section */
57345718

57355719
/* Begin PBXSourcesBuildPhase section */

‎Coding_iOS/Controllers/LocalFileViewController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ - (void)viewDidLoad {
4646
[super viewDidLoad];
4747
// Do any additional setup after loading the view.
4848
self.title = self.fileName;
49-
[self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"moreBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
49+
[self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"share_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
5050

5151
if ([self.fileType isEqualToString:@"md"]
5252
|| [self.fileType isEqualToString:@"html"]
@@ -94,6 +94,7 @@ - (void)loadWebView:(NSURL *)fileUrl{
9494
NSString *mdStr = [NSString stringWithContentsOfURL:fileUrl encoding:NSUTF8StringEncoding error:nil];
9595
[self.activityIndicator startAnimating];
9696
[[Coding_NetAPIManager sharedManager] request_MDHtmlStr_WithMDStr:mdStr inProject:nil andBlock:^(id data, NSError *error) {
97+
[self.activityIndicator stopAnimating];
9798
NSString *htmlStr;
9899
htmlStr = data? data: @"加载失败";
99100
NSString *contentStr = [WebContentManager markdownPatternedWithContent:htmlStr];

‎Coding_iOS/Controllers/ProjectSquareViewController.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
111111
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
112112
ProjectAboutMeListCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ProjectAboutMeListCell"];
113113
cell.openKeywords=TRUE;
114+
cell.hidePrivateIcon=TRUE;
114115
Project *project=_dateSource[indexPath.row];
115116
[cell setProject:project hasSWButtons:NO hasBadgeTip:YES hasIndicator:NO];
116117
// [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];

‎Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#import "CSSearchVC.h"
2929
#import "CSSearchDisplayVC.h"
3030
#import "FunctionTipsManager.h"
31+
#import "CSHotTopicPagesVC.h"
3132

3233
@interface Tweet_RootViewController () <UISearchBarDelegate, UISearchDisplayDelegate>
3334
{
@@ -103,7 +104,9 @@ - (void)viewDidLoad
103104
// [self refreshFirst];
104105
// }];
105106

106-
UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
107+
// UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
108+
UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"hot_topic_Nav" showBadge:NO target:self action:@selector(hotTopicBtnClicked:)];
109+
107110
[self.parentViewController.navigationItem setLeftBarButtonItem:leftBarItem animated:NO];
108111

109112
_tweetsDict = [[NSMutableDictionary alloc] initWithCapacity:4];
@@ -287,7 +290,12 @@ - (void)deleteComment:(Comment *)comment ofTweet:(Tweet *)tweet{
287290
}];
288291
}
289292

290-
#pragma mark - search
293+
#pragma mark - nav_LeftBtn
294+
295+
- (void)hotTopicBtnClicked:(id)sender{
296+
CSHotTopicPagesVC *vc = [CSHotTopicPagesVC new];
297+
[self.navigationController pushViewController:vc animated:YES];
298+
}
291299

292300
- (void)searchItemClicked:(id)sender{
293301
if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_Search]) {

‎Coding_iOS/Controllers/Topic/CSHotTopicPagesVC.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ - (void)setupUI {
160160
UILabel *la1 = [[UILabel alloc] initWithFrame:CGRectMake((kScreen_Width/2 - titleWidth/2) + 0*distance, 8, titleWidth, 16)];
161161
la1.text = @"热门话题";
162162
la1.textAlignment = NSTextAlignmentCenter;
163-
la1.font = [UIFont systemFontOfSize:16];
163+
la1.font = [UIFont boldSystemFontOfSize:18];
164164
la1.textColor = [UIColor whiteColor];
165165

166166
UILabel *la2 = [[UILabel alloc] initWithFrame:CGRectMake((kScreen_Width/2 - titleWidth/2) + 1*distance, 8, titleWidth, 16)];
167167
la2.text = @"我的话题";
168168
la2.textAlignment = NSTextAlignmentCenter;
169-
la2.font = [UIFont systemFontOfSize:16];
169+
la2.font = [UIFont boldSystemFontOfSize:18];
170170
la2.textColor = [UIColor whiteColor];
171171

172172

‎Coding_iOS/Controllers/TweetDetailViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ - (void)viewDidLoad
5252
[super viewDidLoad];
5353
// Do any additional setup after loading the view.
5454
self.title = @"冒泡详情";
55-
[self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"moreBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
55+
[self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"share_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
5656

5757
// 添加myTableView
5858
_myTableView = ({

‎Coding_iOS/Images/.DS_Store

-18 KB
Binary file not shown.

‎Coding_iOS/Images/nav_button/hot_topic_Nav@2x.png

450 Bytes
Loading

‎Coding_iOS/Images/nav_button/hot_topic_Nav@3x.png

597 Bytes
Loading

‎Coding_iOS/Images/nav_button/share_Nav@2x.png

668 Bytes
Loading

‎Coding_iOS/Images/nav_button/share_Nav@3x.png

983 Bytes
Loading

‎Coding_iOS/Models/Project.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@interface Project : NSObject
1212
@property (readwrite, nonatomic, strong) NSString *icon, *name, *owner_user_name, *backend_project_path, *full_name, *description_mine, *path, *parent_depot_path, *current_user_role,*project_path;
13-
@property (readwrite, nonatomic, strong) NSNumber *id, *owner_id, *is_public, *un_read_activities_count, *done, *processing, *star_count, *stared, *watch_count, *watched, *fork_count, *forked, *recommended, *pin, *current_user_role_id;
13+
@property (readwrite, nonatomic, strong) NSNumber *id, *owner_id, *is_public, *un_read_activities_count, *done, *processing, *star_count, *stared, *watch_count, *watched, *fork_count, *forked, *recommended, *pin, *current_user_role_id,*type;
1414
@property (assign, nonatomic) BOOL isStaring, isWatching, isLoadingMember, isLoadingDetail;
1515

1616
@property (strong, nonatomic) User *owner;

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ typedef NS_ENUM(NSUInteger, VerifyType){
181181
- (void)request_UserTagArrayWithBlock:(void (^)(id data, NSError *error))block;
182182
- (void)request_UpdateUserInfo_WithObj:(User *)curUser andBlock:(void (^)(id data, NSError *error))block;
183183
- (void)request_PointRecords:(PointRecords *)records andBlock:(void (^)(id data, NSError *error))block;
184-
- (void)request_Preparereward:(NSString *)tweet_id andBlock:(void (^)(id data, NSError *error))block;
185184
- (void)request_RewardToTweet:(NSString *)tweet_id encodedPassword:(NSString *)encodedPassword andBlock:(void (^)(id data, NSError *error))block;
186185

187186

‎Coding_iOS/Util/Manager/Coding_NetAPIManager.m

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,22 +1775,11 @@ - (void)request_PointRecords:(PointRecords *)records andBlock:(void (^)(id data,
17751775
}];
17761776
}
17771777

1778-
- (void)request_Preparereward:(NSString *)tweet_id andBlock:(void (^)(id data, NSError *error))block{
1779-
NSString *path = [NSString stringWithFormat:@"api/tweet/%@/preparereward", tweet_id];
1780-
[[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get autoShowError:NO andBlock:^(id data, NSError *error) {
1781-
if (data) {
1782-
[MobClick event:kUmeng_Event_Request_Get label:@"准备打赏"];
1783-
1784-
data = data[@"data"];
1785-
}
1786-
block(data, error);
1787-
}];
1788-
}
17891778
- (void)request_RewardToTweet:(NSString *)tweet_id encodedPassword:(NSString *)encodedPassword andBlock:(void (^)(id data, NSError *error))block{
1790-
NSString *path = [NSString stringWithFormat:@"api/tweet/%@/reward", tweet_id];
1791-
NSDictionary *params = @{@"encodedPassword": encodedPassword};
1779+
NSString *path = [NSString stringWithFormat:@"api/tweet/%@/app_reward", tweet_id];
1780+
NSDictionary *params = encodedPassword.length > 0? @{@"encodedPassword": encodedPassword}: nil;
17921781

1793-
[[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
1782+
[[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post autoShowError:NO andBlock:^(id data, NSError *error) {
17941783
if (data) {
17951784
[MobClick event:kUmeng_Event_Request_ActionOfServer label:@"打赏成功"];
17961785
}else{

0 commit comments

Comments
 (0)