diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
index 13c30a8b3..c64e573e9 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
@@ -1191,10 +1191,9 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
             baseProtocol = null;
         }
         if (baseProtocol == null) return;
-
+        if (!isValid()) return;
         switch (baseProtocol.getFirst()) {
             case CUSTOM_MSG_HEADER_TYPE_GIFT:
-                if (!isValid()) return;
                 if (giftList == null) {
                     giftList = new LinkedList<>();
                 }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
index 89a34fb4a..2fe00f1bd 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
@@ -60,7 +60,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
     protected static final int TYPE_BOSS = 1;
     protected static final int TYPE_NORMAL = 0;
     protected static final int TYPE_INVALID = -2;
-    protected OnMicroItemClickListener onMicroItemClickListener;
+    protected OnMicroItemClickListener onMicroItemClickListener = null;
     protected Context context;
 
     public BaseMicroViewAdapter(Context context) {
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
index 2e086d207..44d1c638e 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
@@ -60,7 +60,6 @@ import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListIn
 import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicEmptyEvent;
 import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent;
 import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
-import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils;
 import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
@@ -453,7 +452,7 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
             if (!microType.equals(BaseMicroViewAdapter.MICRO_TYPE_CP)) {
                 microView.bindAdapter(new CpMicroViewAdapter(mContext));
             }
-        }  else if (AvRoomDataManager.get().isDatingMode()) {
+        } else if (AvRoomDataManager.get().isDatingMode()) {
             if (!microType.equals(BaseMicroViewAdapter.MICRO_TYPE_DATING)) {
                 microView.bindAdapter(new DatingMicroViewAdapter(mContext));
             }
@@ -965,9 +964,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
     @Override
     public void onShowBanner(List<BannerInfo> bannerInfos) {
         initRoomAct(gameBinding.activityImg, bannerInfos, 11f);
-        AvRoomModel.get().getRoomActTimer(AvRoomDataManager.get().getRoomUid())
-                .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
-                .subscribe();
     }
 
 
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java
index b0589e359..e43fb2f02 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MicroView.java
@@ -65,7 +65,7 @@ public class MicroView extends LinearLayout implements View.OnLayoutChangeListen
     private boolean isNeedResetMicCenterPoint = true;
 
     private DatingItemDecoration datingItemDecoration;
-    private OnMicroItemClickListener onMicroItemClickListener;
+    private OnMicroItemClickListener onMicroItemClickListener = null;
 
     public MicroView(Context context) {
         this(context, null);
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
index b2d52c648..03701c374 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
@@ -100,7 +100,6 @@ import com.yizhuan.xchat_android_core.Constants;
 import com.yizhuan.xchat_android_core.UriProvider;
 import com.yizhuan.xchat_android_core.bean.BaseProtocol;
 import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo;
-import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
 import com.yizhuan.xchat_android_core.im.custom.bean.PlayEffectInfo;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo;
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean;
@@ -118,6 +117,7 @@ import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
 import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
+import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
 import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
 import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
@@ -377,9 +377,29 @@ public abstract class BaseActivity extends RxAppCompatActivity
             mCompositeDisposable = null;
         }
 
-        if (mNoticeDialog != null && mNoticeDialog.isShowing()) {
-            mNoticeDialog.dismiss();
-            mNoticeDialog = null;
+        try {
+            if (mNoticeDialog != null && mNoticeDialog.isShowing()) {
+                mNoticeDialog.dismiss();
+                mNoticeDialog = null;
+            }
+            if (giftDialog != null && giftDialog.isShowing()) {
+                giftDialog.setOnDismissListener(null);
+                giftDialog.dismiss();
+                giftDialog = null;
+            }
+            if (playEffectDialog != null && playEffectDialog.isShowing()) {
+                playEffectDialog.setOnDismissListener(null);
+                playEffectDialog.dismiss();
+                playEffectDialog = null;
+            }
+            if (giftList != null) {
+                giftList.clear();
+            }
+            if(playEffectList != null){
+                playEffectList.clear();
+            }
+        } catch (Exception e){
+            Logger.i("关闭弹窗失败" + e.getMessage());
         }
 
         super.onDestroy();
@@ -947,7 +967,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_HEADER_TYPE_GIFT:
-                if (!isValid()) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
@@ -974,7 +994,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_BOX://寻爱之旅
-                if (!isValid()) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
@@ -1003,7 +1023,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_LUCKY_SEA://星级厨房
-                if (!isValid()) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
@@ -1032,7 +1052,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_LUCKY_GIFT://福袋
-                if (!isValid()) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
@@ -1061,7 +1081,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
                 }
                 break;
             case CUSTOM_MSG_FAIRY://夺宝精灵
-                if (!isValid()) return;
+                if (!isValid() || getWindow().getDecorView().getVisibility() == View.GONE) return;
                 if (this instanceof AddUserInfoActivity || this instanceof AVRoomActivity
                         || this instanceof TreasureBoxActivity || this instanceof HomeFairyActivity
                         || UserUtils.getUserInfo() == null)
diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt
index 9cd019bb3..30fcca520 100644
--- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt
@@ -210,14 +210,14 @@ class GiveGoldToUserActivity : BaseViewBindingActivity<ActivityGiveGoldToUserBin
     }
 
     private fun initDiamond() {
-        if(binding.tvDiamondTab.visibility == View.GONE){
+        if (binding.tvDiamondTab.visibility == View.GONE) {
             return
-        }else if (binding.tvGiftTab.visibility == View.VISIBLE) {
+        } else if (binding.tvGiftTab.visibility == View.VISIBLE) {
             binding.tvGiftTab.isSelected = false
             binding.groupGift.visibility = View.GONE
         }
         val initInfo = DemoCache.readInitInfo()
-        val length = initInfo.giveDiamondOnceLimitNum.toInt().toString().length
+        val length = initInfo?.giveDiamondOnceLimitNum?.toInt()?.toString()?.length ?: 0
         binding.mEditGold.text.filters = arrayOf<InputFilter>(LengthFilter(length))
         binding.mTvDiamond.text = getString(
             R.string.my_diamond,
@@ -237,7 +237,7 @@ class GiveGoldToUserActivity : BaseViewBindingActivity<ActivityGiveGoldToUserBin
 
     @SuppressLint("CheckResult")
     private fun initGift() {
-        if(binding.tvGiftTab.visibility == View.GONE){
+        if (binding.tvGiftTab.visibility == View.GONE) {
             return
         }
         val giftList = GiftModel.get().knapList
@@ -254,10 +254,10 @@ class GiveGoldToUserActivity : BaseViewBindingActivity<ActivityGiveGoldToUserBin
                 binding.tvSure.isEnabled = true
             }
         }
-        if(giftList.size == 0){
+        if (giftList.size == 0) {
             binding.tvEmptyTip.visibility = View.VISIBLE
             return
-        }else{
+        } else {
             binding.tvEmptyTip.visibility = View.GONE
         }
         val list = transformList(giftList, 8)
diff --git a/app/src/main/res/layout/layout_ktv_empty.xml b/app/src/main/res/layout/layout_ktv_empty.xml
index 5b6be9e7f..28d1878a9 100644
--- a/app/src/main/res/layout/layout_ktv_empty.xml
+++ b/app/src/main/res/layout/layout_ktv_empty.xml
@@ -8,17 +8,16 @@
     <ImageView
         android:id="@+id/iv_status"
         android:layout_width="wrap_content"
-        android:layout_marginTop="130dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="130dp"
         android:src="@drawable/icon_common_failure" />
 
     <TextView
         android:id="@+id/tv_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/layout_layout_ktv_empty_01"
         android:layout_marginTop="15dp"
+        android:text="@string/layout_layout_ktv_empty_01"
         android:textColor="#ff666666"
-        android:textSize="15sp"
-        />
+        android:textSize="15sp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt
index db56d96c5..56f10a2b1 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt
@@ -73,7 +73,7 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
 
             override fun afterTextChanged(s: Editable) {
                 if (s.toString() == "") {
-                    rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint).text =
+                    rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint)?.text =
                         getString(R.string.association_hall_list_empty)
                     rvDelegate.setNewData(list)
                 }
@@ -89,12 +89,12 @@ class AssociationRoomFragment : BaseViewBindingFragment<FragmentAssociationRoomB
                             it.hallName.contains(newStr) || it.hallId.toString().contains(newStr)
                         }
                         if (list.isEmpty()) {
-                            rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint).text =
+                            rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint)?.text =
                                 getString(R.string.no_search_room)
                         }
                         rvDelegate.setNewData(list)
                     } else {
-                        rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint).text =
+                        rvDelegate.adapter.emptyView.findViewById<TextView>(R.id.tv_hint)?.text =
                             getString(R.string.association_hall_list_empty)
                         rvDelegate.setNewData(list)
                     }