项目内冒泡的删除权限 & 修改功能

wanghengheng · wanghengheng · commit 1b46271facbb · 2018-04-26T17:40:15.000+08:00
diff --git a/Coding_iOS/.DS_Store b/Coding_iOS/.DS_Store
diff --git a/Coding_iOS/Controllers/ProjectTweetSendViewController.h b/Coding_iOS/Controllers/ProjectTweetSendViewController.h
@@ -12,6 +12,7 @@
 
 @interface ProjectTweetSendViewController : BaseViewController
 @property (strong, nonatomic) Project *curPro;
+@property (strong, nonatomic) Tweet *curTweet;//有的话，就是编辑。。没有的话，就是添加
 @property (copy, nonatomic) void(^sentBlock)(Tweet *tweet);
 
 @end
diff --git a/Coding_iOS/Controllers/ProjectTweetSendViewController.m b/Coding_iOS/Controllers/ProjectTweetSendViewController.m
@@ -109,7 +109,7 @@ - (void)loadEditView{
         _editView.textContainerInset = UIEdgeInsetsMake(15, kPaddingLeftWidth - 5, 8, kPaddingLeftWidth - 5);
         _editView.placeholder = @"任务描述";
         
-        _editView.text = nil;
+        _editView.text = _curTweet.raw;
         [self.view addSubview:_editView];
         [_editView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.equalTo(self.view);
@@ -170,19 +170,35 @@ - (void)previewLoadMDData{
 #pragma mark nav_btn
 
 - (void)sendBtnClicked{
-    [NSObject showHUDQueryStr:@"正在发布..."];
-    @weakify(self);
-    [[Coding_NetAPIManager sharedManager] request_Tweet_DoProjectTweet_WithPro:self.curPro.id content:self.editView.text andBlock:^(id data, NSError *error) {
-        [NSObject hideHUDQuery];
-        if (data) {
-            [NSObject showHudTipStr:@"发布成功"];
-            @strongify(self);
-            if (self.sentBlock) {
-                self.sentBlock(data);
+    if (_curTweet && _curTweet.isProjectTweet) {
+        [NSObject showHUDQueryStr:@"正在修改..."];
+        @weakify(self);
+        [[Coding_NetAPIManager sharedManager] request_Tweet_EditProjectTweet:self.curTweet content:self.editView.text andBlock:^(id data, NSError *error) {
+            [NSObject hideHUDQuery];
+            if (data) {
+                [NSObject showHudTipStr:@"修改成功"];
+                @strongify(self);
+                if (self.sentBlock) {
+                    self.sentBlock(data);
+                }
+                [self.navigationController popViewControllerAnimated:YES];
             }
-            [self.navigationController popViewControllerAnimated:YES];
-        }
-    }];
+        }];
+    }else{
+        [NSObject showHUDQueryStr:@"正在发布..."];
+        @weakify(self);
+        [[Coding_NetAPIManager sharedManager] request_Tweet_DoProjectTweet_WithPro:self.curPro.id content:self.editView.text andBlock:^(id data, NSError *error) {
+            [NSObject hideHUDQuery];
+            if (data) {
+                [NSObject showHudTipStr:@"发布成功"];
+                @strongify(self);
+                if (self.sentBlock) {
+                    self.sentBlock(data);
+                }
+                [self.navigationController popViewControllerAnimated:YES];
+            }
+        }];
+    }
 }
 
 #pragma mark UIWebViewDelegate
diff --git a/Coding_iOS/Controllers/TweetDetailViewController.m b/Coding_iOS/Controllers/TweetDetailViewController.m
@@ -21,6 +21,7 @@
 #import "ReportIllegalViewController.h"
 #import "TweetSendLocationDetailViewController.h"
 #import "CodingShareView.h"
+#import "ProjectTweetSendViewController.h"
 
 @interface TweetDetailViewController ()
 @property (nonatomic, strong) UITableView *myTableView;
@@ -86,16 +87,7 @@ - (void)viewDidLoad
     self.myTableView.contentInset = contentInsets;
     self.myTableView.scrollIndicatorInsets = contentInsets;
     
-    if (!_curTweet.content
-        || (_curTweet.likes.integerValue > 0 && _curTweet.like_users.count == 0)) {
-        [self refreshTweet];
-    }else{
-        _myMsgInputView.commentOfId = _curTweet.id;
-
-        if (_curTweet.comments.integerValue > _curTweet.comment_list.count) {
-            [self refreshComments];//加载等多评论
-        }
-    }
+    [self refreshTweet];
 }
 
 - (void)viewWillDisappear:(BOOL)animated{
@@ -124,21 +116,19 @@ - (void)didReceiveMemoryWarning
 
 - (void)rightNavBtnClicked{
     if (self.curTweet.id && [self.curTweet.id isKindOfClass:[NSNumber class]]) {
-        [_myMsgInputView isAndResignFirstResponder];
-        
-//        if (_curTweet.project_id != nil) {
-//            [NSObject showHudTipStr:@"项目内冒泡，不能分享"];
-//            return;
-//        }
-        [CodingShareView showShareViewWithObj:_curTweet];
-
-//        @weakify(self);
-//        [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"举报"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
-//            if (index == 0) {
-//                @strongify(self);
-//                [self goToReport];
-//            }
-//        }] showInView:self.view];
+        if (_curTweet.isProjectTweet) {
+            ProjectTweetSendViewController *vc = [ProjectTweetSendViewController new];
+            vc.curPro = _curProject;
+            vc.curTweet = _curTweet;
+            __weak typeof(self) weakSelf = self;
+            vc.sentBlock = ^(Tweet *tweet){
+                [weakSelf refreshTweet];
+            };
+            [self.navigationController pushViewController:vc animated:YES];
+        }else{
+            [_myMsgInputView isAndResignFirstResponder];
+            [CodingShareView showShareViewWithObj:_curTweet];
+        }
     }
 }
 
@@ -176,7 +166,7 @@ - (void)messageInputView:(UIMessageInputView *)inputView heightToBottomChenged:(
 #pragma mark refresh
 - (void)refreshTweet{
     __weak typeof(self) weakSelf = self;
-    if (_curTweet.project && !_curTweet.project_id) {
+    if (_curTweet.isProjectTweet && !_curTweet.project.current_user_role_id) {
         [[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_curTweet.project andBlock:^(id data, NSError *error) {
             if (data) {
                 weakSelf.curTweet.project = data;
@@ -201,6 +191,11 @@ - (void)refreshTweet{
                 weakSelf.myMsgInputView.toUser = nil;
                 [weakSelf.myTableView reloadData];
                 [weakSelf refreshComments];
+                if (weakSelf.curTweet.isProjectTweet &&
+                    (weakSelf.curTweet.project.current_user_role_id.integerValue >= 90 ||
+                     [Login isLoginUserGlobalKey:weakSelf.curTweet.owner.global_key])) {
+                    [self.navigationItem setRightBarButtonItem:[UIBarButtonItem itemWithBtnTitle:@"编辑" target:self action:@selector(rightNavBtnClicked)] animated:YES];
+                }
             }else{
                 [weakSelf.refreshControl endRefreshing];
             }
diff --git a/Coding_iOS/Controllers/UserOrProjectTweetsViewController.m b/Coding_iOS/Controllers/UserOrProjectTweetsViewController.m
@@ -90,6 +90,10 @@ - (void)viewDidLoad
     [_myTableView addInfiniteScrollingWithActionHandler:^{
         [weakSelf refreshMore];
     }];
+}
+
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
     [self refresh];
 }
 
diff --git a/Coding_iOS/Models/Tweet.h b/Coding_iOS/Models/Tweet.h
@@ -16,7 +16,7 @@
 @class TweetImage;
 
 @interface Tweet : NSObject
-@property (readwrite, nonatomic, strong) NSString *content, *device, *location, *coord, *address;
+@property (readwrite, nonatomic, strong) NSString *content, *device, *location, *coord, *address, *raw;
 @property (readwrite, nonatomic, strong) NSNumber *liked, *rewarded, *activity_id, *id, *comments, *likes, *rewards;
 @property (readwrite, nonatomic, strong) NSDate *created_at, *sort_time;
 @property (readwrite, nonatomic, strong) User *owner;
diff --git a/Coding_iOS/Models/Tweets.m b/Coding_iOS/Models/Tweets.m
@@ -90,6 +90,9 @@ - (NSDictionary *)toParams{
 }
 
 - (void)configWithTweets:(NSArray *)responseA{
+    if (self.curPro) {
+        [responseA setValue:self.curPro forKey:@"project"];
+    }
     if (responseA && [responseA count] > 0) {
         self.canLoadMore = (_tweetType != TweetTypePublicHot);
         Tweet *lastTweet = [responseA lastObject];
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.h b/Coding_iOS/Util/Manager/Coding_NetAPIManager.h
@@ -237,6 +237,7 @@ typedef NS_ENUM(NSInteger, PurposeType) {
 - (void)request_Tweet_DoComment_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Tweet_DoTweet_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Tweet_DoProjectTweet_WithPro:(NSNumber *)pro_id content:(NSString *)content andBlock:(void (^)(id data, NSError *error))block;
+- (void)request_Tweet_EditProjectTweet:(Tweet *)tweet content:(NSString *)content andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Tweet_Likers_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Tweet_LikesAndRewards_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Tweet_Comments_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block;
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -2456,6 +2456,22 @@ - (void)request_Tweet_DoProjectTweet_WithPro:(NSNumber *)pro_id content:(NSStrin
     }];
 }
 
+- (void)request_Tweet_EditProjectTweet:(Tweet *)tweet content:(NSString *)content andBlock:(void (^)(id data, NSError *error))block{
+    NSString *path = [NSString stringWithFormat:@"api/project/%@/tweet/%@", tweet.project_id, tweet.id];
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:@{@"raw": content} withMethodType:Put andBlock:^(id data, NSError *error) {
+        if (data) {
+            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"冒泡_修改_项目内冒泡"];
+            
+            id resultData = [data valueForKeyPath:@"data"];
+            Tweet *result = [NSObject objectOfClass:@"Tweet" fromJSON:resultData];
+            block(result, nil);
+        }else{
+            [NSObject showStatusBarError:error];
+            block(nil, error);
+        }
+    }];
+}
+
 - (void)request_Tweet_Likers_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block{
     tweet.isLoading = YES;
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:[tweet toLikersPath] withParams:[tweet toLikersParams] withMethodType:Get andBlock:^(id data, NSError *error) {
@@ -2530,7 +2546,7 @@ - (void)request_TweetComment_Delete_WithTweet:(Tweet *)tweet andComment:(Comment
 }
 
 - (void)request_Tweet_Detail_WithObj:(Tweet *)tweet andBlock:(void (^)(id data, NSError *error))block{
-    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:[tweet toDetailPath] withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:[tweet toDetailPath] withParams:@{@"withRaw": @YES} withMethodType:Get andBlock:^(id data, NSError *error) {
         if (data) {
             [MobClick event:kUmeng_Event_Request_Get label:@"冒泡_详情"];
 
diff --git a/Coding_iOS/Views/Cell/TweetCell.m b/Coding_iOS/Views/Cell/TweetCell.m
@@ -228,7 +228,7 @@ - (void)setTweet:(Tweet *)tweet needTopView:(BOOL)needTopView{
     self.likeBtn.hidden = self.rewardBtn.hidden = [_tweet isProjectTweet];
     
     _like_reward_users = [_tweet like_reward_users];
-    BOOL isMineTweet = [_tweet.owner.global_key isEqualToString:[Login curLoginUser].global_key];
+    BOOL isMineTweet = [_tweet.owner.global_key isEqualToString:[Login curLoginUser].global_key] || tweet.project.current_user_role_id.integerValue >= 90;
 
     self.topView.hidden = !_needTopView;
     //owner头像
diff --git a/Coding_iOS/Views/Cell/TweetDetailCell.m b/Coding_iOS/Views/Cell/TweetDetailCell.m
@@ -240,7 +240,7 @@ - (void)setTweet:(Tweet *)tweet{
     [self.rewardBtn setTitle:_tweet.rewards.stringValue forState:UIControlStateNormal];
     [self.commentBtn setTitle:_tweet.comments.stringValue forState:UIControlStateNormal];
 
-    BOOL isMineTweet = [_tweet.owner.global_key isEqualToString:[Login curLoginUser].global_key];
+    BOOL isMineTweet = [_tweet.owner.global_key isEqualToString:[Login curLoginUser].global_key] || tweet.project.current_user_role_id.integerValue >= 90;
     if (isMineTweet) {
         [self.deleteBtn setY:curBottomY];
         self.deleteBtn.hidden = NO;

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,9 @@ - (NSDictionary *)toParams{`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`- (void)configWithTweets:(NSArray *)responseA{`
	`93`	`+ if (self.curPro) {`
	`94`	`+ [responseA setValue:self.curPro forKey:@"project"];`
	`95`	`+ }`
`93`	`96`	`if (responseA && [responseA count] > 0) {`
`94`	`97`	`self.canLoadMore = (_tweetType != TweetTypePublicHot);`
`95`	`98`	`Tweet *lastTweet = [responseA lastObject];`