Merge remote-tracking branch 'origin/dev_2.0.8' into feat/dev_opt

* origin/dev_2.0.8:
  [*] 修正到Build 2
  [*] 代码优化
  [*] 修正为生产环境 2.0.8 Build1
  [*] 收益榜的小时榜定时器管理
  [*] 暂时提交
  [*] 暂时提交
  [*] 榜单直播中状态显示逻辑修改
  [*] 修复启动app重复调用首页接口
  [*] 榜单前三名UI显示优化

MiMoLive/MiMoLive.xcodeproj/project.pbxproj

@@ -14229,7 +14229,7 @@
 				CODE_SIGN_ENTITLEMENTS = MiMoLive/MiMoLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEFINES_MODULE = "$(inherited)";
 				DEVELOPMENT_TEAM = 5H8D98R72W;
 				ENABLE_BITCODE = NO;
@@ -14293,7 +14293,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/MiMoLive/3rdParty/EMVoiceConvert",
 				);
-				MARKETING_VERSION = 2.0.7;
+				MARKETING_VERSION = 2.0.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-l\"sqlite3\"",
@@ -14360,7 +14360,7 @@
 					"-fprofile-instr-generate",
 					"-ld64",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.jiehe.mimo.debugs;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jiehe.mimo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -14384,7 +14384,7 @@
 				CODE_SIGN_ENTITLEMENTS = MiMoLive/MiMoLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEFINES_MODULE = "$(inherited)";
 				DEVELOPMENT_TEAM = 5H8D98R72W;
 				ENABLE_BITCODE = NO;
@@ -14448,7 +14448,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/MiMoLive/3rdParty/EMVoiceConvert",
 				);
-				MARKETING_VERSION = 2.0.7;
+				MARKETING_VERSION = 2.0.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-l\"sqlite3\"",
@@ -14515,7 +14515,7 @@
 					"-fprofile-instr-generate",
 					"-ld64",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.jiehe.mimo.debugs;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jiehe.mimo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

MiMoLive/MiMoLive/Classes/Base/Web/MOWebViewController.m

@@ -398,8 +398,11 @@ static int webViewTag = 0;
     }
     //#define kWebCallBack_GetStatusHeight @"getStatusHeight" //状态栏高度
     else if ([message.name isEqualToString:kWebCallBack_GetStatusHeight]){
+        //顶部高度
         CGFloat statusHeght = STATUS_BAR_HEIGHT + 44;
-        NSDictionary *userDict = @{@"statusHeight":@(statusHeght)};
+        //底部高度
+        CGFloat navigationBarHeight = HOME_KEY_HEIGHT;
+        NSDictionary *userDict = @{@"statusHeight":@(statusHeght),@"navigationBarHeight":@(navigationBarHeight)};
         NSString *jsonString = [userDict modelToJSONString];
         NSString *jsString = [NSString stringWithFormat:@"%@(%@)",@"getStatusHeightResponse",jsonString];
         [self.poWebView evaluateJavaScript:jsString completionHandler:nil];

MiMoLive/MiMoLive/Classes/Explore/NewPKRank/MOPkRankSubView.m

@@ -99,6 +99,7 @@
         return;
     }
 
+    self.topView.hidden = (self.dataArr.count == 0);
     
     NSMutableArray *tempArr = [NSMutableArray array];
     
@@ -177,8 +178,17 @@
         if (cell == nil){
             cell = [[MORankListCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:MORankLIstCell_ID];
         }
-        NSInteger num = indexPath.row;
-        cell.numLab.text = [NSString stringWithFormat:@"%zd",num + 1];
+        
+        NSInteger num = indexPath.row + 1;
+        if (num <= 3) {
+            cell.numLab.hidden = YES;
+            cell.numImgView.hidden = NO;
+            cell.numImgView.image = [UIImage imageNamed:[NSString stringWithFormat:@"icon_rank_%zd", num]];
+        } else {
+            cell.numLab.hidden = NO;
+            cell.numImgView.hidden = YES;
+            cell.numLab.text = [NSString stringWithFormat:@"%zd",num];
+        }
         
         cell.isShowLiving = YES;
 //        cell.typeNum = self.typeNum;
@@ -270,7 +280,7 @@
         _tableView.showsVerticalScrollIndicator = NO;
         _tableView.showsHorizontalScrollIndicator = NO;
         _tableView.rowHeight = 68;
-        _tableView.contentInset = UIEdgeInsetsMake(0, 0, kBottomSafeAreaInset, 0);
+        _tableView.contentInset = UIEdgeInsetsMake(0, 0, (kBottomSafeAreaInset > 0 ? kBottomSafeAreaInset : 20) , 0);
         _tableView.layer.masksToBounds = YES;
         _tableView.layer.cornerRadius = 16;
         [_tableView registerClass:[MORankListCell class] forCellReuseIdentifier:MORankLIstCell_ID];
@@ -301,6 +311,7 @@
 - (MORankTopView *)topView{
     if (!_topView) {
         _topView = [MORankTopView moRankTopView];
+        _topView.hidden = YES;
         CGFloat topViewHeigth = [MORankTopView theViewHeight];
         _topView.height = topViewHeigth;
         

MiMoLive/MiMoLive/Classes/Explore/View/MORankListCell.m

@@ -229,6 +229,7 @@
     
     self.followBtn.selected = cellModel.userBase.follow;
     
+    self.headBgView.hidden = YES;
     if(self.isShowLiving){
         
         //是否展示直播中
@@ -251,18 +252,18 @@
 //            }
 //        }
     }
-    else{
-        //不展示直播中, 仅展示头像框逻辑
-        if(cellModel.userBase.userProfile.adornment.headgearRes.length > 0){
-            self.headBgView.hidden = NO;
-            self.headBgView.isLiving = NO;
-            self.headBgView.effectType = cellModel.userBase.userProfile.adornment.headgearType;
-            self.headBgView.imgUrlStr = cellModel.userBase.userProfile.adornment.headgearRes;
-        }
-        else{
-            self.headBgView.hidden = YES;
-        }
-    }
+//    else{
+//        //不展示直播中, 仅展示头像框逻辑
+//        if(cellModel.userBase.userProfile.adornment.headgearRes.length > 0){
+//            self.headBgView.hidden = NO;
+//            self.headBgView.isLiving = NO;
+//            self.headBgView.effectType = cellModel.userBase.userProfile.adornment.headgearType;
+//            self.headBgView.imgUrlStr = cellModel.userBase.userProfile.adornment.headgearRes;
+//        }
+//        else{
+//            self.headBgView.hidden = YES;
+//        }
+//    }
     
     self.levelImgView.levelNum = cellModel.userBase.level;
     if(cellModel.userBase.level >= 100){
@@ -375,6 +376,7 @@
     
     self.followBtn.selected = heatModel.user.follow;
     
+    self.headBgView.hidden = YES;
     if(self.isShowLiving){
         
         //是否展示直播中
@@ -397,18 +399,18 @@
 //            }
 //        }
     }
-    else{
-        //不展示直播中, 仅展示头像框逻辑
-        if(heatModel.user.userProfile.adornment.headgearRes.length > 0){
-            self.headBgView.hidden = NO;
-            self.headBgView.isLiving = NO;
-            self.headBgView.effectType = heatModel.user.userProfile.adornment.headgearType;
-            self.headBgView.imgUrlStr = heatModel.user.userProfile.adornment.headgearRes;
-        }
-        else{
-            self.headBgView.hidden = YES;
-        }
-    }
+//    else{
+//        //不展示直播中, 仅展示头像框逻辑
+//        if(heatModel.user.userProfile.adornment.headgearRes.length > 0){
+//            self.headBgView.hidden = NO;
+//            self.headBgView.isLiving = NO;
+//            self.headBgView.effectType = heatModel.user.userProfile.adornment.headgearType;
+//            self.headBgView.imgUrlStr = heatModel.user.userProfile.adornment.headgearRes;
+//        }
+//        else{
+//            self.headBgView.hidden = YES;
+//        }
+//    }
     
     self.levelImgView.levelNum = heatModel.user.level;
     if(heatModel.user.level >= 100){

MiMoLive/MiMoLive/Classes/Explore/View/MORankListTableView.m

@@ -34,6 +34,8 @@
 
 @property (nonatomic, strong) MORankNoDataView *noDataView;
 
+@property (nonatomic, assign) BOOL needAddTimer;//是否添加定时器
+
 @end
 
 @implementation MORankListTableView
@@ -149,6 +151,17 @@
         
         [self.tableView reloadData];
     }
+    
+    if (self.needAddTimer) {
+        [self.liveTimer fire];
+    }
+}
+
+- (void)listDidDisappear {
+    if (self.needAddTimer && _liveTimer) {
+        [_liveTimer invalidate];
+        _liveTimer = nil;
+    }
 }
 
 - (void)setTypeTime:(NSInteger)typeTime{
@@ -177,10 +190,6 @@
                 make.width.mas_equalTo(SCREENWIDTH);
             }];
         }
-        
-        if(!_liveTimer){
-            [self.liveTimer fire];//打开定时器
-        }
     }
 }
 
@@ -277,11 +286,13 @@
             if (weakSelf.getTopBlock) {
                 weakSelf.getTopBlock(baseData.newerTops);
             }
-            if (weakSelf.getCurrentIndexBlock) {
-                weakSelf.getCurrentIndexBlock(baseData.rankFooter);
+            if (weakSelf.typeTime == 4) {//小时榜才回调出去
+                if (weakSelf.getCurrentIndexBlock) {
+                    weakSelf.getCurrentIndexBlock(baseData.rankFooter);
+                }
             }
             weakSelf.dataArr = [baseData.ranklist mutableCopy];
-            
+            [weakSelf checkIfNeedAddTimer];
             [weakSelf setTopView];
             weakSelf.topView.endTime = baseData.endTime;
             
@@ -297,9 +308,19 @@
     }];
 }
 
+- (void)checkIfNeedAddTimer {
+    if(self.typeTime == 4 && self.typeNum == 3 && self.dataArr.count > 0) {
+        self.needAddTimer = YES;
+        if(!_liveTimer){
+            [self.liveTimer fire];//打开定时器
+        }
+    }
+}
+
 - (void)checkTableViewcontentInset {
     if (self.outSideRoom) {
         self.bottomView.hidden = YES;
+        self.tableView.contentInset = UIEdgeInsetsMake(0, 0, (kBottomSafeAreaInset > 0 ? kBottomSafeAreaInset : 20) , 0);
         return;
     }
     
@@ -328,6 +349,8 @@
         return;
     }
     
+    self.topView.hidden = (self.dataArr.count == 0);
+    
     NSMutableArray *tempArr = [NSMutableArray array];
     
     int x = 0;
@@ -548,6 +571,7 @@
 - (MORankTopView *)topView{
     if (!_topView) {
         _topView = [MORankTopView moRankTopView];
+        _topView.hidden = YES;
         CGFloat topViewHeigth = [MORankTopView theViewHeight];
         _topView.height = topViewHeigth;
         

MiMoLive/MiMoLive/Classes/Live/View/LiveingView/NewRank/Heat/MOHeatRankView.m

@@ -169,6 +169,8 @@
         return;
     }
     
+    self.topView.hidden = (self.dataArr.count == 0);
+    
     NSMutableArray *tempArr = [NSMutableArray array];
     
     int x = 0;
@@ -454,6 +456,7 @@
 - (MORankTopView *)topView{
     if (!_topView) {
         _topView = [MORankTopView moRankTopView];
+        _topView.hidden = YES;
         CGFloat topViewHeigth = [MORankTopView theViewHeight];
         _topView.height = topViewHeigth;
         

MiMoLive/MiMoLive/Classes/Square/Controller/MOSquareListVC.mm

@@ -429,7 +429,6 @@ static BOOL MOActivityManageViewTag = NO;
         make.left.right.bottom.equalTo(self.view);
     }];
     self.titleCategoryView.listContainer = self.listContainerView;
-    [self.titleCategoryView reloadData];
     
     [self.view addSubview:self.entranceStackView];
     [self.entranceStackView mas_makeConstraints:^(MASConstraintMaker *make) {

MiMoLive/MiMoLive/Global/MOGlobal.h

@@ -11,7 +11,7 @@
 /**
  * kAPP_Environment 1为正式环境 2为测试环境
  */
-#define kAPP_Environment 2
+#define kAPP_Environment 1
 
 #if kAPP_Environment == 1
 #pragma mark - 正式环境配置