Merge remote-tracking branch 'origin/branch_new' into branch_new

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

@@ -77,6 +77,9 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
     public boolean mIsPriRoom = false;
     // 在需要的地方调用 Activity 的方法
     public void someMethod() {
+        if (mIsPriRoom){
+            return;
+        }
         easeChatAdapter.clearData();
         ToastUtils.showShort("清除成功");
     }

MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt

@@ -67,7 +67,9 @@ class PurchaseOutfitsDialog(context: Context) :
                             adapterDataList as MutableList<DecorateDetailBean.DecorateAdapterItem>,
                             t.decorate!!.priceList.isEmpty()
                         )
-
+                        if (t.decorate!!.priceList.isNotEmpty()) {
+                            mSelectedPriceBean = t.decorate!!.priceList[0]
+                        }
                     } else {
                         dismiss()
                     }