1:修改初始的时候更改图标

.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>

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">

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

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);

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)

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>>() {
+        sApiServer.upUserPic(sex).enqueue(new Callback<ResponseBody>() {
-            @Override
+                    @Override
-            public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
+                    public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
-                onNextRetu(response, observer);
+                        try {
-            }
+                            String json = response.body().string();
+                            BaseModel<String> baseModel = GsonUtils.fromJson(json, BaseModel.class);
+                            observer.onNext(baseModel.getData());
 
-            @Override
+                        } catch (IOException e) {
-            public void onFailure(Call<BaseModel<String>> call, Throwable t) {
+                            e.printStackTrace();
-                LogUtils.e("@@@", t);
+                        }
-            }
+                    }
-        });
+
+                    @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) {

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()) {

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"

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;

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);

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" />