From 603899ddef5ea2f6535d0e4d0efb84ec5a538552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Wed, 26 Nov 2025 16:32:46 +0800
Subject: [PATCH] =?UTF-8?q?1:=E7=BB=99=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=92=8C=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/bean/room/RoomSettingBean.java |  2 +-
 .../user/activity/SettingActivity.java        | 37 ++++++++++++-------
 .../user/fragment/VocalRangeFragment.java     | 12 ++++++
 .../adapter/RoomSettingAdapter.java           |  2 +-
 .../dialog/RoomSettingFragment.java           |  6 +--
 5 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java
index c76a75d2..b61da368 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java
@@ -23,7 +23,7 @@ public class RoomSettingBean implements MultiItemEntity {
     //练歌房
     public static final int QXRoomSettingTypeRoomTypeLianG = 31;
     //签约
-    public static final int QXRoomSettingTypeRoomTypeSIGNONTRACT = 32;
+    public static final int QXRoomSettingTypeRoomTypeSIGNCONTRACT = 32;
 
     /// 常用工具
     /// 房间补贴
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
index ea744250..3216e3e8 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
@@ -106,21 +106,30 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
         if (MvpPre == null) {
             MvpPre = bindPresenter();
         }
+        int id = view.getId();
+        // 通过 ID 获取资源名称
+        String viewName = "";
+        try {
+            viewName = view.getContext().getResources().getResourceEntryName(id);
+        } catch (Exception e) {
+            viewName = "未知View ID: " + id;
+        }
+        LogUtils.e("点击了~" + viewName);
 
-        if (view.getId() == R.id.ll_youth) {
+        if (id == R.id.ll_youth) {
 //            startActivity(new Intent(this, UnderageActivity.class));
             showYouthModelDialog();
-        } else if (view.getId() == R.id.ll_notification) {
+        } else if (id == R.id.ll_notification) {
             startActivity(new Intent(this, NotificationActivity.class));
-        } else if (view.getId() == R.id.ll_hmd) {
+        } else if (id == R.id.ll_hmd) {
             Intent intent = new Intent(this, BlacklistActivity.class);
             intent.putExtra("type", 1);
             startActivity(intent);
-        } else if (view.getId() == R.id.ll_szmm) {//设置密码
+        } else if (id == R.id.ll_szmm) {//设置密码
             startActivity(new Intent(this, ChangPassActivity.class));
-        } else if (view.getId() == R.id.ll_shb) {
+        } else if (id == R.id.ll_shb) {
             startActivity(new Intent(this, PhoneReplacementActivity.class));
-        } else if (view.getId() == R.id.ll_smrz) {//实名认证
+        } else if (id == R.id.ll_smrz) {//实名认证
             if (SpUtil.getRealName()) {
                 startActivity(new Intent(this, RealDetailActivity.class));
             } else {
@@ -143,7 +152,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
 //                    ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation();
 //                });
             }
-        } else if (view.getId() == R.id.ll_qhch) {
+        } else if (id == R.id.ll_qhch) {
             new AlertDialog.Builder(this).setMessage("确认清理缓存？").setPositiveButton("确定", new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -154,7 +163,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                     mBinding.tvCache.setHint(FileUtils.getSize(getCacheDir()));
                 }
             }).setNegativeButton("取消", null).create().show();
-        } else if (view.getId() == R.id.swit) {
+        } else if (id == R.id.swit) {
            /* if (mBinding.swit.isChecked()) {
                 ConfigManager.getInstance().switchEnvironment(EnvironmentEnum.PRODUCTION);
                 EnvironmentEnum selectedEnv = EnvironmentEnum.PRODUCTION;
@@ -171,7 +180,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
             } else {
                 MvpPre.getModifyHideStatus("0");
             }
-        } else if (view.getId() == R.id.ll_tcdl) {
+        } else if (id == R.id.ll_tcdl) {
             new AlertDialog.Builder(this).setMessage("确定要退出登录吗？")
                     .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                         @Override
@@ -191,7 +200,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                         }
                     })
                     .setNegativeButton("取消", null).create().show();
-        }else if (view.getId() == R.id.ll_zhxiao){
+        }else if (id == R.id.ll_zhxiao){
             new AlertDialog.Builder(this).setMessage("确定要注销账号吗？")
                     .setMessage("注销后您当前的账户金币及钻石将无法找回,\n 30天内本账号将无法登陆，请谨慎操作！")
                     .setPositiveButton("确定", new DialogInterface.OnClickListener() {
@@ -204,9 +213,9 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                         }
                     })
                     .setNegativeButton("取消", null).create().show();
-        }else if (view.getId() == R.id.ll_gywm){
+        }else if (id == R.id.ll_gywm){
             startActivity(new Intent(this, AboutUsActivity.class));
-        } else if (view.getId() == R.id.ll_bbh) {
+        } else if (id == R.id.ll_bbh) {
             if (SpUtil.getShelf()==1) {
                 // 移除之前的重置任务
                 handler.removeCallbacks(resetRunnable);
@@ -221,9 +230,9 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                     handler.postDelayed(resetRunnable, RESET_DELAY);
                 }
             }
-        }else if (view.getId() == R.id.ll_send_log){
+        }else if (id == R.id.ll_send_log){
             MvpPre.sendAppLog();
-        }else if (view.getId() == R.id.tv_share) {
+        }else if (id == R.id.tv_share) {
             showLoading("正在生成分享文件...");
             Observable.create(new ObservableOnSubscribe<Boolean>() {
                 @SuppressLint("CheckResult")
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
index 98701056..8a770d3a 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
@@ -6,6 +6,7 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
@@ -16,6 +17,7 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.stx.xhb.xbanner.XBanner;
 import com.tencent.mm.opensdk.modelbiz.WXOpenCustomerServiceChat;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
@@ -175,6 +177,16 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 
     public void onClick(View view) {
         int id = view.getId();
+        // 通过 ID 获取资源名称
+        String viewName = "";
+        try {
+            viewName = view.getContext().getResources().getResourceEntryName(id);
+        } catch (Exception e) {
+            viewName = "未知View ID: " + id;
+        }
+        LogUtils.e("点击了~" + viewName);
+
+
         if (id == R.id.ll_visit) {
 //            ARouter.getInstance().build(ARouteConstants.ME_VISIT).navigation();
 //            AppLogUtil.reportAppLog(AppLogEvent.C0104);
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java
index 01dc67ea..932b0a7c 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java
@@ -59,7 +59,7 @@ public class RoomSettingAdapter extends BaseMultiItemQuickAdapter<RoomSettingBea
                 return com.xscm.moduleutil.R.mipmap.huyu;
             case RoomSettingBean.QXRoomSettingTypeRoomTypeLianG:
                 return com.xscm.moduleutil.R.mipmap.icon_liang;
-            case RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNONTRACT :
+            case RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT :
                 return com.xscm.moduleutil.R.mipmap.icon_sign_contract;
             // 常用工具
             case RoomSettingBean.QXRoomSettingTypeRoomSubsidy:
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
index 84fc6e52..58e15d0d 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
@@ -143,7 +143,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         dataList.add(new RoomSettingBean("点唱", "jiao_y", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy, read, isSelected, false, false));// 添加的新的房间类型 ，交友 ，是原来的男神女神类型
         dataList.add(new RoomSettingBean("互娱", "ic_jiaoy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU, read, isSelected, false, false)); //原交友，更改互娱 2025年9月19日11:18:01
         dataList.add(new RoomSettingBean("练歌房", "ic_liang", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeLianG, read, isSelected, false, false)); //练歌房，原点歌房，同意的时候，走同意点歌的逻辑
-        dataList.add(new RoomSettingBean("签约", "sing_contract", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNONTRACT, read, isSelected, false, false)); //签约房
+        dataList.add(new RoomSettingBean("签约", "sing_contract", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT, read, isSelected, false, false)); //签约房
 
 
         dataList.add(new RoomSettingBean("常用工具", null, null, null, -1, read, isSelected, false, false));
@@ -284,7 +284,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                     queren("7");
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG){
                     queren("-1");
-                }else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNONTRACT){
+                }else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT){
                     queren("10");
                 }
                 else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
@@ -402,7 +402,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
             if (type == RoomSettingBean.QXRoomSettingTypeRoomTypeSing || type == RoomSettingBean.QXRoomSettingTypeRoomTypeAuction ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy ||
-                    type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG ||  type== RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNONTRACT ||
+                    type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG ||  type== RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
                     || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {