diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 96f2e0c..efc808c 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -754,7 +754,7 @@ CODE_SIGN_ENTITLEMENTS = QXLive/QXLive.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = 8798G5VMH9; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -793,7 +793,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = 1.1.14; + MARKETING_VERSION = 1.1.15; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -820,7 +820,7 @@ CODE_SIGN_ENTITLEMENTS = QXLive/QXLive.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = 8798G5VMH9; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -859,7 +859,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = 1.1.14; + MARKETING_VERSION = 1.1.15; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/QXLive/Base/QXAppStartViewController.m b/QXLive/Base/QXAppStartViewController.m index 710bafd..c27cc09 100644 --- a/QXLive/Base/QXAppStartViewController.m +++ b/QXLive/Base/QXAppStartViewController.m @@ -36,54 +36,109 @@ -(void)appStartNetWork{ [self getAppTheme]; } - +/** + @property (nonatomic,strong)NSString *icon_sy_select; + @property (nonatomic,strong)NSString *icon_sy_notselect; + @property (nonatomic,strong)NSString *icon_dt_select; + @property (nonatomic,strong)NSString *icon_dt_notselect; + @property (nonatomic,strong)NSString *icon_xx_select; + @property (nonatomic,strong)NSString *icon_xx_notselect; + @property (nonatomic,strong)NSString *icon_wd_select; + @property (nonatomic,strong)NSString *icon_wd_notselect; + */ -(void)getAppTheme{ NSString *themeUrl = [NSString stringWithFormat:@"%@%@",ServerUrl,QXAppTheme]; [[QXRequset shareInstance] getWithUrl:themeUrl parameters:@{} needCache:NO success:^(id responseObject) { [QXConfig defaultConfig]; - QXThemeModel *model = [QXThemeModel yy_modelWithJSON:responseObject[@"data"]]; - if (model.theme_color && model.theme_color.length > 0) { - QXConfig.shared.themeColor = [UIColor colorWithHexString:model.theme_color]; - } -// QXConfig.shared.themeColor = [UIColor colorWithHexString:@"#ff0000"]; - if (model.btn_text_color && model.btn_text_color.length > 0) { - QXConfig.shared.btnTextColor = [UIColor colorWithHexString:model.btn_text_color]; - } - if (model.app_bg && model.app_bg.length > 0) { - QXConfig.shared.backgroundImage = model.app_bg; - } QXTabbarModel *tabbarIndex1 = QXConfig.shared.tabbarArray[0]; QXTabbarModel *tabbarIndex2 = QXConfig.shared.tabbarArray[1]; QXTabbarModel *tabbarIndex3 = QXConfig.shared.tabbarArray[2]; QXTabbarModel *tabbarIndex4 = QXConfig.shared.tabbarArray[3]; - - if (model.home_nor && model.home_nor.length > 0) { - tabbarIndex1.normalImage = model.home_nor; + id object = responseObject[@"data"]; + NSInteger is_open = 0; + if ([object isKindOfClass:[NSDictionary class]]) { + is_open = [responseObject[@"data"][@"is_open"] integerValue]; } - if (model.home_sel && model.home_sel.length > 0) { - tabbarIndex1.selectedImage = model.home_sel; - } - - if (model.find_nor && model.find_nor.length > 0) { - tabbarIndex2.normalImage = model.find_nor; - } - if (model.find_sel && model.find_sel.length > 0) { - tabbarIndex2.selectedImage = model.find_sel; - } - - if (model.msg_nor && model.msg_nor.length > 0) { - tabbarIndex3.normalImage = model.msg_nor; - } - if (model.msg_sel && model.msg_sel.length > 0) { - tabbarIndex3.selectedImage = model.msg_sel; - } - - if (model.mine_nor && model.mine_nor.length > 0) { - tabbarIndex4.normalImage = model.mine_nor; - } - if (model.mine_sel && model.mine_sel.length > 0) { - tabbarIndex4.selectedImage = model.mine_sel; + if (is_open == 1) { + tabbarIndex1.normalImage = @"icon_sy_notselect"; + tabbarIndex1.selectedImage = @"icon_sy_select"; + tabbarIndex2.normalImage = @"icon_dt_notselect"; + tabbarIndex2.selectedImage = @"icon_dt_select"; + tabbarIndex3.normalImage = @"icon_xx_notselect"; + tabbarIndex3.selectedImage = @"icon_xx_select"; + tabbarIndex4.normalImage = @"icon_wd_notselect"; + tabbarIndex4.selectedImage = @"icon_wd_select"; + + + + QXThemeModel *model = [[QXThemeModel alloc] init]; + model.app_home_bg = @"bg_dark"; + model.logo_shouye = @"logo_shouye"; + model.bg_rmfj = @"bg_rmfj"; + model.bg_wdfj = @"bg_wdfj"; + model.bg_phb = @"bg_phb"; + model.bg_gfgg = @"bg_gfgg"; + model.bg_xiaoxi = @"bg_xiaoxi"; + model.bg_phb = @"bg_phb"; + model.button_qwg = @"button_qwg"; + model.bg_light = @"bg_light"; + + model.icon_wdjz = @"icon_wdjz"; + model.icon_dj = @"icon_dj"; + model.icon_gxzb = @"icon_gxzb"; + model.icon_wdbb = @"icon_wdbb"; + model.icon_bzzx = @"icon_bzzx"; + model.icon_yq = @"icon_yq"; + model.icon_rw = @"icon_rw"; + model.icon_yjfk = @"icon_yjfk"; + model.icon_gskf = @"icon_gskf"; + model.icon_gsrz = @"icon_gsrz"; + model.icon_wdgd = @"icon_wdgd"; + model.icon_sz = @"icon_sz"; + + model.tabbarSelectedColor = @"#FF3700"; + QXConfig.shared.model =model; } +// QXThemeModel *model = [QXThemeModel yy_modelWithJSON:responseObject[@"data"]]; +// if (model.theme_color && model.theme_color.length > 0) { +// QXConfig.shared.themeColor = [UIColor colorWithHexString:model.theme_color]; +// } +// +// if (model.btn_text_color && model.btn_text_color.length > 0) { +// QXConfig.shared.btnTextColor = [UIColor colorWithHexString:model.btn_text_color]; +// } +// if (model.app_bg && model.app_bg.length > 0) { +// QXConfig.shared.backgroundImage = model.app_bg; +// } +// +// +// if (model.home_nor && model.home_nor.length > 0) { +// tabbarIndex1.normalImage = model.home_nor; +// } +// if (model.home_sel && model.home_sel.length > 0) { +// tabbarIndex1.selectedImage = model.home_sel; +// } +// +// if (model.find_nor && model.find_nor.length > 0) { +// tabbarIndex2.normalImage = model.find_nor; +// } +// if (model.find_sel && model.find_sel.length > 0) { +// tabbarIndex2.selectedImage = model.find_sel; +// } +// +// if (model.msg_nor && model.msg_nor.length > 0) { +// tabbarIndex3.normalImage = model.msg_nor; +// } +// if (model.msg_sel && model.msg_sel.length > 0) { +// tabbarIndex3.selectedImage = model.msg_sel; +// } +// +// if (model.mine_nor && model.mine_nor.length > 0) { +// tabbarIndex4.normalImage = model.mine_nor; +// } +// if (model.mine_sel && model.mine_sel.length > 0) { +// tabbarIndex4.selectedImage = model.mine_sel; +// } QXConfig.shared.tabbarArray = @[tabbarIndex1,tabbarIndex2,tabbarIndex3,tabbarIndex4]; AppDelegate *delegate = (AppDelegate*)[UIApplication sharedApplication].delegate; [delegate changeRootViewControllerIsTabbar]; diff --git a/QXLive/Config/QXConfig.h b/QXLive/Config/QXConfig.h index ee42c9d..c046c41 100644 --- a/QXLive/Config/QXConfig.h +++ b/QXLive/Config/QXConfig.h @@ -8,7 +8,7 @@ #import #import "QXShareView.h" NS_ASSUME_NONNULL_BEGIN -@class QXTabbarModel,QXShareViewModel; +@class QXTabbarModel,QXShareViewModel,QXThemeFestivalModel,QXThemeModel,QXConfigModel; @interface QXConfig : NSObject /// 普通字体黑色 default is # 000000 @property (nonatomic,strong)UIColor * textColor; @@ -24,6 +24,10 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)NSArray *tabbarArray; /// @property (nonatomic,strong)NSArray *sharePlatforms; + +@property (nonatomic,strong)QXThemeModel *model; + +@property (nonatomic,strong)QXConfigModel *appConfig; //默认配置 +(QXConfig*)defaultConfig; @@ -90,11 +94,39 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)NSString *theme_color; /// 按钮颜色 @property (nonatomic,strong)NSString *btn_text_color; -/// -//@property (nonatomic,strong)NSString *a; -//@property (nonatomic,strong)NSString *b; -//@property (nonatomic,strong)NSString *c; -//@property (nonatomic,strong)NSString *d; + + +@property (nonatomic,strong)NSString *tabbarSelectedColor; +@property (nonatomic,strong)NSString *app_home_bg; +@property (nonatomic,strong)NSString *logo_shouye; +@property (nonatomic,strong)NSString *bg_rmfj; +@property (nonatomic,strong)NSString *bg_wdfj; +@property (nonatomic,strong)NSString *bg_phb; +@property (nonatomic,strong)NSString *bg_gfgg; +@property (nonatomic,strong)NSString *bg_xiaoxi; +@property (nonatomic,strong)NSString *button_qwg; +@property (nonatomic,strong)NSString *bg_light; + +@property (nonatomic,strong)NSString *icon_wdjz; +@property (nonatomic,strong)NSString *icon_dj; +@property (nonatomic,strong)NSString *icon_gxzb; +@property (nonatomic,strong)NSString *icon_wdbb; +@property (nonatomic,strong)NSString *icon_bzzx; +@property (nonatomic,strong)NSString *icon_yq; +@property (nonatomic,strong)NSString *icon_rw; +@property (nonatomic,strong)NSString *icon_yjfk; +@property (nonatomic,strong)NSString *icon_gskf; +@property (nonatomic,strong)NSString *icon_gsrz; +@property (nonatomic,strong)NSString *icon_wdgd; +@property (nonatomic,strong)NSString *icon_sz; @end +/// 节日主题 +@interface QXConfigModel :NSObject +/// 发红包最小金额 +@property (nonatomic,strong)NSString *red_packet_min_amount; +/// 发红包手续费 +@property (nonatomic,strong)NSString *red_packet_fee; + +@end NS_ASSUME_NONNULL_END diff --git a/QXLive/Config/QXConfig.m b/QXLive/Config/QXConfig.m index 027ba1c..1bdebfb 100644 --- a/QXLive/Config/QXConfig.m +++ b/QXLive/Config/QXConfig.m @@ -109,4 +109,10 @@ +@end + +@implementation QXConfigModel + + + @end diff --git a/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m b/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m index 3447654..e392f20 100644 --- a/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m +++ b/QXLive/Dynamic(语圈)/Controller/QXDynamicViewController.m @@ -90,7 +90,11 @@ } -(void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{ self.publishBtn.hidden = !(index==1); - [self updateBgImage:index==0?@"exbpansion_bg":@"app_bg"]; + if (QXConfig.shared.model) { + [self updateBgImage:QXConfig.shared.model.bg_light]; + }else{ + [self updateBgImage:index==0?@"exbpansion_bg":@"app_bg"]; + } if (index == 0) { self.categoryView.titleSelectedColor = [UIColor colorWithHexString:@"#333333"]; self.categoryView.titleColor = [UIColor colorWithHexString:@"#666666"]; diff --git a/QXLive/Dynamic(语圈)/Controller/QXExpansionViewController.m b/QXLive/Dynamic(语圈)/Controller/QXExpansionViewController.m index 4d9d23f..d345dee 100644 --- a/QXLive/Dynamic(语圈)/Controller/QXExpansionViewController.m +++ b/QXLive/Dynamic(语圈)/Controller/QXExpansionViewController.m @@ -35,7 +35,6 @@ self.bgImageHidden = YES; self.titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, 12, 100, 24)]; self.titleLabel.font = [UIFont systemFontOfSize:16]; - self.titleLabel.textColor = RGB16(0xffffff); self.titleLabel.text = QXText(@"扩列交友"); [self.view addSubview:self.titleLabel]; @@ -48,7 +47,14 @@ [self.sortBtn setTitle:QXText(@"只看男生") forState:(UIControlStateNormal)]; self.type = @"1"; } - [self.sortBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)]; + if (QXConfig.shared.model) { + self.titleLabel.textColor = RGB16(0x333333); + [self.sortBtn setTitleColor:RGB16(0x333333) forState:(UIControlStateNormal)]; + }else{ + self.titleLabel.textColor = RGB16(0xffffff); + [self.sortBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)]; + } + self.sortBtn.titleLabel.font = [UIFont systemFontOfSize:12]; [self.sortBtn qx_layoutButtonNOSizeToFitWithEdgeInsetsStyle:(QXButtonEdgeInsetsStyleRight) imageTitleSpace:3]; [self.sortBtn addTarget:self action:@selector(sortAction) forControlEvents:(UIControlEventTouchUpInside)]; @@ -79,7 +85,7 @@ if (weakSelf.page == 1) { [weakSelf.dataArray removeAllObjects]; } - if (isAppStore) { + if (QXGlobal.shareGlobal.isAppStore) { self.appStoreView.hidden = NO; [self.sortBtn setTitleColor:RGB16(0xFFEB9D) forState:(UIControlStateNormal)]; [self.sortBtn setImage:[[UIImage imageNamed:@"arrow_bottom"] imageByTintColor:RGB16(0xFFEB9D)] forState:(UIControlStateNormal)]; @@ -88,8 +94,13 @@ self.appStoreView.users = list; self.titleLabel.hidden = YES; }else{ - [self.sortBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)]; - [self.sortBtn setImage:[[UIImage imageNamed:@"arrow_bottom"] imageByTintColor:RGB16(0xffffff)] forState:(UIControlStateNormal)]; + if (QXConfig.shared.model) { + [self.sortBtn setTitleColor:RGB16(0x333333) forState:(UIControlStateNormal)]; + [self.sortBtn setImage:[[UIImage imageNamed:@"arrow_bottom"] imageByTintColor:RGB16(0x333333)] forState:(UIControlStateNormal)]; + }else{ + [self.sortBtn setTitleColor:RGB16(0xffffff) forState:(UIControlStateNormal)]; + [self.sortBtn setImage:[[UIImage imageNamed:@"arrow_bottom"] imageByTintColor:RGB16(0xffffff)] forState:(UIControlStateNormal)]; + } self.sortBtn.top = 0; self.tableView.hidden = NO; self.appStoreView.hidden = YES; diff --git a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m index daea0ae..70d94d4 100644 --- a/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m +++ b/QXLive/HomePage(声播)/Controlller/QXHomeViewController.m @@ -63,7 +63,7 @@ @property (nonatomic,strong)QXRechargePermissionModel *permissionModel; @property (nonatomic,strong)QXRoomListModel *recommendRoom; /// 今日签到状态 -@property (nonatomic,strong)NSString* signStatus; +//@property (nonatomic,strong)NSString* signStatus; @end @implementation QXHomeViewController @@ -82,9 +82,15 @@ } - (void)initSubViews{ - [self updateBgImage:@"app_home_bg"]; - UIImageView *logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"yusheng"]]; + UIImageView *logoImageView = [[UIImageView alloc] init]; [self.view addSubview:logoImageView]; + if (QXConfig.shared.model) { + [self updateBgImage:QXConfig.shared.model.app_home_bg]; + logoImageView.image = [UIImage imageNamed:QXConfig.shared.model.logo_shouye]; + }else{ + [self updateBgImage:@"app_home_bg"]; + logoImageView.image = [UIImage imageNamed:@"yusheng"]; + } [logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(16); make.top.mas_equalTo(kSafeAreaTop +8); @@ -154,7 +160,7 @@ self.rechargePermissionView.hidden = YES; [self.view addSubview:self.rechargePermissionView]; [self getRecommendRoom]; - [self getSignStatus]; +// [self getSignStatus]; } - (void)viewDidLayoutSubviews { [super viewDidLayoutSubviews]; @@ -252,14 +258,14 @@ }]; } --(void)getSignStatus{ - MJWeakSelf - [QXMineNetwork appSignTaskStatusSuccessBlock:^(NSString * _Nonnull status) { - weakSelf.signStatus = status; - } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { - - }]; -} +//-(void)getSignStatus{ +// MJWeakSelf +// [QXMineNetwork appSignTaskStatusSuccessBlock:^(NSString * _Nonnull status) { +// weakSelf.signStatus = status; +// } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { +// +// }]; +//} //-(void)firstAction{ // [self popnPeopleRechargeView]; @@ -329,11 +335,11 @@ } -(void)popFirstRechargeViewOnlyRecharge:(BOOL)onlyRecharge{ if ([QXGlobal shareGlobal].isAppStore) { - if (self.signStatus.intValue == 1) { +// if (self.signStatus.intValue == 1) { [self popRecommendRoom]; - }else{ - [self popSignTask]; - } +// }else{ +// [self popSignTask]; +// } return; } MJWeakSelf @@ -345,11 +351,11 @@ return; } QXLOG(@"页面关闭"); - if (weakSelf.signStatus.intValue == 1) { +// if (weakSelf.signStatus.intValue == 1) { [weakSelf popRecommendRoom]; - }else{ - [weakSelf popSignTask]; - } +// }else{ +// [weakSelf popSignTask]; +// } }]; }; view.rechargeActionBlock = ^(NSString * _Nonnull money, NSString * _Nonnull gift_bag_id) { @@ -376,24 +382,24 @@ }]; }else{ - if (weakSelf.signStatus.intValue == 1) { +// if (weakSelf.signStatus.intValue == 1) { [weakSelf popRecommendRoom]; - }else{ - [weakSelf popSignTask]; - } +// }else{ +// [weakSelf popSignTask]; +// } } } --(void)popSignTask{ - if (self.signStatus.intValue != 1) { - MJWeakSelf - QXSignInAppView *view = [[QXSignInAppView alloc] init]; - view.cancelBlock = ^{ - [weakSelf popRecommendRoom]; - }; - [view showInView:KEYWINDOW]; - } -} +//-(void)popSignTask{ +// if (self.signStatus.intValue != 1) { +// MJWeakSelf +// QXSignInAppView *view = [[QXSignInAppView alloc] init]; +// view.cancelBlock = ^{ +// [weakSelf popRecommendRoom]; +// }; +// [view showInView:KEYWINDOW]; +// } +//} -(void)popRecommendRoom{ if (self.recommendRoom) { diff --git a/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m b/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m index aa51985..a3a14e6 100644 --- a/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m +++ b/QXLive/HomePage(声播)/View/首页/QXGiftScrollView.m @@ -121,13 +121,23 @@ static NSInteger maxCount = 5; } -(void)initSubViews{ - self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_gift_bg"]]; + self.bgImageView = [[UIImageView alloc] init]; + if (QXConfig.shared.model) { + self.bgImageView.image = [UIImage imageNamed:QXConfig.shared.model.bg_xiaoxi]; + }else{ + self.bgImageView.image = [UIImage imageNamed:@"home_gift_bg"]; + } [self.contentView addSubview:self.bgImageView]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.right.left.top.bottom.equalTo(self); }]; - self.gotoRoomImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_goto_room"]]; + self.gotoRoomImageView = [[UIImageView alloc] init]; + if (QXConfig.shared.model) { + self.bgImageView.image = [UIImage imageNamed:QXConfig.shared.model.button_qwg]; + }else{ + self.bgImageView.image = [UIImage imageNamed:@"home_goto_room"]; + } self.gotoRoomImageView.contentMode = UIViewContentModeScaleAspectFit; [self.contentView addSubview:self.gotoRoomImageView]; [self.gotoRoomImageView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/QXLive/HomePage(声播)/View/首页/QXHomeTopView.m b/QXLive/HomePage(声播)/View/首页/QXHomeTopView.m index b4ecdc7..1de5a7e 100644 --- a/QXLive/HomePage(声播)/View/首页/QXHomeTopView.m +++ b/QXLive/HomePage(声播)/View/首页/QXHomeTopView.m @@ -36,8 +36,13 @@ } -(void)initSubviews{ - self.hotRoomImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_hot_bg"]]; + self.hotRoomImageView = [[UIImageView alloc] init]; self.hotRoomImageView.contentMode = UIViewContentModeScaleToFill; + if (QXConfig.shared.model) { + self.hotRoomImageView.image = [UIImage imageNamed:QXConfig.shared.model.bg_rmfj]; + }else{ + self.hotRoomImageView.image = [UIImage imageNamed:@"home_hot_bg"]; + } [self addSubview:self.hotRoomImageView]; [self.hotRoomImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self); @@ -175,17 +180,29 @@ case QXHomeTopClickTypeMyRoom: self.titleLabel.text = @"我的房间"; self.subTitleLabel.text = @"进行一场灵魂深聊"; - self.bgImageView.image = [UIImage imageNamed:@"home_my_room_bg"]; + if (QXConfig.shared.model) { + self.bgImageView.image = [UIImage imageNamed:QXConfig.shared.model.bg_wdfj]; + }else{ + self.bgImageView.image = [UIImage imageNamed:@"home_my_room_bg"]; + } break; case QXHomeTopClickTypeRank: self.titleLabel.text = @"排行榜"; self.subTitleLabel.text = @"荣耀之巅 彰显实力"; - self.bgImageView.image = [UIImage imageNamed:@"home_rank_bg"]; + if (QXConfig.shared.model) { + self.bgImageView.image = [UIImage imageNamed:QXConfig.shared.model.bg_phb]; + }else{ + self.bgImageView.image = [UIImage imageNamed:@"home_rank_bg"]; + } break; case QXHomeTopClickTypeNotice: self.titleLabel.text = @"官方公告"; self.subTitleLabel.text = @"政策变动一键留痕"; - self.bgImageView.image = [UIImage imageNamed:@"home_notice_bg"]; + if (QXConfig.shared.model) { + self.bgImageView.image = [UIImage imageNamed:QXConfig.shared.model.bg_gfgg]; + }else{ + self.bgImageView.image = [UIImage imageNamed:@"home_notice_bg"]; + } break; default: break; diff --git a/QXLive/Manager/QXIAPManager.m b/QXLive/Manager/QXIAPManager.m index c8c8772..6f84cec 100644 --- a/QXLive/Manager/QXIAPManager.m +++ b/QXLive/Manager/QXIAPManager.m @@ -11,7 +11,7 @@ #import #import #import - +#import "QXMineNetwork.h" @interface QXIAPManager() @property (nonatomic,strong)NSString*orderNo; @@ -114,6 +114,11 @@ self.subscriptionSuccessCompletionHandler(); } [[NSNotificationCenter defaultCenter] postNotificationName:noticeAlipayResult object:nil]; + [QXMineNetwork getMineInfoSuccessBlock:^(QXUserModel * _Nonnull userModel) { + + } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { + + }]; }else{ if (self.subscriptionFailurreCompletionHandler) { self.subscriptionFailurreCompletionHandler(); diff --git a/QXLive/Message(音信)/Controller/QXMessageViewController.m b/QXLive/Message(音信)/Controller/QXMessageViewController.m index a9c0a86..d3c1b9f 100644 --- a/QXLive/Message(音信)/Controller/QXMessageViewController.m +++ b/QXLive/Message(音信)/Controller/QXMessageViewController.m @@ -42,6 +42,9 @@ [self getHomeMessage]; } -(void)initSubViews{ + if (QXConfig.shared.model) { + [self updateBgImage:QXConfig.shared.model.bg_light]; + } UILabel *tLabel = [[UILabel alloc] init]; tLabel.text = QXText(@"消息"); tLabel.font = [UIFont boldSystemFontOfSize:20]; diff --git a/QXLive/Mine(音域)/Controller/QXMineViewController.m b/QXLive/Mine(音域)/Controller/QXMineViewController.m index 52bee12..9305e19 100644 --- a/QXLive/Mine(音域)/Controller/QXMineViewController.m +++ b/QXLive/Mine(音域)/Controller/QXMineViewController.m @@ -38,6 +38,7 @@ #import "QXIntimateViewController.h" #import "QXBodyPriceRuleView.h" #import "QXFamilyViewController.h" +#import "QXNobilityDetailViewController.h" #import @interface QXMineViewController () @@ -68,7 +69,11 @@ } - (void)initSubViews{ - [self updateBgImage:@"app_home_bg"]; + if (QXConfig.shared.model) { + [self updateBgImage:QXConfig.shared.model.app_home_bg]; + }else{ + [self updateBgImage:@"app_home_bg"]; + } self.tableView.tableHeaderView = self.tableHeaderView; [self.view addSubview:self.tableView]; // [self.view addSubview:self.settingBtn]; @@ -223,7 +228,9 @@ break; case QXMainHeaderOptionTypeNobility:{ QXLOG(@"跳转贵族"); - QXNobilityViewController *vc = [[QXNobilityViewController alloc] init]; +// QXNobilityViewController *vc = [[QXNobilityViewController alloc] init]; +// [self.navigationController pushViewController:vc animated:YES]; + QXNobilityDetailViewController *vc = [[QXNobilityDetailViewController alloc] init]; [self.navigationController pushViewController:vc animated:YES]; } break; diff --git a/QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m b/QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m index c7975c4..81c8846 100755 --- a/QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m +++ b/QXLive/Mine(音域)/Controller/我的房间/QXCreateRoomViewController.m @@ -418,6 +418,7 @@ _textView.font = [UIFont systemFontOfSize:12]; _textView.textColor = QXConfig.textColor; _textView.placehoulder = QXText(@"本房间严禁刷屏，禁止非法广告宣传，禁止引战地域黑，语言攻击等"); + _textView.maxLength = 500; _textView.backgroundColor = [UIColor clearColor]; } return _textView; diff --git a/QXLive/Mine(音域)/Controller/爵位/QXNobilityDetailViewController.m b/QXLive/Mine(音域)/Controller/爵位/QXNobilityDetailViewController.m index 1704861..5966e5b 100644 --- a/QXLive/Mine(音域)/Controller/爵位/QXNobilityDetailViewController.m +++ b/QXLive/Mine(音域)/Controller/爵位/QXNobilityDetailViewController.m @@ -88,7 +88,7 @@ [self updateBgImage:@"nobility_detail_bg"]; [self.view addSubview:self.headerView]; [self.view addSubview:self.cycleScrollView]; - [self.view addSubview:self.bottomView]; +// [self.view addSubview:self.bottomView]; UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; int itemWidth = (SCREEN_WIDTH-16*2-8*2)/3; diff --git a/QXLive/Mine(音域)/Services/QXMineNetwork.h b/QXLive/Mine(音域)/Services/QXMineNetwork.h index b518aee..227a42b 100644 --- a/QXLive/Mine(音域)/Services/QXMineNetwork.h +++ b/QXLive/Mine(音域)/Services/QXMineNetwork.h @@ -32,6 +32,7 @@ #import "QXRoomBestFriendModel.h" #import "QXFamilyModel.h" #import "QXRoomActivityStatusModel.h" +#import "QXConfig.h" NS_ASSUME_NONNULL_BEGIN @@ -1462,6 +1463,14 @@ NS_ASSUME_NONNULL_BEGIN */ +(void)getRoomActivityStatusSuccessBlock:(void (^)(NSArray* list))successBlock failBlock:(void (^)(NSError * error, NSString * msg))failBlock; + + +/** + app配置接口 + */ + ++(void)getAppConfigSuccessBlock:(void (^)(QXConfigModel* config))successBlock + failBlock:(void (^)(NSError * error, NSString * msg))failBlock; @end diff --git a/QXLive/Mine(音域)/Services/QXMineNetwork.m b/QXLive/Mine(音域)/Services/QXMineNetwork.m index 8e5ea6a..75f6025 100644 --- a/QXLive/Mine(音域)/Services/QXMineNetwork.m +++ b/QXLive/Mine(音域)/Services/QXMineNetwork.m @@ -2960,5 +2960,19 @@ failBlock(error,msg); }]; } +/** + app配置接口 + */ ++(void)getAppConfigSuccessBlock:(void (^)(QXConfigModel* config))successBlock + failBlock:(void (^)(NSError * error, NSString * msg))failBlock{ + [[QXRequset shareInstance] getWithUrl:QXRedpacketConfig parameters:@{} needCache:YES success:^(id responseObject) { + if (successBlock) { + QXConfigModel *model= [QXConfigModel yy_modelWithJSON:responseObject[@"data"]]; + successBlock(model); + } + } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) { + failBlock(error,msg); + }]; +} @end diff --git a/QXLive/Mine(音域)/View/QXMineServiceCell.m b/QXLive/Mine(音域)/View/QXMineServiceCell.m index 9996990..44c527a 100644 --- a/QXLive/Mine(音域)/View/QXMineServiceCell.m +++ b/QXLive/Mine(音域)/View/QXMineServiceCell.m @@ -181,25 +181,32 @@ if (!_serviceArray) { QXServiceModel *md1 = [[QXServiceModel alloc] init]; md1.title = @"等级"; - md1.icon = @"service_level"; md1.type = QXMineServiceTypeLevel; QXServiceModel *md2 = [[QXServiceModel alloc] init]; md2.title = @"个性装扮"; - md2.icon = @"service_dress"; md2.type = QXMineServiceTypeDress; QXServiceModel *md3 = [[QXServiceModel alloc] init]; md3.title = @"我的背包"; - md3.icon = @"service_bag"; md3.type = QXMineServiceTypeBackpack; QXServiceModel *md4 = [[QXServiceModel alloc] init]; md4.title = @"我的家族"; - md4.icon = @"service_my_family"; md4.type = QXMineServiceTypeFamily; + if (QXConfig.shared.model) { + md1.icon = @"icon_dj"; + md2.icon = @"icon_gxzb"; + md3.icon = @"icon_wdbb"; + md4.icon = @"icon_wdjz"; + }else{ + md1.icon = @"service_level"; + md2.icon = @"service_dress"; + md3.icon = @"service_bag"; + md4.icon = @"service_my_family"; + } _serviceArray = [NSMutableArray arrayWithArray:@[ md4, md1, @@ -232,21 +239,20 @@ md4.icon = @"service_customer_service"; md4.type = QXMineServiceTypeCustomerService; -// QXServiceModel *md5 = [[QXServiceModel alloc] init]; -// md5.title = @"歌手认证"; -// md5.icon = @"service_singer_auth"; -// md5.type = QXMineServiceTypeSingerAuth; -// -// QXServiceModel *md6 = [[QXServiceModel alloc] init]; -// md6.title = @"我的歌单"; -// md6.icon = @"service_songlist"; -// md6.type = QXMineServiceTypeSongList; QXServiceModel *md7 = [[QXServiceModel alloc] init]; md7.title = @"设置"; md7.icon = @"service_setting"; md7.type = QXMineServiceTypeSetting; - + if (QXConfig.shared.model) { + md1.icon = @"icon_bzzx"; + md2.icon = @"icon_rw"; + md7.icon = @"icon_sz"; + }else{ + md1.icon = @"service_help"; + md2.icon = @"service_task"; + md7.icon = @"service_setting"; + } _moreArray = [NSMutableArray arrayWithArray:@[ md1, md2, @@ -264,7 +270,11 @@ if (!_inviteModel) { _inviteModel = [[QXServiceModel alloc] init]; _inviteModel.title = @"邀请"; - _inviteModel.icon = @"service_invite"; + if (QXConfig.shared.model) { + _inviteModel.icon = @"icon_yq"; + }else{ + _inviteModel.icon = @"service_invite"; + } _inviteModel.type = QXMineServiceTypeInvite; } return _inviteModel; @@ -273,7 +283,11 @@ if (!_singerAuthModel) { _singerAuthModel = [[QXServiceModel alloc] init]; _singerAuthModel.title = @"歌手认证"; - _singerAuthModel.icon = @"service_singer_auth"; + if (QXConfig.shared.model) { + _singerAuthModel.icon = @"icon_gsrz"; + }else{ + _singerAuthModel.icon = @"service_singer_auth"; + } _singerAuthModel.type = QXMineServiceTypeSingerAuth; } return _singerAuthModel; @@ -283,7 +297,11 @@ if (!_songListModel) { _songListModel = [[QXServiceModel alloc] init]; _songListModel.title = @"我的歌单"; - _songListModel.icon = @"service_songlist"; + if (QXConfig.shared.model) { + _songListModel.icon = @"icon_wdgd"; + }else{ + _songListModel.icon = @"service_songlist"; + } _songListModel.type = QXMineServiceTypeSongList; } return _songListModel; diff --git a/QXLive/Other/Assets.xcassets/app_theme/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/Contents.json new file mode 100644 index 0000000..48407dc --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "bg_dark@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "bg_dark@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/bg_dark@2x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/bg_dark@2x.png new file mode 100644 index 0000000..f1ff2f4 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/bg_dark@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/bg_dark@3x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/bg_dark@3x.png new file mode 100644 index 0000000..6db05b5 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_dark.imageset/bg_dark@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/Contents.json new file mode 100644 index 0000000..cba6a9f --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "bg_gfgg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "bg_gfgg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/bg_gfgg@2x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/bg_gfgg@2x.png new file mode 100644 index 0000000..3ec71f3 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/bg_gfgg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/bg_gfgg@3x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/bg_gfgg@3x.png new file mode 100644 index 0000000..dd9523b Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_gfgg.imageset/bg_gfgg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/Contents.json new file mode 100644 index 0000000..922d5a8 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "bg_light@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "bg_light@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/bg_light@2x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/bg_light@2x.png new file mode 100644 index 0000000..dbdcc6e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/bg_light@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/bg_light@3x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/bg_light@3x.png new file mode 100644 index 0000000..cb17895 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_light.imageset/bg_light@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/Contents.json new file mode 100644 index 0000000..c1708b9 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "bg_phb@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "bg_phb@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/bg_phb@2x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/bg_phb@2x.png new file mode 100644 index 0000000..0fedbac Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/bg_phb@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/bg_phb@3x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/bg_phb@3x.png new file mode 100644 index 0000000..9a8c930 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_phb.imageset/bg_phb@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/Contents.json new file mode 100644 index 0000000..119b47a --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "bg_rmfj@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "bg_rmfj@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/bg_rmfj@2x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/bg_rmfj@2x.png new file mode 100644 index 0000000..77b4767 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/bg_rmfj@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/bg_rmfj@3x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/bg_rmfj@3x.png new file mode 100644 index 0000000..cc0b378 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_rmfj.imageset/bg_rmfj@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/Contents.json new file mode 100644 index 0000000..a097915 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "bg_wdfj@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "bg_wdfj@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/bg_wdfj@2x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/bg_wdfj@2x.png new file mode 100644 index 0000000..f459507 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/bg_wdfj@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/bg_wdfj@3x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/bg_wdfj@3x.png new file mode 100644 index 0000000..68b5856 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_wdfj.imageset/bg_wdfj@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/Contents.json new file mode 100644 index 0000000..91c1468 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "bg_xiaoxi@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "bg_xiaoxi@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/bg_xiaoxi@2x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/bg_xiaoxi@2x.png new file mode 100644 index 0000000..c6d2c59 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/bg_xiaoxi@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/bg_xiaoxi@3x.png b/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/bg_xiaoxi@3x.png new file mode 100644 index 0000000..4dc7cbb Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/bg_xiaoxi.imageset/bg_xiaoxi@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/Contents.json new file mode 100644 index 0000000..61a61b7 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "button_qwg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "button_qwg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/button_qwg@2x.png b/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/button_qwg@2x.png new file mode 100644 index 0000000..a2fc34f Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/button_qwg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/button_qwg@3x.png b/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/button_qwg@3x.png new file mode 100644 index 0000000..24f64f8 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/button_qwg.imageset/button_qwg@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/Contents.json new file mode 100644 index 0000000..fd3d302 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_bzzx@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_bzzx@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/icon_bzzx@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/icon_bzzx@2x.png new file mode 100644 index 0000000..de92a1d Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/icon_bzzx@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/icon_bzzx@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/icon_bzzx@3x.png new file mode 100644 index 0000000..1f4bc8a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_bzzx.imageset/icon_bzzx@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/Contents.json new file mode 100644 index 0000000..182c68b --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_dj@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_dj@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/icon_dj@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/icon_dj@2x.png new file mode 100644 index 0000000..7f8d267 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/icon_dj@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/icon_dj@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/icon_dj@3x.png new file mode 100644 index 0000000..43e8728 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_dj.imageset/icon_dj@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/Contents.json new file mode 100644 index 0000000..b9df651 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_dt_notselect@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_dt_notselect@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/icon_dt_notselect@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/icon_dt_notselect@2x.png new file mode 100644 index 0000000..51e15d1 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/icon_dt_notselect@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/icon_dt_notselect@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/icon_dt_notselect@3x.png new file mode 100644 index 0000000..15e933c Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_notselect.imageset/icon_dt_notselect@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/Contents.json new file mode 100644 index 0000000..afa611b --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_dt_select@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_dt_select@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/icon_dt_select@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/icon_dt_select@2x.png new file mode 100644 index 0000000..a1c146a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/icon_dt_select@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/icon_dt_select@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/icon_dt_select@3x.png new file mode 100644 index 0000000..7c83590 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_dt_select.imageset/icon_dt_select@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/Contents.json new file mode 100644 index 0000000..68f1cfe --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_gsrz@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_gsrz@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/icon_gsrz@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/icon_gsrz@2x.png new file mode 100644 index 0000000..55fd702 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/icon_gsrz@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/icon_gsrz@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/icon_gsrz@3x.png new file mode 100644 index 0000000..226fe87 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_gsrz.imageset/icon_gsrz@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/Contents.json new file mode 100644 index 0000000..001a221 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_gxzb@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_gxzb@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/icon_gxzb@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/icon_gxzb@2x.png new file mode 100644 index 0000000..2e84d44 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/icon_gxzb@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/icon_gxzb@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/icon_gxzb@3x.png new file mode 100644 index 0000000..a7c2c02 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_gxzb.imageset/icon_gxzb@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/Contents.json new file mode 100644 index 0000000..4c268bb --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_rw@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_rw@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/icon_rw@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/icon_rw@2x.png new file mode 100644 index 0000000..bbcbd22 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/icon_rw@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/icon_rw@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/icon_rw@3x.png new file mode 100644 index 0000000..e823ab5 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_rw.imageset/icon_rw@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/Contents.json new file mode 100644 index 0000000..831b8ef --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_sy_notselect@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_sy_notselect@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/icon_sy_notselect@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/icon_sy_notselect@2x.png new file mode 100644 index 0000000..066c67c Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/icon_sy_notselect@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/icon_sy_notselect@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/icon_sy_notselect@3x.png new file mode 100644 index 0000000..f1c0302 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_notselect.imageset/icon_sy_notselect@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/Contents.json new file mode 100644 index 0000000..e3b077e --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_sy_select@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_sy_select@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/icon_sy_select@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/icon_sy_select@2x.png new file mode 100644 index 0000000..1e40e05 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/icon_sy_select@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/icon_sy_select@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/icon_sy_select@3x.png new file mode 100644 index 0000000..ff025b3 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_sy_select.imageset/icon_sy_select@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/Contents.json new file mode 100644 index 0000000..0e0c196 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_sz@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_sz@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/icon_sz@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/icon_sz@2x.png new file mode 100644 index 0000000..102661e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/icon_sz@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/icon_sz@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/icon_sz@3x.png new file mode 100644 index 0000000..3c6e979 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_sz.imageset/icon_sz@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/Contents.json new file mode 100644 index 0000000..218f191 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_wd_notselect@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_wd_notselect@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/icon_wd_notselect@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/icon_wd_notselect@2x.png new file mode 100644 index 0000000..57b0160 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/icon_wd_notselect@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/icon_wd_notselect@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/icon_wd_notselect@3x.png new file mode 100644 index 0000000..a83f195 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_notselect.imageset/icon_wd_notselect@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/Contents.json new file mode 100644 index 0000000..c58e571 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_wd_select@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_wd_select@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/icon_wd_select@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/icon_wd_select@2x.png new file mode 100644 index 0000000..8e9a387 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/icon_wd_select@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/icon_wd_select@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/icon_wd_select@3x.png new file mode 100644 index 0000000..b09dfd5 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wd_select.imageset/icon_wd_select@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/Contents.json new file mode 100644 index 0000000..9b5efd4 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_wdbb@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_wdbb@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/icon_wdbb@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/icon_wdbb@2x.png new file mode 100644 index 0000000..f01a8b3 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/icon_wdbb@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/icon_wdbb@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/icon_wdbb@3x.png new file mode 100644 index 0000000..b61edc0 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wdbb.imageset/icon_wdbb@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/Contents.json new file mode 100644 index 0000000..7030dcd --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_wdgd@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_wdgd@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/icon_wdgd@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/icon_wdgd@2x.png new file mode 100644 index 0000000..b2562da Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/icon_wdgd@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/icon_wdgd@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/icon_wdgd@3x.png new file mode 100644 index 0000000..1039207 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wdgd.imageset/icon_wdgd@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/Contents.json new file mode 100644 index 0000000..e0e6598 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_wdjz@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_wdjz@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/icon_wdjz@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/icon_wdjz@2x.png new file mode 100644 index 0000000..ce96a25 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/icon_wdjz@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/icon_wdjz@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/icon_wdjz@3x.png new file mode 100644 index 0000000..71fed11 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_wdjz.imageset/icon_wdjz@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/Contents.json new file mode 100644 index 0000000..6bf0358 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_xx_notselect@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_xx_notselect@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/icon_xx_notselect@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/icon_xx_notselect@2x.png new file mode 100644 index 0000000..d701425 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/icon_xx_notselect@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/icon_xx_notselect@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/icon_xx_notselect@3x.png new file mode 100644 index 0000000..d0ea212 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_notselect.imageset/icon_xx_notselect@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/Contents.json new file mode 100644 index 0000000..844ae11 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_xx_select@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_xx_select@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/icon_xx_select@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/icon_xx_select@2x.png new file mode 100644 index 0000000..b2fccd6 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/icon_xx_select@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/icon_xx_select@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/icon_xx_select@3x.png new file mode 100644 index 0000000..8f2369c Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_xx_select.imageset/icon_xx_select@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/Contents.json new file mode 100644 index 0000000..e902145 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_yq@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon_yq@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/icon_yq@2x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/icon_yq@2x.png new file mode 100644 index 0000000..80b611e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/icon_yq@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/icon_yq@3x.png b/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/icon_yq@3x.png new file mode 100644 index 0000000..af7921a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/icon_yq.imageset/icon_yq@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/Contents.json b/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/Contents.json new file mode 100644 index 0000000..46589d2 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "logo_shouye@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "logo_shouye@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/logo_shouye@2x.png b/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/logo_shouye@2x.png new file mode 100644 index 0000000..e494b94 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/logo_shouye@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/logo_shouye@3x.png b/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/logo_shouye@3x.png new file mode 100644 index 0000000..7334c9a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/app_theme/logo_shouye.imageset/logo_shouye@3x.png differ diff --git a/QXLive/Other/QXApi.h b/QXLive/Other/QXApi.h index 27b5038..45a2511 100644 --- a/QXLive/Other/QXApi.h +++ b/QXLive/Other/QXApi.h @@ -35,7 +35,7 @@ static NSString * QXAppVersion = @"api/Version/get_app_version"; /// 协议 static NSString * QXAppProtocol = @"api/Page/page_show"; /// 获取主题配置 -static NSString * QXAppTheme = @"api/Theme/get_theme_data"; +static NSString * QXAppTheme = @"api/Theme/get_festival_theme"; /// 获取推荐房间 static NSString * QXRecommendRoom = @"api/Index/index_recommend_room"; /// 签约房间主持邀请上签约麦用户拒绝 @@ -573,4 +573,6 @@ static NSString * QXAppLogReport = @"api/Report/android_log_report"; static NSString * QXActivityStatus = @"api/BlindBoxTurntable/blind_box_status"; /// 加入房间 static NSString * QXBeforeJoinRoom = @"api/Room/before_join_room_check"; +/// APP配置 +static NSString * QXRedpacketConfig = @"api/Redpacket/appConfig"; #endif /* Api_h */ diff --git a/QXLive/Room(房间)/View/QXRoomNoticeView.m b/QXLive/Room(房间)/View/QXRoomNoticeView.m index 106349e..12b2072 100644 --- a/QXLive/Room(房间)/View/QXRoomNoticeView.m +++ b/QXLive/Room(房间)/View/QXRoomNoticeView.m @@ -20,7 +20,7 @@ { self = [super init]; if (self) { - self.frame = CGRectMake(0, 0, ScaleWidth(300), ScaleWidth(200)); + self.frame = CGRectMake(0, 0, ScaleWidth(300), ScaleWidth(400)); [self initSubviews]; } return self; diff --git a/QXLive/Room(房间)/View/红包/QXRedBagSendView.m b/QXLive/Room(房间)/View/红包/QXRedBagSendView.m index 03fc314..b7fe81c 100644 --- a/QXLive/Room(房间)/View/红包/QXRedBagSendView.m +++ b/QXLive/Room(房间)/View/红包/QXRedBagSendView.m @@ -16,6 +16,7 @@ @property (nonatomic,strong)UIButton *backBtn; @property (nonatomic,strong)UIButton *closeBtn; @property (nonatomic,strong)UIButton *nextBtn; +@property (nonatomic,strong)UILabel *remarkLabel; @property (nonatomic,strong)UIButton *commitBtn; @@ -177,8 +178,16 @@ [self initRuleView]; [self getMyWallet]; + + [self getAppConfig]; +} +-(void)getAppConfig{ + [QXMineNetwork getAppConfigSuccessBlock:^(QXConfigModel * _Nonnull config) { + QXConfig.shared.appConfig = config; + } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { + + }]; } - -(void)getMyWallet{ MJWeakSelf [QXMineNetwork getWalletInfoSuccessBlock:^(NSString * _Nonnull coin, NSString * _Nonnull earnings, NSString * _Nonnull title, NSString * _Nonnull url) { @@ -375,7 +384,9 @@ redBagTypeView.layer.cornerRadius = 13; [bottomView addSubview:redBagTypeView]; [redBagTypeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(130); + /// 隐藏钻石红包修改 +// make.width.mas_equalTo(130); + make.width.mas_equalTo(65); make.height.mas_equalTo(26); make.centerY.equalTo(bottomView); make.right.mas_equalTo(-15); @@ -388,7 +399,7 @@ [redBagTypeView addSubview:scrollBgView]; self.scrollBgView = scrollBgView; [scrollBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(66); + make.width.mas_equalTo(65); make.top.bottom.equalTo(redBagTypeView); make.left.equalTo(redBagTypeView); }]; @@ -403,7 +414,7 @@ [redBagTypeView addSubview:self.coinRedBagBtn]; [self.coinRedBagBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.left.equalTo(redBagTypeView); - make.width.mas_equalTo(66); + make.width.mas_equalTo(65); make.top.bottom.equalTo(redBagTypeView); }]; @@ -413,10 +424,11 @@ [self.diamondRedBagBtn setTitleColor:RGB16(0xD01717) forState:(UIControlStateSelected)]; [self.diamondRedBagBtn setTitleColor:RGB16(0xFFC9C7) forState:(UIControlStateNormal)]; [self.diamondRedBagBtn addTarget:self action:@selector(redBagContentTypeAction:) forControlEvents:(UIControlEventTouchUpInside)]; + self.diamondRedBagBtn.hidden = YES; [redBagTypeView addSubview:self.diamondRedBagBtn]; [self.diamondRedBagBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.right.equalTo(redBagTypeView); - make.width.mas_equalTo(66); + make.width.mas_equalTo(65); make.top.bottom.equalTo(redBagTypeView); }]; @@ -657,6 +669,17 @@ make.right.mas_equalTo(-15); make.top.bottom.equalTo(remarkBgView); }]; + + self.remarkLabel = [[UILabel alloc] init]; + self.remarkLabel.font = [UIFont boldSystemFontOfSize:13]; + self.remarkLabel.text = [NSString stringWithFormat:@"注：发送红包，将固定收取 %@金币 作为手续费（用于系统处理、安全验证及服务维护）",QXConfig.shared.appConfig.red_packet_fee]; + self.remarkLabel.textColor = RGB16(0xffffff); + self.remarkLabel.numberOfLines = 0; + [self.nextContentView addSubview:self.remarkLabel]; + [self.remarkLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(remarkBgView); + make.top.equalTo(remarkBgView.mas_bottom).offset(2); + }]; } @@ -737,6 +760,11 @@ showToast(@"请输入红包金额"); return; } + if (self.moneyTextField.text.integerValue < QXConfig.shared.appConfig.red_packet_min_amount.intValue) { + NSString *toast = [NSString stringWithFormat:@"红包金额必须大于%@",QXConfig.shared.appConfig.red_packet_min_amount]; + showToast(toast); + return; + } if (![self.countTextField.text isExist]) { showToast(@"请输入红包数量"); return; diff --git a/QXLive/Room(房间)/View/设置/QXRoomWelcomeView.m b/QXLive/Room(房间)/View/设置/QXRoomWelcomeView.m index c6de870..a139ba2 100644 --- a/QXLive/Room(房间)/View/设置/QXRoomWelcomeView.m +++ b/QXLive/Room(房间)/View/设置/QXRoomWelcomeView.m @@ -50,6 +50,7 @@ self.textView = [[QXTextView alloc] initWithFrame:CGRectMake(16, self.titleLabel.bottom+12, self.bgView.width-32, 150)]; self.textView.delegate = self; + self.textView.maxLength = 500; [self.textView addRoundedCornersWithRadius:11]; self.textView.font = [UIFont systemFontOfSize:12]; self.textView.textColor = QXConfig.textColor; diff --git a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.h b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.h index cd2113c..7d98a5a 100644 --- a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.h +++ b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.h @@ -66,6 +66,10 @@ NS_ASSUME_NONNULL_BEGIN -(void)destroyViews; +-(void)startCycleAnimation; + +-(void)stopCycleAnimation; + -(void)stopHWDMP4; -(void)playHWDMP4; @end diff --git a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.m b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.m index 1b6923e..97bfc4e 100644 --- a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.m +++ b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.m @@ -42,6 +42,8 @@ @property (nonatomic,strong) VAPView *micMp4View; @property (nonatomic,strong)UIButton *headerBtn; + +@property (nonatomic,assign)BOOL isCycleAnimation; @end @implementation QXRoomSeatContentView @@ -530,6 +532,39 @@ } +-(void)startCycleAnimation{ + if (self.isCycleAnimation == YES) { + return; + } + CABasicAnimation* rotationAnimation; + + //绕哪个轴，那么就改成什么：这里是绕y轴 ---> transform.rotation.y + + rotationAnimation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"]; + + //旋转角度 + + rotationAnimation.toValue = [NSNumber numberWithFloat: M_PI]; + + //每次旋转的时间（单位秒） + + rotationAnimation.duration = 2; + + rotationAnimation.cumulative = YES; + rotationAnimation.removedOnCompletion = NO; + + //重复旋转的次数，如果你想要无数次，那么设置成MAXFLOAT + + rotationAnimation.repeatCount = MAXFLOAT; + + [self.headerView.layer addAnimation:rotationAnimation forKey:@"rotationAnimation"]; +} + +-(void)stopCycleAnimation{ + self.isCycleAnimation = NO; + [self.headerView.layer removeAllAnimations]; +} + -(void)setNumberString:(NSString *)numberString{ self.numberLabel.text = numberString; } diff --git a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.h b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.h index 230c44a..fceac75 100644 --- a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.h +++ b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.h @@ -66,7 +66,7 @@ NS_ASSUME_NONNULL_BEGIN @interface QXRoomAuctionPriceView : UIView @property (nonatomic,strong)UIImageView* imageView; -@property (nonatomic,strong)UILabel* titleLabel; +@property (nonatomic,strong)UIButton* titleBtn; @end NS_ASSUME_NONNULL_END diff --git a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.m b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.m index 253042f..151f3fc 100644 --- a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.m +++ b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeAuctionView.m @@ -290,33 +290,34 @@ // self.relationView = [[QXRoomAuctionPriceView alloc] init]; self.relationView.imageView.image = [UIImage imageNamed:@"room_auction_relationship"]; - self.relationView.titleLabel.text = @"关系"; + [self.relationView.titleBtn setTitle:@"关系" forState:(UIControlStateNormal)]; [self.auctionBgView addSubview:self.relationView]; [self.relationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(13); - make.width.mas_equalTo(ScaleWidth(36)); + make.left.mas_equalTo(8); + make.width.mas_equalTo(ScaleWidth(52)); make.height.mas_equalTo(ScaleWidth(36)+18); make.bottom.equalTo(self.auctionBtn.mas_top).offset(-8); }]; self.timeView = [[QXRoomAuctionPriceView alloc] init]; self.timeView.imageView.image = [UIImage imageNamed:@"room_auction_time"]; - self.timeView.titleLabel.text = @"时间"; + [self.timeView.titleBtn setTitle:@"时间" forState:(UIControlStateNormal)]; [self.auctionBgView addSubview:self.timeView]; [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-13); - make.width.mas_equalTo(ScaleWidth(36)); + make.right.mas_equalTo(-8); + make.width.mas_equalTo(ScaleWidth(52)); make.height.mas_equalTo(ScaleWidth(36)+18); make.bottom.equalTo(self.auctionBtn.mas_top).offset(-8); }]; // self.giftView = [[QXRoomAuctionPriceView alloc] init]; self.giftView.imageView.image = [UIImage imageNamed:@"room_auction_gift"]; - self.giftView.titleLabel.text = @"礼物"; + [self.giftView.titleBtn setImage:[UIImage imageNamed:@"mine_live_gift_corn"] forState:(UIControlStateNormal)]; + [self.giftView.titleBtn setTitle:@"礼物" forState:(UIControlStateNormal)]; [self.auctionBgView addSubview:self.giftView]; [self.giftView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self.auctionBgView); - make.width.mas_equalTo(ScaleWidth(36)); + make.width.mas_equalTo(ScaleWidth(52)); make.height.mas_equalTo(ScaleWidth(36)+18); make.bottom.equalTo(self.auctionBtn.mas_top).offset(-8); }]; @@ -478,9 +479,9 @@ self.giftView.imageView.image = [UIImage imageNamed:@"room_auction_gift_love"]; self.relationView.imageView.image = [UIImage imageNamed:@"room_auction_relationship_love"]; self.timeView.imageView.image = [UIImage imageNamed:@"room_auction_time_love"]; - self.giftView.titleLabel.textColor = [UIColor whiteColor]; - self.relationView.titleLabel.textColor = [UIColor whiteColor]; - self.timeView.titleLabel.textColor = [UIColor whiteColor]; + [self.giftView.titleBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)]; + [self.relationView.titleBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)]; + [self.timeView.titleBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)]; self.auctionBtn.backgroundColor = RGB16(0xFE90CA); [self.auctionBtn setTitleColor:UIColor.whiteColor forState:(UIControlStateNormal)]; self.auctionView.noUserImageView.image = [UIImage imageNamed:@"room_seat_auction_love_icon"]; @@ -520,9 +521,9 @@ self.timeView.imageView.image = [UIImage imageNamed:@"room_auction_time"]; self.auctionBtn.backgroundColor = QXConfig.themeColor; [self.auctionBtn setTitleColor:QXConfig.btnTextColor forState:(UIControlStateNormal)]; - self.giftView.titleLabel.textColor = RGB16(0x999999); - self.relationView.titleLabel.textColor = RGB16(0x999999); - self.timeView.titleLabel.textColor = RGB16(0x999999);; + [self.giftView.titleBtn setTitleColor:RGB16(0x999999) forState:(UIControlStateNormal)]; + [self.relationView.titleBtn setTitleColor:RGB16(0x999999) forState:(UIControlStateNormal)]; + [self.timeView.titleBtn setTitleColor:RGB16(0x999999) forState:(UIControlStateNormal)]; self.auctionView.noUserImageView.image = [UIImage imageNamed:@"room_seat_auction_icon"]; self.compereView.noUserImageView.image = [UIImage imageNamed:@"room_seat_icon"]; self.firstSeatView.seatView.noUserImageView.image = [UIImage imageNamed:@"room_seat_icon"];; @@ -580,13 +581,13 @@ [self.auctionView hideCharm]; self.auctionCharmView.hidden = NO; self.charmLabel.text = model.charm?[NSString qx_showHotCountNumDouble:model.charm.longLongValue]:@"0"; - self.relationView.titleLabel.text = self.roomModel.room_auction.auction_user.relation_name?self.roomModel.room_auction.auction_user.relation_name:@"关系"; + [self.relationView.titleBtn setTitle:self.roomModel.room_auction.auction_user.relation_name?self.roomModel.room_auction.auction_user.relation_name:@"关系" forState:(UIControlStateNormal)]; if (self.roomModel.room_auction.auction_user.auction_type.intValue == 2) { - self.timeView.titleLabel.text = self.roomModel.room_auction.auction_user.time_day?[NSString stringWithFormat:@"%d天",self.roomModel.room_auction.auction_user.time_day.intValue/24]:@"时间"; + [self.timeView.titleBtn setTitle:self.roomModel.room_auction.auction_user.time_day?[NSString stringWithFormat:@"%d天",self.roomModel.room_auction.auction_user.time_day.intValue/24]:@"时间" forState:(UIControlStateNormal)]; }else{ - self.timeView.titleLabel.text = self.roomModel.room_auction.auction_user.time_day?[NSString stringWithFormat:@"%d小时",self.roomModel.room_auction.auction_user.time_day.intValue%24]:@"时间"; + [self.timeView.titleBtn setTitle:self.roomModel.room_auction.auction_user.time_day?[NSString stringWithFormat:@"%d小时",self.roomModel.room_auction.auction_user.time_day.intValue%24]:@"时间" forState:(UIControlStateNormal)]; } - self.giftView.titleLabel.text = self.roomModel.room_auction.auction_user.gift_name?self.roomModel.room_auction.auction_user.gift_name:@"礼物"; + [self.giftView.titleBtn setTitle: self.roomModel.room_auction.auction_user.gift_price?self.roomModel.room_auction.auction_user.gift_price:@"" forState:UIControlStateNormal]; if (self.roomModel.room_auction.auction_user.base_image) { [self.giftView.imageView sd_setImageWithURL:[NSURL URLWithString:self.roomModel.room_auction.auction_user.base_image]]; }else{ @@ -733,13 +734,13 @@ -(void)reSetRelation{ self.relationView.imageView.image = [UIImage imageNamed:@"room_auction_relationship"]; - self.relationView.titleLabel.text = @"关系"; + [self.relationView.titleBtn setTitle:@"关系" forState:(UIControlStateNormal)]; self.giftView.imageView.image = [UIImage imageNamed:@"room_auction_gift"]; - self.giftView.titleLabel.text = @"礼物"; + [self.giftView.titleBtn setTitle:@"礼物" forState:(UIControlStateNormal)]; self.timeView.imageView.image = [UIImage imageNamed:@"room_auction_time"]; - self.timeView.titleLabel.text = @"时间"; + [self.timeView.titleBtn setTitle:@"时间" forState:(UIControlStateNormal)]; } /// 拍卖位 -(void)didAuctiontUpDownSeatWithUser:(QXUserHomeModel *)user isUpSeat:(BOOL)isUpSeat{ @@ -833,13 +834,13 @@ -(void)auctionStartOrEndIsStart:(BOOL)isStart user:(QXRoomAuctionUser *)user getUser:(QXRoomAuctionUser *)getUser{ if (isStart) { self.roomModel.room_auction.auction_user = user; - self.relationView.titleLabel.text = self.roomModel.room_auction.auction_user.relation_name; + [self.relationView.titleBtn setTitle:self.roomModel.room_auction.auction_user.relation_name forState:(UIControlStateNormal)]; if (user.auction_type.intValue == 1) { - self.timeView.titleLabel.text = [NSString stringWithFormat:@"%d小时",self.roomModel.room_auction.auction_user.time_day.intValue]; + [self.timeView.titleBtn setTitle:[NSString stringWithFormat:@"%d小时",self.roomModel.room_auction.auction_user.time_day.intValue] forState:(UIControlStateNormal)]; }else{ - self.timeView.titleLabel.text = [NSString stringWithFormat:@"%d天",self.roomModel.room_auction.auction_user.time_day.intValue/24]; + [self.timeView.titleBtn setTitle:[NSString stringWithFormat:@"%d天",self.roomModel.room_auction.auction_user.time_day.intValue/24] forState:(UIControlStateNormal)]; } - self.giftView.titleLabel.text = self.roomModel.room_auction.auction_user.gift_name?self.roomModel.room_auction.auction_user.gift_name:@""; + [self.giftView.titleBtn setTitle: self.roomModel.room_auction.auction_user.gift_price?self.roomModel.room_auction.auction_user.gift_price:@"" forState:UIControlStateNormal]; [self.giftView.imageView sd_setImageWithURL:[NSURL URLWithString:self.roomModel.room_auction.auction_user.base_image] ]; self.startTime = 180; [self startTimer]; @@ -1333,18 +1334,21 @@ [self addSubview:self.imageView]; self.imageView.contentMode = UIViewContentModeScaleToFill; [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.left.equalTo(self); - make.height.equalTo(self.imageView.mas_width); +// make.top.right.left.equalTo(self); +// make.height.equalTo(self.imageView.mas_width); + make.top.centerX.equalTo(self); + make.width.height.mas_equalTo(ScaleWidth(36)); }]; - self.titleLabel = [[UILabel alloc] init]; - self.titleLabel.textColor = RGB16(0x999999); - self.titleLabel.font = [UIFont systemFontOfSize:12]; - self.titleLabel.textAlignment = NSTextAlignmentCenter; - [self addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + self.titleBtn = [[UIButton alloc] init]; + [self.titleBtn setTitleColor:RGB16(0x999999) forState:(UIControlStateNormal)]; + self.titleBtn.titleLabel.font = [UIFont systemFontOfSize:12]; +// self.titleLabel.textAlignment = NSTextAlignmentCenter; + [self addSubview:self.titleBtn]; + [self.titleBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.equalTo(self); make.top.equalTo(self.imageView.mas_bottom).offset(2); + make.height.mas_equalTo(20); }]; } diff --git a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeSingerView.m b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeSingerView.m index 0a565d2..c36a64d 100644 --- a/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeSingerView.m +++ b/QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeSingerView.m @@ -486,6 +486,7 @@ singerPitModel.user_id = model.singer_user_id; singerPitModel.dress = model.singer_dress; self.songInfoLabel.text = [NSString stringWithFormat:@"演唱歌曲：%@",model.song_name]; + [self.singerView startCycleAnimation]; }else{ bossPitModel.nickname = @""; bossPitModel.mic_cycle = @""; @@ -499,6 +500,7 @@ singerPitModel.avatar = @""; singerPitModel.dress = @""; self.songInfoLabel.text = [NSString stringWithFormat:@"暂无歌曲"]; + [self.singerView stopCycleAnimation]; } self.bossView.pitModel = bossPitModel; self.singerView.pitModel = singerPitModel; diff --git a/QXLive/Tabbar/QXTabbarController.m b/QXLive/Tabbar/QXTabbarController.m index 85b2991..63037d0 100644 --- a/QXLive/Tabbar/QXTabbarController.m +++ b/QXLive/Tabbar/QXTabbarController.m @@ -33,7 +33,9 @@ #import "QXChirldModeViewController.h" #import "QXAppVersionView.h" #import "QXLoginNetwork.h" +#import "QXMineNetwork.h" #import "QXDrifRoomHourRankView.h" +#import "QXSignInAppView.h" @interface QXTabbarController () @property(nonatomic,strong) QXTabBar *customTabBar; @@ -41,6 +43,7 @@ @property(nonatomic,strong) QXMeetActivityDriftView *meetView; @property(nonatomic,assign) BOOL isAlreadyShowChirld; @property(nonatomic,strong) QXAppVersionView *appUpdateView; +@property (nonatomic,strong)NSString* signStatus; @end @implementation QXTabbarController @@ -51,8 +54,17 @@ self.delegate = self; [self setupTabbar]; [self configChildVC]; - -// [self performSelector:@selector(giftAction) afterDelay:7]; + [self getSignStatus]; + [self performSelector:@selector(signAction) afterDelay:60]; + [self getAppConfig]; +} + +-(void)getAppConfig{ + [QXMineNetwork getAppConfigSuccessBlock:^(QXConfigModel * _Nonnull config) { + QXConfig.shared.appConfig = config; + } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { + + }]; } -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; @@ -151,8 +163,34 @@ // // }]; } +-(void)getSignStatus{ + MJWeakSelf + [QXMineNetwork appSignTaskStatusSuccessBlock:^(NSString * _Nonnull status) { + weakSelf.signStatus = status; + } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { + + }]; +} +-(void)signAction{ + if (self.signStatus.intValue == 1) { + return; + }else{ + [self popSignTask]; + } +} - +-(void)popSignTask{ + if (self.signStatus.intValue != 1) { + if (QXGlobal.shareGlobal.isNeedUpdate) { + return; + } + QXSignInAppView *view = [[QXSignInAppView alloc] init]; + view.cancelBlock = ^{ + + }; + [view showInView:KEYWINDOW]; + } +} -(void)popInvitePopView{ QXInvitePopView *view = [[QXInvitePopView alloc] init]; view.closeActionBlock = ^{ diff --git a/QXLive/Tabbar/TabbarCustomView/QXTabBar.m b/QXLive/Tabbar/TabbarCustomView/QXTabBar.m index 4f6d6f0..92f655f 100644 --- a/QXLive/Tabbar/TabbarCustomView/QXTabBar.m +++ b/QXLive/Tabbar/TabbarCustomView/QXTabBar.m @@ -111,7 +111,11 @@ QXTabBarButton *currentButton = self.tabbarBtnArray[i]; if (currentButton == ybButton) { [currentButton.iconBtn setSelected:YES]; - currentButton.titleLbl.textColor = QXConfig.themeColor; + if (QXConfig.shared.model) { + currentButton.titleLbl.textColor = [UIColor colorWithHexString:QXConfig.shared.model.tabbarSelectedColor]; + }else{ + currentButton.titleLbl.textColor = QXConfig.themeColor; + } } else { [currentButton.iconBtn setSelected:NO]; currentButton.titleLbl.textColor = [[QXTabbarConfig shareInstance] norTitleColor]; diff --git a/QXLive/Tabbar/TabbarCustomView/QXTabbarConfig.m b/QXLive/Tabbar/TabbarCustomView/QXTabbarConfig.m index 42e92da..874bdde 100644 --- a/QXLive/Tabbar/TabbarCustomView/QXTabbarConfig.m +++ b/QXLive/Tabbar/TabbarCustomView/QXTabbarConfig.m @@ -36,10 +36,10 @@ static id _instance = nil; - (void)configNormal { _norTitleColor = RGB16(0x999999);//[UIColor colorWithHexString:@"#808080"]; _selTitleColor = RGB16(0x333333);//[UIColor colorWithHexString:@"#d81e06"]; - _imageSize = CGSizeMake(24, 24); + _imageSize = CGSizeMake(32, 32); _titleFont = 12.f; _titleOffset = 5.f; - _imageOffset = 5.f; + _imageOffset = 5.f; _titleHeight = 12.f; _bgImageOffset = 20.f; }