From f12ed5ef8417f1ed3a8d26fab7fb8e549724ee36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Fri, 19 Sep 2025 19:04:47 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E5=88=9D=E5=A7=8B=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E6=9B=B4=E6=94=B9=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  10 +++-
 app/src/main/res/values/themes.xml            |   2 +-
 gradle.properties                             |   2 +-
 .../activity/ImproveInfoActivity.java         |   2 +-
 .../com/xscm/moduleutil/http/ApiServer.java   |   2 +-
 .../xscm/moduleutil/http/RetrofitClient.java  |  44 ++++++++++++++----
 .../widget/RoomSingSongWheatView.java         |   4 +-
 .../room_ic_wheat_default.png                 | Bin 0 -> 1906 bytes
 .../main/res/layout/room_view_sing_wheat.xml  |   4 +-
 .../mipmap-xxxhdpi/index_img_room_mask.webp   | Bin 6210 -> 0 bytes
 .../mipmap-xxxhdpi/room_ic_wheat_default.webp | Bin 940 -> 0 bytes
 .../PublicScreenEaseChatFragment.java         |  19 +++++++-
 .../activity/PersonalityActivity.java         |  14 ++++--
 .../src/main/res/layout/activity_about_us.xml |   2 +-
 14 files changed, 78 insertions(+), 27 deletions(-)
 create mode 100644 moduleUtil/src/main/res/drawable-xxxhdpi/room_ic_wheat_default.png
 delete mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/index_img_room_mask.webp
 delete mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/room_ic_wheat_default.webp

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ffee17b..974c9ae 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,15 +4,21 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-12T11:20:24.786143600Z">
+        <DropdownSelection timestamp="2025-09-18T12:45:46.137835600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=emulator-5554;connection=d14b13d7" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=6705124a" />
             </handle>
           </Target>
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
+      <SelectionState runConfigName="moduleactivity">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="muduleactivity">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bcb7b14..0305146 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -20,7 +20,7 @@
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="android:windowBackground">@mipmap/screen</item>
+        <item name="android:windowBackground">@drawable/screen</item>
     </style>
     <!-- 在 styles.xml 中添加透明主题 -->
     <style name="TransparentTheme" parent="AppTheme">
diff --git a/gradle.properties b/gradle.properties
index 54e8ad0..042b7ae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,7 +30,7 @@ isBuildModule=false
 android.injected.testOnly=false
 
 APP_VERSION_NAME=1.0.2
-APP_VERSION_CODE=147
+APP_VERSION_CODE=148
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ImproveInfoActivity.java b/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ImproveInfoActivity.java
index 54e8188..8c87be6 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ImproveInfoActivity.java
+++ b/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ImproveInfoActivity.java
@@ -69,7 +69,7 @@ public class ImproveInfoActivity extends BaseMvpActivity<ImproveInfoPresenter, A
             mBinding.edNickName.setText(userBean.getNickname());
         }
         mBinding.edNickName.setClearIconVisible(true);
-        ImageUtils.loadHeadCC(userBean.getAvatar(), mBinding.rvUserHead);
+//        ImageUtils.loadHeadCC(userBean.getAvatar(), mBinding.rvUserHead);
         if (!TextUtils.isEmpty(user_no_parent) && !"0".equals(user_no_parent)) {
             mBinding.etInviteCode.setText(user_no_parent);
             mBinding.etInviteCode.setKeyListener(null);
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java
index c72ab06..22f0f62 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java
@@ -221,7 +221,7 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.UPLOAD_USER_PIC)
-    Call<BaseModel<String>> upUserPic(@Field("sex") String sex);
+    Call<ResponseBody> upUserPic(@Field("sex") String sex);
 
     @FormUrlEncoded
     @POST(Constants.SWITCH_ACCOUNTS)
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index 3a3d7cc..d53aa29 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -679,17 +679,41 @@ public class RetrofitClient {
     }
 
     public void upUserPic(String sex, BaseObserver<String> observer) {
-        sApiServer.upUserPic(sex).enqueue(new Callback<BaseModel<String>>() {
-            @Override
-            public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
-                onNextRetu(response, observer);
-            }
+        sApiServer.upUserPic(sex).enqueue(new Callback<ResponseBody>() {
+                    @Override
+                    public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                        try {
+                            String json = response.body().string();
+                            BaseModel<String> baseModel = GsonUtils.fromJson(json, BaseModel.class);
+                            observer.onNext(baseModel.getData());
 
-            @Override
-            public void onFailure(Call<BaseModel<String>> call, Throwable t) {
-                LogUtils.e("@@@", t);
-            }
-        });
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Call<ResponseBody> call, Throwable t) {
+                        t.printStackTrace();
+                    }
+                });
+
+//                .enqueue(new Callback<BaseModel<String>>() {
+//            @Override
+//            public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
+//                if (response.code() == 200){
+//                    BaseModel<String> baseModel = response.body();
+//                    if (baseModel.getCode()==1){
+//                        onNextRetu(response, observer);
+//                    }
+//                }
+//            }
+//
+//            @Override
+//            public void onFailure(Call<BaseModel<String>> call, Throwable t) {
+//                LogUtils.e("@@@", t);
+//            }
+//        });
     }
 
     public void sendPk(String roomIda, String createUserId, String roomIdb, BaseObserver<Object> observer) {
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
index 5e6759d..35948a8 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
@@ -101,10 +101,10 @@ public class RoomSingSongWheatView extends BaseWheatView {
         mCharmView.setVisibility(GONE);
         if (showBoss && TextUtils.equals(WHEAT_BOSS, pitNumber)) {
             mIvTagBoss.setVisibility(VISIBLE);
-            int resId = bean.getIs_lock() == 1 ? R.mipmap.room_ic_wheat_default_suo : R.mipmap.room_ic_wheat_default;
+            int resId = bean.getIs_lock() == 1 ? R.mipmap.index_img_room_mask : R.drawable.room_ic_wheat_default;
             mRiv.setImageResource(resId);
         } else {
-            mRiv.setImageResource(bean.getIs_lock() == 1 ? R.mipmap.room_ic_wheat_default_suo : R.mipmap.room_ic_wheat_default);
+            mRiv.setImageResource(bean.getIs_lock() == 1 ? R.mipmap.index_img_room_mask : R.drawable.room_ic_wheat_default);
         }
 
         if (isMute()) {
diff --git a/moduleUtil/src/main/res/drawable-xxxhdpi/room_ic_wheat_default.png b/moduleUtil/src/main/res/drawable-xxxhdpi/room_ic_wheat_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..d59d2839be0078e1c91dc2f8d4823310118faf61
GIT binary patch
literal 1906
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
Ym>}b*-YYwk7xn_6Z`q>iO?*@S3o1Fm5&!@I

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
index 692d942..baf2dc3 100644
--- a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
+++ b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
@@ -24,7 +24,7 @@
             android:scaleType="fitCenter"
             android:src="@mipmap/room_ic_wheat_default"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="0.99:0.99"
+            app:layout_constraintDimensionRatio="0.95:0.95"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -38,7 +38,7 @@
             android:scaleType="fitCenter"
             android:visibility="gone"
             tools:visibility="visible"
-            app:layout_constraintDimensionRatio="0.99:0.99"
+            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/riv"
             app:layout_constraintEnd_toEndOf="@id/riv"
             app:layout_constraintStart_toStartOf="@id/riv"
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/index_img_room_mask.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/index_img_room_mask.webp
deleted file mode 100644
index 7915cfc6f91ffd543d425d4f93e4dd3ded3d65be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6210
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
Q)DhE?U2Tfc9gGg}KR{;}0ssI2

diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/room_ic_wheat_default.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/room_ic_wheat_default.webp
deleted file mode 100644
index 87d47dab992f446e6d9a37e07226cdc154184cb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 940
zcmV;d15^A`Nk&Gb0{{S5MM6+kP&il$0000G0000=002q=06|PpNFxIP00EHbY<t>P
zzdJ`&r9|D5s#2tCl&qjM_Fvi#Gcz+YpHuezw@H56=K>;P0zfC@Wv{*+cT$Nm?Zn%4
zx6B#X$SOf2?qbny+z2YnG**ogfwUsouQHSPW*hZ3w;W~&uN|QNW{n%+wgj3enw~x<
z6lkgl9ZhZ|(cs9{!TbcxPJBjI3Q{y(_$8u^P@?%V+#o510&NswiGcYM?UVs4=BH?@
z@C$hf+MBoqoCs}>oO~f#EyG-%unUEogE!Ik7SCWcVV$UDI8C(wfUny^ox_tiUwr)h
z`Sa&bZ|<Hw)PS37SX0NPH&c~!_W9<JuFY1eNZ)@vQ3dC3Mr2q80Jcvzc(PE%Ka9vC
z22e@pZp{?st07fV0SE-y@v$PE-JlWyum+O9Qp6ueMA%?FCOh_<YI2Gy=H)Kg<tdfA
zMb$04NPcHQ_M8g6I^F#x*;}&uHr<sc4_}Up&E7qFe4lJPrd#bjn&w-)JApdm4&CU|
zjdT6}?OC4XvjLvEcJ(+}CnY=fX*wT2@Acp1`Et~|{bx4&eVHniRK53V^&XzfvAmC`
zCrT;x=OmFt>J!T~KZm_}*6b=iQmczQL@22)sI`Aj;P<TYS$wxfJtC5+rs);z4YF}K
z){}NLsm~YsnAtn^TIuP;x|WmQzq0==HO1RhXESJ*_ldUaRD+3*=@p{7M}<#y{2CFt
z<u28UKXmi!NZT#*n5uW>FV*B;k0|D>L5023@0TRMuJn<(!5|P+h`n?FmY<&Iexat<
zdq^z;fJ#D#!{76pn0uhcCy+d;0I=vkvCjaYs$uYBdac0h&vCjc003*#;iWr=`SAMn
z0a=r+z@`S1w_q(l_zyIlbx;%5i5kn`E$f;bvRz@B@E~s}?Fu2c6Im5G`M^yqN<1j)
z3u{sz3bR03B7Ig2N};eqge9Qd2&Dxw+yL5=FN{lr5>PWgF)Z;JXmlf!WaNTgCltnr
z&;jjUQy3vyE||z`O#=>U9L!|SR#Q`ZlY_ymx}OLlkwjGnhO<i0h`WWlaU-ZOu#xey
zTi=d5sYID};_bRu<_vTK09H^qAX)$b01yTModGIK080QqkwTkErK6&uDo6mZ5(#Ml
z6(9g~yBRD-=x?(w`UZ^5%RXT1p>eAP6I&)xu7Cjk@3{Z|*nj`E*#G|3%&)D8009a4
OoLT2=0%!3O0002fo539b

diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
index 19bfe7f..934e596 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
@@ -219,6 +219,10 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
 
     public void getUpRoomInfo(RoomInfoResp resp) {
         this.roomInfoResp = resp;
+        // 确保适配器已初始化
+        if (easeChatAdapter == null) {
+            initChatAdapter();
+        }
         easeChatAdapter.clearData();
 //        roomInfoResp = (RoomInfoResp) arguments.getSerializable("roomInfo");
         toChatUsername = roomInfoResp.getRoom_info().getChatrooms();
@@ -234,7 +238,8 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
     protected void initView() {
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
         mBinding.recycleView.setLayoutManager(linearLayoutManager);
-        mBinding.recycleView.setAdapter(easeChatAdapter = new EaseChatAdapter());
+        initChatAdapter();
+//        mBinding.recycleView.setAdapter(easeChatAdapter = new EaseChatAdapter());
 //        easeChatAdapter.setOnItemChildClickListener((adapter, view, position) -> {
 //            EMMessageInfo item = easeChatAdapter.getItem(position);
 //            if (view.getId() == R.id.tv_red_rain_detail) {  //点击红包结果详情
@@ -271,7 +276,17 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
         mBinding.tvTabSystem.setOnClickListener(this::onClick);
 
     }
-
+    /**
+     * 初始化聊天适配器
+     */
+    private void initChatAdapter() {
+        if (easeChatAdapter == null) {
+            easeChatAdapter = new EaseChatAdapter();
+            if (mBinding.recycleView != null) {
+                mBinding.recycleView.setAdapter(easeChatAdapter);
+            }
+        }
+    }
     private int isNumberWhether() {
         if (roomInfoResp.getUser_info().getPit_number() == 9) {
             return 1;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java
index 8563a89..5aa9fac 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java
@@ -40,10 +40,7 @@ public class PersonalityActivity extends BaseMvpActivity<PersonalityPresenter, A
 
     @Override
     protected void initData() {
-        if (MvpPre==null){
-            MvpPre=bindPresenter();
-        }
-        MvpPre.getPersonaltyList();
+
 
 
 //        titleList.add("头像框");
@@ -108,6 +105,15 @@ public class PersonalityActivity extends BaseMvpActivity<PersonalityPresenter, A
 
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (MvpPre==null){
+            MvpPre=bindPresenter();
+        }
+        MvpPre.getPersonaltyList();
+    }
+
     @Override
     protected PersonalityPresenter bindPresenter() {
         return new PersonalityPresenter(this, this);
diff --git a/modulevocal/src/main/res/layout/activity_about_us.xml b/modulevocal/src/main/res/layout/activity_about_us.xml
index d54cb1f..9cef79d 100644
--- a/modulevocal/src/main/res/layout/activity_about_us.xml
+++ b/modulevocal/src/main/res/layout/activity_about_us.xml
@@ -23,7 +23,7 @@
             android:layout_width="@dimen/dp_80"
             android:layout_height="@dimen/dp_80"
             android:layout_marginTop="@dimen/dp_100"
-            android:src="@mipmap/ic_launcher_round"
+            android:src="@mipmap/ic_launcher_round_app"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />