From dc1ae42fa1a7b564783ba1164640586e9d853e80 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Tue, 14 May 2024 19:50:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=9B=BA=E5=8C=96=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E6=B7=B7=E6=B7=86=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20fix=EF=BC=9A=E8=B0=83=E6=95=B4=E5=91=BD=E5=90=8D=EF=BC=88?=
 =?UTF-8?q?=E6=B3=9B=E5=9E=8B=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                       | 10 ++++++++++
 .../com/chwl/app/avroom/fragment/BaseRoomFragment.kt   |  6 ++----
 gradle.properties                                      |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index da7ff6fe9..a1c493d50 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -318,6 +318,16 @@ xmlClassGuard {
                      "com.chwl.core": "com.hhchu.core",
                      "com.chwl.library": "com.hhchu.library"]
     moveDir = [
+            "com.chwl.app.avroom.game" : "bbecfa.babcfd",
+            "com.chwl.app.ui.webview.baishun" : "caebbec.bfcfbdf",
+            "com.chwl.core.public_chat_hall.model" : "aada.dceaa",
+            "com.chwl.app.avroom.rank" : "edadcb.beeaca",
+            "com.chwl.app.fansteam" : "eabdedaed.cfeadaacfe",
+            "com.chwl.core.fansteam" : "adbfd.adeecd",
+            "com.chwl.app.public_chat.core.viewholder" : "fffa.accee",
+            "com.chwl.app.public_chat.core" : "fcbdcbf.afaafbac",
+            "com.chwl.app.public_chat.ui.message.headline" : "dfcfcad.cbcfdcf",
+            "com.chwl.app.public_chat.ui.message" : "afdf.affbd",
             "com.chwl.library.language" : "faceb.abded",
             "com.chwl.app.ui.invite" : "cfdd.baac",
             "com.chwl.app.ui.link" : "fdb.ddbd",
diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
index 2f6210007..cbacef9b0 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
@@ -11,7 +11,6 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
@@ -77,7 +76,6 @@ import com.chwl.app.ui.widget.rollviewpager.hintview.ColorPointHintView
 import com.chwl.app.utils.KeyBoardUtils
 import com.chwl.app.vip.dialog.SelectPayTypeDialog
 import com.chwl.core.Constants
-import com.chwl.core.XConstants
 import com.chwl.core.auth.AuthModel
 import com.chwl.core.bean.RoomMicInfo
 import com.chwl.core.gift.GiftModel
@@ -141,8 +139,8 @@ import org.greenrobot.eventbus.ThreadMode
  * @author chenran
  * @date 2017/7/26
  */
-open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
-    BaseMvpFragment<V?, P?>(),
+open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
+    BaseMvpFragment<V?, P1?>(),
     View.OnClickListener, OnGiftDialogBtnClickListener, IBaseRoomView, OnMicroItemClickListener,
     RoomView {
     private var myUid: Long = 0
diff --git a/gradle.properties b/gradle.properties
index 68d0e08ce..b92f5a16a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,8 +32,8 @@ COMPILE_SDK_VERSION=33
 MIN_SDK_VERSION=21
 TARGET_SDK_VERSION=33
 
-version_name=1.0.4
-version_code=6
+version_name=1.0.5
+version_code=7
 
 #systemProp.https.proxyHost=127.0.0.1
 #systemProp.https.proxyPort=7890