修复我的话题Bug

porcellio · porcellio · commit 13636c16728e · 2015-07-31T22:55:50.000+08:00
diff --git a/Coding_iOS/Controllers/Topic/CSMyTopicVC.m b/Coding_iOS/Controllers/Topic/CSMyTopicVC.m
@@ -29,8 +29,16 @@ - (void)viewDidLoad {
     
     self.view.backgroundColor = [UIColor whiteColor];
     
-    self.segmentItems = @[@"&#25105;&#20851;&#27880;&#30340;", @"&#25105;&#21442;&#19982;&#30340;"];
-    self.title = @"&#25105;&#30340;&#35805;&#39064;";
+    if([self isMe]) {
+    
+        self.segmentItems = @[@"&#25105;&#20851;&#27880;&#30340;", @"&#25105;&#21442;&#19982;&#30340;"];
+        self.title = @"&#25105;&#30340;&#35805;&#39064;";
+    }else {
+    
+        self.segmentItems = @[@"Ta&#20851;&#27880;&#30340;", @"Ta&#21442;&#19982;&#30340;"];
+        self.title = @"Ta&#30340;&#35805;&#39064;";
+    }
+
     _oldSelectedIndex = 0;
     
     //&#28155;&#21152;myCarousel
@@ -64,6 +72,10 @@ - (void)viewDidLoad {
 
 }
 
+- (BOOL)isMe{
+    return [_curUser.global_key isEqualToString:[Login curLoginUser].global_key];
+}
+
 #pragma mark iCarousel M
 - (NSUInteger)numberOfItemsInCarousel:(iCarousel *)carousel{
     return _segmentItems.count;
@@ -76,7 +88,7 @@ - (UIView *)carousel:(iCarousel *)carousel viewForItemAtIndex:(NSUInteger)index
     }else{
         __weak CSMyTopicVC *weakSelf = self;
         CSMyTopicsType type = (index == 0 ? CSMyTopicsTypeWatched : CSMyTopicsTypeJoined);
-        listView = [[CSTopiclistView alloc] initWithFrame:carousel.bounds type:type block:^(NSDictionary *topic) {
+        listView = [[CSTopiclistView alloc] initWithFrame:carousel.bounds globalKey:_curUser.global_key type:type block:^(NSDictionary *topic) {
             [weakSelf goToTopic:topic];
         }];
     }
diff --git a/Coding_iOS/Controllers/Topic/CSTopiclistView.h b/Coding_iOS/Controllers/Topic/CSTopiclistView.h
@@ -17,7 +17,7 @@ typedef enum {
 
 @interface CSTopiclistView : UIView<UITableViewDataSource, UITableViewDelegate>
 
-- (id)initWithFrame:(CGRect)frame type:(CSMyTopicsType )type block:(TopicListViewBlock)block;
+- (id)initWithFrame:(CGRect)frame globalKey:(NSString *)key type:(CSMyTopicsType )type block:(TopicListViewBlock)block;
 - (void)setTopics:(id )topics;
 - (void)refreshUI;
 - (void)refreshToQueryData;
diff --git a/Coding_iOS/Controllers/Topic/CSTopiclistView.m b/Coding_iOS/Controllers/Topic/CSTopiclistView.m
@@ -28,6 +28,7 @@ @interface CSTopiclistView()<SWTableViewCellDelegate>
 
 //&#26681;&#25454;&#19981;&#21516;&#30340;type&#65292;&#36208;&#19981;&#21516;&#32780;&#25968;&#25454;&#26356;&#26032;&#36923;&#36753;,&#22806;&#30028;&#19981;&#20256;&#20540;&#36827;&#26469;
 @property (nonatomic,assign)CSMyTopicsType type;
+@property (nonatomic, strong) NSString *globalKey;
 
 @property (nonatomic,assign)BOOL isLodding;
 @property (nonatomic, assign) BOOL hasMore;
@@ -37,11 +38,12 @@ @interface CSTopiclistView()<SWTableViewCellDelegate>
 
 @implementation CSTopiclistView
 
-- (id)initWithFrame:(CGRect)frame type:(CSMyTopicsType )type block:(TopicListViewBlock)block {
+- (id)initWithFrame:(CGRect)frame globalKey:(NSString *)key type:(CSMyTopicsType )type block:(TopicListViewBlock)block {
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
         _dataList = [[NSMutableArray alloc] init];
+        _globalKey = [key copy];
         _type = type;
         _block = block;
         _myTableView = ({
@@ -138,12 +140,12 @@ - (void)sendRequest{
     __weak typeof(self) weakSelf = self;
     
     if (_type == CSMyTopicsTypeWatched) {
-        [[Coding_NetAPIManager sharedManager] request_WatchedTopicsWithUserGK:[Login curLoginUser].global_key page:self.curPage block:^(id data, BOOL hasMoreData, NSError *error) {
+        [[Coding_NetAPIManager sharedManager] request_WatchedTopicsWithUserGK:weakSelf.globalKey page:weakSelf.curPage block:^(id data, BOOL hasMoreData, NSError *error) {
             weakSelf.hasMore = hasMoreData;
             [weakSelf doAfterGotResultWithData:data error:error];
         }];
     }else{
-        [[Coding_NetAPIManager sharedManager] request_JoinedTopicsWithUserGK:[Login curLoginUser].global_key page:self.curPage block:^(id data, BOOL hasMoreData, NSError *error) {
+        [[Coding_NetAPIManager sharedManager] request_JoinedTopicsWithUserGK:weakSelf.globalKey page:weakSelf.curPage block:^(id data, BOOL hasMoreData, NSError *error) {
             weakSelf.hasMore = hasMoreData;
             [weakSelf doAfterGotResultWithData:data error:error];
         }];
