Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	Coding_iOS/.DS_Store
#	Coding_iOS/Images/.DS_Store
#	Coding_iOS/Util/Manager/SendRewardManager.m
#	Coding_iOS/Views/Cell/PRMRSearchCell.m

Author: cjddny

Coding_iOS.xcodeproj/project.pbxproj

@@ -74,6 +74,10 @@
 		4E095A831B6B24DE008DC439 /* task_description_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A801B6B24DE008DC439 /* task_description_icon@2x.png */; };
 		4E095A841B6B24DE008DC439 /* time_clock_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A811B6B24DE008DC439 /* time_clock_icon@2x.png */; };
 		4E095A851B6B24DE008DC439 /* topic_comment_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A821B6B24DE008DC439 /* topic_comment_icon@2x.png */; };
+		4E09DCA51C156387001C9392 /* hot_topic_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */; };
+		4E09DCA61C156387001C9392 /* hot_topic_Nav@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */; };
+		4E09DCA91C15662E001C9392 /* share_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA71C15662E001C9392 /* share_Nav@2x.png */; };
+		4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA81C15662E001C9392 /* share_Nav@3x.png */; };
 		4E0B9A341BAC1CD100D57D54 /* ForkTreeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0B9A331BAC1CD100D57D54 /* ForkTreeViewController.m */; };
 		4E0B9A371BAD377600D57D54 /* ForkTreeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0B9A361BAD377600D57D54 /* ForkTreeCell.m */; };
 		4E0BD8561B6C7DFD0061CAA6 /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD8551B6C7DFD0061CAA6 /* UIView+Frame.m */; };
@@ -1118,6 +1122,10 @@
 		4E095A801B6B24DE008DC439 /* task_description_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "task_description_icon@2x.png"; sourceTree = "<group>"; };
 		4E095A811B6B24DE008DC439 /* time_clock_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "time_clock_icon@2x.png"; sourceTree = "<group>"; };
 		4E095A821B6B24DE008DC439 /* topic_comment_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "topic_comment_icon@2x.png"; sourceTree = "<group>"; };
+		4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hot_topic_Nav@2x.png"; sourceTree = "<group>"; };
+		4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hot_topic_Nav@3x.png"; sourceTree = "<group>"; };
+		4E09DCA71C15662E001C9392 /* share_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "share_Nav@2x.png"; sourceTree = "<group>"; };
+		4E09DCA81C15662E001C9392 /* share_Nav@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "share_Nav@3x.png"; sourceTree = "<group>"; };
 		4E0B9A321BAC1CD100D57D54 /* ForkTreeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForkTreeViewController.h; sourceTree = "<group>"; };
 		4E0B9A331BAC1CD100D57D54 /* ForkTreeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ForkTreeViewController.m; sourceTree = "<group>"; };
 		4E0B9A351BAD377600D57D54 /* ForkTreeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForkTreeCell.h; sourceTree = "<group>"; };
@@ -3939,6 +3947,10 @@
 		8E97CE4B1A0A3410006F9AD7 /* nav_button */ = {
 			isa = PBXGroup;
 			children = (
+				4E09DCA71C15662E001C9392 /* share_Nav@2x.png */,
+				4E09DCA81C15662E001C9392 /* share_Nav@3x.png */,
+				4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */,
+				4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */,
 				D0C447FE1C02DCAC00DC1C4B /* addBtn_Nav@3x.png */,
 				D0C447FF1C02DCAC00DC1C4B /* addUserBtn_Nav@3x.png */,
 				D0C448001C02DCAC00DC1C4B /* filterBtn_selected_Nav@3x.png */,
@@ -5170,6 +5182,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4E09DCA51C156387001C9392 /* hot_topic_Nav@2x.png in Resources */,
 				8E97CE6C1A0B243B006F9AD7 /* keyboard_add@2x.png in Resources */,
 				4E6383FD1B33C18700D98648 /* task_activity_icon_restore@2x.png in Resources */,
 				4E9F5D201C03051D007CCDCC /* tipIcon_tweetReward@2x.png in Resources */,
@@ -5238,7 +5251,9 @@
 				4E996C071ABBF56A00C704F1 /* user_info_detail@2x.png in Resources */,
 				4E8C51B01AC1081500B4C51F /* icon_recommended@2x.png in Resources */,
 				4E96E7DA1A1B537E0037C098 /* icon_file_doc@2x.png in Resources */,
+				4E09DCA61C156387001C9392 /* hot_topic_Nav@3x.png in Resources */,
 				4E4972DF1BB535B400F3AC15 /* tipIcon_ProjectTweet@2x.png in Resources */,
+				4E09DCA91C15662E001C9392 /* share_Nav@2x.png in Resources */,
 				8E62ADDA19E28DA800963870 /* tipIcon_User@2x.png in Resources */,
 				4E6383A71B3262D300D98648 /* taskPriority0_small@2x.png in Resources */,
 				8E8F7B3519EF6306006BA8BD /* btn_project_quit@2x.png in Resources */,
@@ -5524,6 +5539,7 @@
 				8E97CE611A0A3424006F9AD7 /* keyboard_add_photo@2x.png in Resources */,
 				4E93F23B1B84356500017916 /* file_menu_icon_edit@2x.png in Resources */,
 				8E1C3DF619E7F4CA00EF3032 /* address.json in Resources */,
+				4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */,
 				4E2BF3D01B96CDF800A5A0A8 /* share_btn_copylink@2x.png in Resources */,
 				4EF17ED41B3C3112003CDD2D /* intro_icon_2@3x.png in Resources */,
 				8EA6D18D19E240C40076D59C /* tabbar_background@2x.png in Resources */,

Coding_iOS/.DS_Store

@@ -46,7 +46,7 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.title = self.fileName;
-    [self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"moreBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
+    [self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"share_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
 
     if ([self.fileType isEqualToString:@"md"]
         || [self.fileType isEqualToString:@"html"]
@@ -94,6 +94,7 @@ - (void)loadWebView:(NSURL *)fileUrl{
         NSString *mdStr = [NSString stringWithContentsOfURL:fileUrl encoding:NSUTF8StringEncoding error:nil];
         [self.activityIndicator startAnimating];
         [[Coding_NetAPIManager sharedManager] request_MDHtmlStr_WithMDStr:mdStr inProject:nil andBlock:^(id data, NSError *error) {
+            [self.activityIndicator stopAnimating];
             NSString *htmlStr;
             htmlStr = data? data: @"加载失败";
             NSString *contentStr = [WebContentManager markdownPatternedWithContent:htmlStr];

Coding_iOS/Controllers/LocalFileViewController.m

@@ -28,6 +28,7 @@
 #import "CSSearchVC.h"
 #import "CSSearchDisplayVC.h"
 #import "FunctionTipsManager.h"
+#import "CSHotTopicPagesVC.h"
 
 @interface Tweet_RootViewController () <UISearchBarDelegate, UISearchDisplayDelegate>
 {
@@ -103,7 +104,9 @@ - (void)viewDidLoad
 //                              [self refreshFirst];
 //                          }];
 
-    UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
+//    UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
+    UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"hot_topic_Nav" showBadge:NO target:self action:@selector(hotTopicBtnClicked:)];
+    
     [self.parentViewController.navigationItem setLeftBarButtonItem:leftBarItem animated:NO];
 
     _tweetsDict = [[NSMutableDictionary alloc] initWithCapacity:4];
@@ -287,7 +290,12 @@ - (void)deleteComment:(Comment *)comment ofTweet:(Tweet *)tweet{
     }];
 }
 
-#pragma mark - search 
+#pragma mark - nav_LeftBtn
+
+- (void)hotTopicBtnClicked:(id)sender{
+    CSHotTopicPagesVC *vc = [CSHotTopicPagesVC new];
+    [self.navigationController pushViewController:vc animated:YES];
+}
 
 - (void)searchItemClicked:(id)sender{
     if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_Search]) {

Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m

@@ -160,13 +160,13 @@ - (void)setupUI {
     UILabel *la1 = [[UILabel alloc] initWithFrame:CGRectMake((kScreen_Width/2 - titleWidth/2) + 0*distance, 8, titleWidth, 16)];
     la1.text = @"热门话题";
     la1.textAlignment = NSTextAlignmentCenter;
-    la1.font = [UIFont systemFontOfSize:16];
+    la1.font = [UIFont boldSystemFontOfSize:18];
     la1.textColor = [UIColor whiteColor];
 
     UILabel *la2 = [[UILabel alloc] initWithFrame:CGRectMake((kScreen_Width/2 - titleWidth/2) + 1*distance, 8, titleWidth, 16)];
     la2.text = @"我的话题";
     la2.textAlignment = NSTextAlignmentCenter;
-    la2.font = [UIFont systemFontOfSize:16];
+    la2.font = [UIFont boldSystemFontOfSize:18];
     la2.textColor = [UIColor whiteColor];
 
 

Coding_iOS/Controllers/Topic/CSHotTopicPagesVC.m

@@ -52,7 +52,7 @@ - (void)viewDidLoad
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.title = @"冒泡详情";
-    [self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"moreBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
+    [self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"share_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
 
     //    添加myTableView
     _myTableView = ({

Coding_iOS/Controllers/TweetDetailViewController.m

@@ -10,7 +10,7 @@
 
 @interface Project : NSObject
 @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;
-@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;
+@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;
 @property (assign, nonatomic) BOOL isStaring, isWatching, isLoadingMember, isLoadingDetail;
 
 @property (strong, nonatomic) User *owner;

Coding_iOS/Images/.DS_Store

@@ -181,7 +181,6 @@ typedef NS_ENUM(NSUInteger, VerifyType){
 - (void)request_UserTagArrayWithBlock:(void (^)(id data, NSError *error))block;
 - (void)request_UpdateUserInfo_WithObj:(User *)curUser andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_PointRecords:(PointRecords *)records andBlock:(void (^)(id data, NSError *error))block;
-- (void)request_Preparereward:(NSString *)tweet_id andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_RewardToTweet:(NSString *)tweet_id encodedPassword:(NSString *)encodedPassword andBlock:(void (^)(id data, NSError *error))block;
 
 

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

@@ -1775,22 +1775,11 @@ - (void)request_PointRecords:(PointRecords *)records andBlock:(void (^)(id data,
     }];
 }
 
-- (void)request_Preparereward:(NSString *)tweet_id andBlock:(void (^)(id data, NSError *error))block{
-    NSString *path = [NSString stringWithFormat:@"api/tweet/%@/preparereward", tweet_id];
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get autoShowError:NO andBlock:^(id data, NSError *error) {
-        if (data) {
-            [MobClick event:kUmeng_Event_Request_Get label:@"准备打赏"];
-
-            data = data[@"data"];
-        }
-        block(data, error);
-    }];
-}
 - (void)request_RewardToTweet:(NSString *)tweet_id encodedPassword:(NSString *)encodedPassword andBlock:(void (^)(id data, NSError *error))block{
-    NSString *path = [NSString stringWithFormat:@"api/tweet/%@/reward", tweet_id];
-    NSDictionary *params = @{@"encodedPassword": encodedPassword};
+    NSString *path = [NSString stringWithFormat:@"api/tweet/%@/app_reward", tweet_id];
+    NSDictionary *params = encodedPassword.length > 0? @{@"encodedPassword": encodedPassword}: nil;
 
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:params withMethodType:Post autoShowError:NO andBlock:^(id data, NSError *error) {
         if (data) {
             [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"打赏成功"];
         }else{