wenbegn
diff --git a/Collapse file
‎Coding_iOS/Controllers/Topic/CSMyTopicVC.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSMyTopicVC.m
+15-3Lines changed: 15 additions & 3 deletions b/Collapse file
‎Coding_iOS/Controllers/Topic/CSMyTopicVC.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSMyTopicVC.m
+15-3Lines changed: 15 additions & 3 deletions
diff --git a/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopiclistView.h‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopiclistView.h
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopiclistView.h‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopiclistView.h
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopiclistView.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopiclistView.m
+5-3Lines changed: 5 additions & 3 deletions b/Collapse file
‎Coding_iOS/Controllers/Topic/CSTopiclistView.m‎
Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSTopiclistView.m
+5-3Lines changed: 5 additions & 3 deletions
@@ -29,8 +29,16 @@ - (void)viewDidLoad {
 
     self.view.backgroundColor = [UIColor whiteColor];
 
-    self.segmentItems = @[@"我关注的", @"我参与的"];
-    self.title = @"我的话题";
+    if([self isMe]) {
+    
+        self.segmentItems = @[@"我关注的", @"我参与的"];
+        self.title = @"我的话题";
+    }else {
+    
+        self.segmentItems = @[@"Ta关注的", @"Ta参与的"];
+        self.title = @"Ta的话题";
+    }
+
     _oldSelectedIndex = 0;
 
     //添加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];
         }];
     }
 
@@ -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;
 
@@ -28,6 +28,7 @@ @interface CSTopiclistView()<SWTableViewCellDelegate>
 
 //根据不同的type，走不同而数据更新逻辑,外界不传值进来
 @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];
         }];