家族超级管理员搜索设置

xplan-ios/Main/Mine/View/XPMineViewController.m

@@ -21,6 +21,7 @@
 #import "XPMineItemModel.h"
 #import "UserInfoModel.h"
 #import "XPMineVisitorUnReadModel.h"
+#import "ClanDetailInfoModel.h"
 ///P
 #import "XPMineProtocol.h"
 #import "XPMinePresent.h"
@@ -46,6 +47,7 @@
 #import "XPMineVisitorViewController.h"
 #import "XPMineFansTeamViewController.h"
 #import "XPMineClanViewController.h"
+#import "XPMineGuildViewController.h"
 
 
 @interface XPMineViewController ()<UITableViewDelegate, UITableViewDataSource, XPMineProtocol, XPMineHeadItemTableViewCellDelegate, XPMineHeadViewDelegate>
@@ -54,7 +56,7 @@
 
 @property (nonatomic,strong) UITableView *tableView;
 ///数据源
-@property (nonatomic,strong) NSArray<XPMineItemModel *> *datasource;
+@property (nonatomic,strong) NSMutableArray<XPMineItemModel *> *datasource;
 ///赛事模块的
 @property (nonatomic,strong) NSArray<XPMineItemModel *> *matchItemArray;
 ///卡片item
@@ -63,11 +65,14 @@
 @property (nonatomic,strong) XPMineHeadView *headView;
 ///设置
 @property (nonatomic,strong) UIButton *settingButton;
-///
+///用户信息
 @property (nonatomic,strong) UserInfoModel *userInfo;
 
 @property (nonatomic, strong) XPMineSkillTipView *skillTipView;
-
+///家族信息
+@property (nonatomic,strong) ClanDetailInfoModel *clanInfo;
+///我的公会
+@property (nonatomic,strong) XPMineItemModel *guildItemModel;
 @end
 
 @implementation XPMineViewController
@@ -102,6 +107,7 @@
 - (void)viewWillAppear:(BOOL)animated {
 	[super viewWillAppear:animated];
 	[self.presenter getUserInfo];
+	[self.presenter getClanDetailInfo];
 }
 
 #pragma mark - Response
@@ -272,9 +278,17 @@
             break;
 		case XPMineItemType_My_Guild:
 		{
-			XPMineClanViewController * clanVC = [[XPMineClanViewController alloc] init];
-			clanVC.uid = [NSString stringWithFormat:@"%ld", self.userInfo.uid];
-			[self.navigationController pushViewController:clanVC animated:YES];
+			if (self.clanInfo.clan.elderUid.length > 0) {
+				XPMineClanViewController * clanVC = [[XPMineClanViewController alloc] init];
+				clanVC.uid = [NSString stringWithFormat:@"%ld", self.userInfo.uid];
+				[self.navigationController pushViewController:clanVC animated:YES];
+			} else if(self.clanInfo.hall.hallId.length > 0) {
+				XPMineGuildViewController * guildVC = [[XPMineGuildViewController alloc] init];
+				guildVC.ownerUid = self.clanInfo.hall.ownerUid;
+				guildVC.guildId = self.clanInfo.hall.hallId;
+				[self.navigationController pushViewController:guildVC animated:YES];
+			}
+			
 		}
 			break;
 		default:
@@ -380,7 +394,8 @@
 
 #pragma mark - XPMineProtocol
 - (void)onGetNormalItemsSuccess:(NSArray<XPMineItemModel *> *)normalItems {
-	self.datasource = normalItems;
+	[self.datasource removeAllObjects];
+	[self.datasource addObjectsFromArray:normalItems];
 	[self.tableView reloadData];
 }
 
@@ -395,6 +410,20 @@
     [self.tableView reloadData];
 }
 
+- (void)onGetClanDetailInfoSuccess:(ClanDetailInfoModel *)clanInfo {
+	self.clanInfo = clanInfo;
+	if (self.clanInfo.clan.elderUid.length > 0 || self.clanInfo.hall.hallId) {
+		if (![self.datasource containsObject:self.guildItemModel]) {
+			[self.datasource insertObject:self.guildItemModel atIndex:3];
+		}
+	} else {
+		if ([self.datasource containsObject:self.guildItemModel]) {
+			[self.datasource removeObject:self.guildItemModel];
+		}
+	}
+	[self.tableView reloadData];
+}
+
 #pragma mark - XPMineHeadItemTableViewCellDelegate
 - (void)xPMineHeadItemTableViewCell:(XPMineHeadItemTableViewCell *)cell didSelectItem:(XPMineItemModel *)item {
     [self pushViewControllerWithType:item.type];
@@ -468,4 +497,22 @@
     return _skillTipView;
 }
 
+- (XPMineItemModel *)guildItemModel {
+	if (!_guildItemModel) {
+		XPMineItemModel * guildItem = [[XPMineItemModel alloc] init];
+		guildItem.itemName = @"我的工会";
+		guildItem.itemImageName = @"mine_normal_my_guild";
+		guildItem.type = XPMineItemType_My_Guild;
+		_guildItemModel = guildItem;
+	}
+	return _guildItemModel;
+}
+
+- (NSMutableArray<XPMineItemModel *> *)datasource {
+	if (!_datasource) {
+		_datasource = [NSMutableArray array];
+	}
+	return _datasource;
+}
+
 @end