1.1.15

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 ()<UITabBarControllerDelegate,QXTabBarDelegate,UINavigationControllerDelegate,MQTTClientModelDelegate,V2TIMConversationListener>
 @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 = ^{

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

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