1.1.15

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 = "";

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];
+        id object = responseObject[@"data"];
+        NSInteger is_open = 0;
+        if ([object isKindOfClass:[NSDictionary class]]) {
+            is_open = [responseObject[@"data"][@"is_open"] integerValue];
+        }
+        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";
             
-        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) {
+            QXThemeModel *model = [[QXThemeModel alloc] init];
-            tabbarIndex3.normalImage = model.msg_nor;
+            model.app_home_bg = @"bg_dark";
-        }
+            model.logo_shouye = @"logo_shouye";
-        if (model.msg_sel && model.msg_sel.length > 0) {
+            model.bg_rmfj = @"bg_rmfj";
-            tabbarIndex3.selectedImage = model.msg_sel;
+            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";
             
-        if (model.mine_nor && model.mine_nor.length > 0) {
+            model.icon_wdjz = @"icon_wdjz";
-            tabbarIndex4.normalImage = model.mine_nor;
+            model.icon_dj = @"icon_dj";
-        }
+            model.icon_gxzb = @"icon_gxzb";
-        if (model.mine_sel && model.mine_sel.length > 0) {
+            model.icon_wdbb = @"icon_wdbb";
-            tabbarIndex4.selectedImage = model.mine_sel;
+            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];

QXLive/Config/QXConfig.h

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #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 <QXTabbarModel*>*tabbarArray;
 ///
 @property (nonatomic,strong)NSArray <QXShareViewModel*>*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 *tabbarSelectedColor;
-//@property (nonatomic,strong)NSString *c;
+@property (nonatomic,strong)NSString *app_home_bg;
-//@property (nonatomic,strong)NSString *d;
+@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

QXLive/Config/QXConfig.m

@@ -109,4 +109,10 @@
 
 
 
+@end
+
+@implementation QXConfigModel
+
+
+
 @end

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"];

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)];
+            if (QXConfig.shared.model) {
-            [self.sortBtn setImage:[[UIImage imageNamed:@"arrow_bottom"] imageByTintColor:RGB16(0xffffff)] forState:(UIControlStateNormal)];
+                [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;

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] init];
-    UIImageView *logoImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"yusheng"]];
     [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{
+//-(void)getSignStatus{
-    MJWeakSelf
+//    MJWeakSelf
-    [QXMineNetwork appSignTaskStatusSuccessBlock:^(NSString * _Nonnull status) {
+//    [QXMineNetwork appSignTaskStatusSuccessBlock:^(NSString * _Nonnull status) {
-        weakSelf.signStatus = status;
+//        weakSelf.signStatus = status;
-    } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+//    } 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{
+//        }else{
-            [self popSignTask];
+//            [self popSignTask];
-        }
+//        }
         return;
     }
     MJWeakSelf
@@ -345,11 +351,11 @@
                     return;
                 }
                 QXLOG(@"页面关闭");
-                if (weakSelf.signStatus.intValue == 1) {
+//                if (weakSelf.signStatus.intValue == 1) {
                     [weakSelf popRecommendRoom];
-                }else{
+//                }else{
-                    [weakSelf popSignTask];
+//                    [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{
+//        }else{
-            [weakSelf popSignTask];
+//            [weakSelf popSignTask];
-        }
+//        }
     }
 }
 
--(void)popSignTask{
+//-(void)popSignTask{
-    if (self.signStatus.intValue != 1) {
+//    if (self.signStatus.intValue != 1) {
-        MJWeakSelf
+//        MJWeakSelf
-        QXSignInAppView *view = [[QXSignInAppView alloc] init];
+//        QXSignInAppView *view = [[QXSignInAppView alloc] init];
-        view.cancelBlock = ^{
+//        view.cancelBlock = ^{
-            [weakSelf popRecommendRoom];
+//            [weakSelf popRecommendRoom];
-        };
+//        };
-        [view showInView:KEYWINDOW];
+//        [view showInView:KEYWINDOW];
-    }
+//    }
-}
+//}
 
 -(void)popRecommendRoom{
     if (self.recommendRoom) {

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) {

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;

QXLive/Manager/QXIAPManager.m

@@ -11,7 +11,7 @@
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
 #import <AdSupport/AdSupport.h>
 #import <AFNetworking/AFNetworking.h>
- 
+#import "QXMineNetwork.h"
  
 @interface QXIAPManager()<SKPaymentTransactionObserver,SKProductsRequestDelegate,SKRequestDelegate>
 @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();

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];

QXLive/Mine(音域)/Controller/QXMineViewController.m

@@ -38,6 +38,7 @@
 #import "QXIntimateViewController.h"
 #import "QXBodyPriceRuleView.h"
 #import "QXFamilyViewController.h"
+#import "QXNobilityDetailViewController.h"
 #import <WXApi.h>
 
 @interface QXMineViewController ()<UITableViewDelegate,UITableViewDataSource,QXMineServiceCellDelegate,QXMainHeaderViewDelegate>
@@ -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;

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;

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;

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<QXRoomActivityStatusModel*>* list))successBlock
                                failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
+
+
+/**
+ app配置接口
+ */
+
++(void)getAppConfigSuccessBlock:(void (^)(QXConfigModel* config))successBlock
+                      failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
 @end
 
 

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

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;

QXLive/Other/Assets.xcassets/app_theme/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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 */