Merge branch 'branch_new_69' into branch_new

MainModule/src/main/java/com/xscm/modulemain/Application.kt

@@ -64,6 +64,8 @@ open class Application : CommonAppContext() {
         initLogUtils()
         initCrashUtils()
         initSmartRefreshLayout()
+        if (true)
+            return
         AppUtils.registerAppStatusChangedListener(object : Utils.OnAppStatusChangedListener {
             override fun onForeground(activity: Activity?) {//应用切换到前台
 

MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt

@@ -578,11 +578,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 view
             )
         }
-        mBinding!!.roomTop.muZc.setOnClickListener { view: View ->
-            this.onClick(
-                view
-            )
-        }
+
         mBinding!!.inputMenu1.performClick()
 
         V2TIMManager.getConversationManager()
@@ -2749,22 +2745,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                     aBoolean = true
                 }
             }
-        } else if (id == R.id.mu_zc) {
-            val muZc: RoomKtvWheatView = mBinding!!.roomTop.muZc
-            if (muZc.getUserId() != "") {
-                RoomUserInfoFragment.show(
-                    roomId,
-                    muZc.getUserId(),
-                    muZc.pitNumber,
-                    getHostUser(),
-                    false,
-                    2,
-                    isNumberWhether(),
-                    supportFragmentManager
-                )
-            } else {
-                MvpPre!!.applyPit(roomId, "9")
-            }
         }
     }
 

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java

@@ -516,7 +516,15 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         startActivity(new Intent(ActivityUtils.getTopActivity(), TransparentActivity.class));
     }
 
+    @SuppressLint("CheckResult")
     private void performFragmentReplacement(Fragment newFragment) {
+
+        if (newFragment instanceof RoomKtvFragment){
+            ((RoomActivity)ActivityUtils.getTopActivity()).getBinding().recyclerView.setVisibility(View.VISIBLE);
+        }else {
+            ((RoomActivity)ActivityUtils.getTopActivity()).getBinding().recyclerView.setVisibility(View.GONE);
+        }
+
         if (getChildFragmentManager().isDestroyed()) {
             return; // 避免状态销毁后操作导致崩溃
         }
@@ -557,6 +565,12 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         transaction.commitAllowingStateLoss();
 
         currentFragment = newFragment;
+
+        Observable.timer(1000, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread()).subscribe(
+                aLong ->{
+                    startActivity(new Intent(ActivityUtils.getTopActivity(), TransparentActivity.class));
+                }
+        );
     }