diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index 45be7160..2568cc73 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -14,6 +14,7 @@ 14C1F15429B86DF0000A960F /* XPMineMoreTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C1F15329B86DF0000A960F /* XPMineMoreTableViewCell.m */; }; 14C1F15729B874FB000A960F /* XPMineMoreItemTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C1F15629B874FB000A960F /* XPMineMoreItemTableViewCell.m */; }; 14C1F15A29B876EC000A960F /* XPMineMoreItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C1F15929B876EC000A960F /* XPMineMoreItemModel.m */; }; + 14C1F15D29B88DEE000A960F /* XPMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C1F15C29B88DEE000A960F /* XPMessageViewController.m */; }; 14EDBBAA29B5935F001D3E16 /* XPFindNewFriendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBA929B5935F001D3E16 /* XPFindNewFriendViewController.m */; }; 14EDBBB329B5F7B2001D3E16 /* XPButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBB229B5F7B2001D3E16 /* XPButton.m */; }; 14EDBBB629B600DC001D3E16 /* XPNewMomentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EDBBB529B600DC001D3E16 /* XPNewMomentsViewController.m */; }; @@ -1303,6 +1304,8 @@ 14C1F15629B874FB000A960F /* XPMineMoreItemTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMoreItemTableViewCell.m; sourceTree = ""; }; 14C1F15829B876EC000A960F /* XPMineMoreItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineMoreItemModel.h; sourceTree = ""; }; 14C1F15929B876EC000A960F /* XPMineMoreItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMoreItemModel.m; sourceTree = ""; }; + 14C1F15B29B88DEE000A960F /* XPMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMessageViewController.h; sourceTree = ""; }; + 14C1F15C29B88DEE000A960F /* XPMessageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMessageViewController.m; sourceTree = ""; }; 14EDBBA829B5935F001D3E16 /* XPFindNewFriendViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPFindNewFriendViewController.h; sourceTree = ""; }; 14EDBBA929B5935F001D3E16 /* XPFindNewFriendViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPFindNewFriendViewController.m; sourceTree = ""; }; 14EDBBB129B5F7B2001D3E16 /* XPButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPButton.h; sourceTree = ""; }; @@ -4261,6 +4264,8 @@ 18A61BE7274F9CF000A09A54 /* SessionListViewController.m */, 18EE3FDD2750C1F700A452BF /* SessionListCell.h */, 18EE3FDE2750C1F700A452BF /* SessionListCell.m */, + 14C1F15B29B88DEE000A960F /* XPMessageViewController.h */, + 14C1F15C29B88DEE000A960F /* XPMessageViewController.m */, ); path = SessionList; sourceTree = ""; @@ -10250,6 +10255,7 @@ E81AF32527F1D5B8003B9E43 /* XPRoomPKProgressView.m in Sources */, E8DEC99527648FA50078CB70 /* ClientConfig.m in Sources */, 9B6E8577281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m in Sources */, + 14C1F15D29B88DEE000A960F /* XPMessageViewController.m in Sources */, E8E859D628264C2300EE4857 /* DispatchQueueLogFormatter.m in Sources */, E880B3A6278BD69900A83B0D /* XPAcrossRoomPKTableViewCell.m in Sources */, E8EEB90926FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.m in Sources */, diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@2x.png index 94c6ee84..1ce3704a 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@3x.png index ea897951..d665654a 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_activity.imageset/session_list_head_activity@3x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@2x.png index 733f925b..8c3589c6 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@3x.png index 5eedede6..2bfd0d8f 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_mengxin.imageset/session_list_head_mengxin@3x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@2x.png index 730124aa..144102fb 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@3x.png index 358123bd..ebb10b35 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_office.imageset/session_list_head_office@3x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@2x.png index 72e391c7..15bdaef6 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@3x.png index 1070398f..814cd40f 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/SessionListHead/session_list_head_subscribe.imageset/session_list_head_subscribe@3x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/sessionList_clear.imageset/sessionList_clear@2x.png b/xplan-ios/Assets.xcassets/SessionMessage/sessionList_clear.imageset/sessionList_clear@2x.png index 5d310608..e1711e84 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/sessionList_clear.imageset/sessionList_clear@2x.png and b/xplan-ios/Assets.xcassets/SessionMessage/sessionList_clear.imageset/sessionList_clear@2x.png differ diff --git a/xplan-ios/Assets.xcassets/SessionMessage/sessionList_clear.imageset/sessionList_clear@3x.png b/xplan-ios/Assets.xcassets/SessionMessage/sessionList_clear.imageset/sessionList_clear@3x.png index cf8076e7..14425a29 100644 Binary files a/xplan-ios/Assets.xcassets/SessionMessage/sessionList_clear.imageset/sessionList_clear@3x.png and b/xplan-ios/Assets.xcassets/SessionMessage/sessionList_clear.imageset/sessionList_clear@3x.png differ diff --git a/xplan-ios/Main/Message/View/SessionList/SessionListViewController.h b/xplan-ios/Main/Message/View/SessionList/SessionListViewController.h index 8cf075cd..34d853c7 100644 --- a/xplan-ios/Main/Message/View/SessionList/SessionListViewController.h +++ b/xplan-ios/Main/Message/View/SessionList/SessionListViewController.h @@ -24,6 +24,8 @@ typedef NS_ENUM(NSUInteger, SessionListOpenType) { /** 控制器 因为房间内聊天没有控制器去push 或者做其他的操作*/ @property (nonatomic, weak) UIViewController * mainController; +/// 全部已读 +- (void)allRead; @end diff --git a/xplan-ios/Main/Message/View/SessionList/SessionListViewController.m b/xplan-ios/Main/Message/View/SessionList/SessionListViewController.m index 4c258c43..1b7ef5bb 100644 --- a/xplan-ios/Main/Message/View/SessionList/SessionListViewController.m +++ b/xplan-ios/Main/Message/View/SessionList/SessionListViewController.m @@ -29,11 +29,6 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey"; @interface SessionListViewController () -@property (nonatomic,strong) UIView *customNavigationBar; - -@property (nonatomic,strong) UILabel *titleLabel; - -@property (nonatomic, strong) UIButton *allReadButton; @property (nonatomic, strong) XPSessionListHeadView *headView; /** * 会话列表 @@ -139,29 +134,18 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey"; } uid:uid]; } - (void)initViews { - self.title = @"消息"; if (self.openType == SessionListOpenTypeDefault) { - [self.customNavigationBar addSubview:self.titleLabel]; - [self.view addSubview:self.customNavigationBar]; - [self.customNavigationBar addSubview:self.allReadButton]; [self.view addSubview:self.headView]; + self.view.backgroundColor = UIColor.clearColor; } [self.view addSubview:self.sessionListView]; } - (void)initLayout { if (self.openType == SessionListOpenTypeDefault) { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.customNavigationBar); - }]; - [self.allReadButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-16); - make.width.height.mas_equalTo(30); - make.centerY.mas_equalTo(self.customNavigationBar); - }]; [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.mas_equalTo(0); - make.top.mas_equalTo(self.customNavigationBar.mas_bottom).mas_offset(8); + make.top.mas_equalTo(8); }]; } @@ -413,7 +397,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey"; } #pragma mark - action -- (void)allReadButtonClick:(UIButton *)sender { +- (void)allRead { NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount; if (count<1) { [self showErrorToast:@"暂无未读消息需要清理"]; @@ -435,26 +419,6 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey"; }]; } - -- (UIView *)customNavigationBar { - if (!_customNavigationBar) { - CGRect frame = CGRectMake(0, kStatusBarHeight, KScreenWidth, 44); - _customNavigationBar = [[UIView alloc]initWithFrame:frame]; - } - return _customNavigationBar; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] initWithFrame:CGRectZero]; - _titleLabel.backgroundColor = [UIColor clearColor]; - _titleLabel.font = [UIFont systemFontOfSize:18.f weight:UIFontWeightMedium]; - _titleLabel.textColor = ThemeColor.mainTextColor; - _titleLabel.text = @"消息"; - } - return _titleLabel; -} - - (UITableView *)sessionListView { if (!_sessionListView) { _sessionListView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; @@ -474,15 +438,6 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey"; return _recentSessions; } -- (UIButton *)allReadButton { - if (!_allReadButton) { - _allReadButton = [[UIButton alloc] init]; - [_allReadButton setImage:[UIImage imageNamed:@"sessionList_clear"] forState:UIControlStateNormal]; - [_allReadButton addTarget:self action:@selector(allReadButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _allReadButton; -} - - (XPTeenagerHomeView *)teenagerView { if (!_teenagerView) { _teenagerView = [[XPTeenagerHomeView alloc] init]; diff --git a/xplan-ios/Main/Message/View/SessionList/XPMessageViewController.h b/xplan-ios/Main/Message/View/SessionList/XPMessageViewController.h new file mode 100644 index 00000000..da899367 --- /dev/null +++ b/xplan-ios/Main/Message/View/SessionList/XPMessageViewController.h @@ -0,0 +1,16 @@ +// +// XPMessageViewController.h +// xplan-ios +// +// Created by XY on 2023/3/8. +// + +#import "MvpViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XPMessageViewController : MvpViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Message/View/SessionList/XPMessageViewController.m b/xplan-ios/Main/Message/View/SessionList/XPMessageViewController.m new file mode 100644 index 00000000..25b09abb --- /dev/null +++ b/xplan-ios/Main/Message/View/SessionList/XPMessageViewController.m @@ -0,0 +1,174 @@ +// +// XPMessageViewController.m +// xplan-ios +// +// Created by XY on 2023/3/8. +// + +#import "XPMessageViewController.h" +///Third +#import +#import +///Tool +#import "ThemeColor.h" +#import "XPMacro.h" +#import "UIImage+Utils.h" +///VC +#import "SessionListViewController.h" +#import "XPMineFriendViewController.h" + +@interface XPMessageViewController () + +@property (nonatomic,strong) UIImageView *topGradientImageView; +///分页控制器 +@property (nonatomic, strong) JXCategoryTitleView *titleView; +@property (nonatomic, strong) JXCategoryListContainerView *listContainerView; +@property (nonatomic, strong) NSArray *titles; +/// 全部已读 +@property (nonatomic, strong) UIButton *allReadButton; + +@property (nonatomic, strong) SessionListViewController *sessionVC; +@property (nonatomic, strong) XPMineFriendViewController *friendVC; + +@end + +@implementation XPMessageViewController + +- (BOOL)isHiddenNavBar { + return YES; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + [self initSubViews]; + [self initSubViewConstraints]; +} + +#pragma mark - Private Method +- (void)initSubViews { + [self.view addSubview:self.topGradientImageView]; + [self.view addSubview:self.titleView]; + [self.view addSubview:self.allReadButton]; + [self.view addSubview:self.listContainerView]; +} + +- (void)initSubViewConstraints { + [self.topGradientImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.right.mas_equalTo(0); + make.height.mas_equalTo(125); + }]; + [self.allReadButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_equalTo(-15); + make.width.height.mas_equalTo(20); + make.centerY.mas_equalTo(self.titleView); + }]; + [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(kStatusBarHeight); + make.left.mas_equalTo(5); + make.right.mas_equalTo(self.allReadButton.mas_left).offset(10); + make.height.mas_equalTo(50); + }]; + [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(self.titleView.mas_bottom); + make.left.right.mas_equalTo(0); + make.bottom.mas_equalTo(0); + }]; +} + +#pragma mark - action +- (void)allReadButtonClick:(UIButton *)sender { + [self.sessionVC allRead]; +} + +#pragma mark - JXCategoryListContainerViewDelegate + +// 返回列表的数量 +- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { + return self.titles.count; +} + +// 返回各个列表菜单下的实例，该实例需要遵守并实现 协议 +- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { + if (index == 0) { + return self.sessionVC; + }else{ + return self.friendVC; + } +} + +#pragma mark - Getters And Setters + +- (UIImageView *)topGradientImageView { + if (!_topGradientImageView) { + _topGradientImageView = [[UIImageView alloc] init]; + _topGradientImageView.image = [UIImage gradientColorImageFromColors:@[[ThemeColor colorWithHexString:@"#DCF6FF"], [ThemeColor colorWithHexString:@"#F8F8FA"]] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(KScreenWidth, 125)]; + _topGradientImageView.contentMode = UIViewContentModeScaleToFill; + } + return _topGradientImageView; +} + +- (JXCategoryTitleView *)titleView { + if (!_titleView) { + _titleView = [[JXCategoryTitleView alloc] init]; + _titleView.delegate = self; + _titleView.backgroundColor = [UIColor clearColor]; + _titleView.titleColor = [ThemeColor textThirdColor]; + _titleView.titleSelectedColor = [ThemeColor mainTextColor]; + _titleView.titleFont = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; + _titleView.titleSelectedFont = [UIFont systemFontOfSize:22 weight:UIFontWeightSemibold]; + _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; + _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; + _titleView.defaultSelectedIndex = 0; + _titleView.averageCellSpacingEnabled = NO; + _titleView.titles = self.titles; + _titleView.cellSpacing = 20; + _titleView.listContainer = self.listContainerView; + + JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; + lineView.indicatorImageViewSize = CGSizeMake(13, 4); + lineView.verticalMargin = 5; + lineView.indicatorImageView.image = [UIImage imageNamed:@"home_segment_indicator"]; + _titleView.indicators = @[lineView]; + } + return _titleView; +} + +// 列表容器视图 +- (JXCategoryListContainerView *)listContainerView { + if (!_listContainerView) { + _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; + } + return _listContainerView; +} + +- (UIButton *)allReadButton { + if (!_allReadButton) { + _allReadButton = [[UIButton alloc] init]; + [_allReadButton setImage:[UIImage imageNamed:@"sessionList_clear"] forState:UIControlStateNormal]; + [_allReadButton addTarget:self action:@selector(allReadButtonClick:) forControlEvents:UIControlEventTouchUpInside]; + } + return _allReadButton; +} + +- (NSArray *)titles { + if (!_titles) { + _titles = @[@"消息", @"好友"]; + } + return _titles; +} + +- (SessionListViewController *)sessionVC { + if (!_sessionVC) { + _sessionVC = [[SessionListViewController alloc] init]; + } + return _sessionVC; +} + +- (XPMineFriendViewController *)friendVC { + if (!_friendVC) { + _friendVC = [[XPMineFriendViewController alloc] init]; + } + return _friendVC; +} + +@end diff --git a/xplan-ios/Main/Message/View/SessionListHeadView/XPSessionListHeadView.m b/xplan-ios/Main/Message/View/SessionListHeadView/XPSessionListHeadView.m index d7d41e30..fcd18c63 100644 --- a/xplan-ios/Main/Message/View/SessionListHeadView/XPSessionListHeadView.m +++ b/xplan-ios/Main/Message/View/SessionListHeadView/XPSessionListHeadView.m @@ -62,8 +62,9 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; subscribeItem.type = XPSessionListHeadItemType_Subscribe; [self.funtionArray addObject:officeItem]; - [self.funtionArray addObject:activityItem]; [self.funtionArray addObject:subscribeItem]; + [self.funtionArray addObject:activityItem]; + } - (void)initView { @@ -89,7 +90,7 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; }]; [self.toolStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(75); + make.height.mas_equalTo(90); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/xplan-ios/Main/Mine/View/Friend/XPMineFriendViewController.m b/xplan-ios/Main/Mine/View/Friend/XPMineFriendViewController.m index fbbdb103..8072732a 100644 --- a/xplan-ios/Main/Mine/View/Friend/XPMineFriendViewController.m +++ b/xplan-ios/Main/Mine/View/Friend/XPMineFriendViewController.m @@ -42,7 +42,7 @@ } - (BOOL)isHiddenNavBar { - return self.type == ContactUseingType_In_Room ? YES : NO; + return (self.type == ContactUseingType_In_Room || self.type == ContactUseingType_Normal) ? YES : NO; } - (void)viewDidLoad { @@ -61,6 +61,7 @@ } #pragma mark - Private Method - (void)initSubViews { + self.view.backgroundColor = UIColor.clearColor; [self.view addSubview:self.tableView]; } diff --git a/xplan-ios/Main/Tabbar/View/TabbarViewController.m b/xplan-ios/Main/Tabbar/View/TabbarViewController.m index 97203e72..933e4ef3 100644 --- a/xplan-ios/Main/Tabbar/View/TabbarViewController.m +++ b/xplan-ios/Main/Tabbar/View/TabbarViewController.m @@ -78,6 +78,7 @@ #import "XPNewHomeViewController.h" #import "XPNewMomentsViewController.h" #import "XPPartyViewController.h" +#import "XPMessageViewController.h" ///Present #import "MainPresenter.h" #import "MainProtocol.h" @@ -522,7 +523,8 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; #else [fvcGame setName:@"/" uniqueId:nil params:nil]; #endif - msg = [[SessionListViewController alloc] init]; +// msg = [[SessionListViewController alloc] init]; + msg = [[XPMessageViewController alloc] init]; me = [[XPMineViewController alloc] init]; party = [[XPPartyViewController alloc]init]; // home = [[XPHomeViewController alloc] init]; @@ -531,7 +533,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; monents = [[XPNewMomentsViewController alloc] init]; } else { party = [[BaseViewController alloc]init]; - msg = [[SessionListViewController alloc]init]; + msg = [[XPMessageViewController alloc]init]; me = [[BaseViewController alloc]init]; home = [[BaseViewController alloc] init]; monents = [[BaseViewController alloc] init];