From d0337a723c8b9f6a8d92d58202d69aa50818a96e 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, 5 Nov 2025 11:13:18 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/vcs.xml | 2 +-
app/build.gradle | 26 +++++++++---------
.../qxcm/qxlive/PasswordLoginActivity.java | 10 +++----
gradle.properties | 4 +--
.../main/res/layout/activity_improve_info.xml | 22 +++++++++++++++
.../utils/config/EnvironmentEnum.java | 4 +--
.../src/main/res/mipmap-mdpi/muisc_reward.png | Bin 1251 -> 0 bytes
.../src/main/res/mipmap-mdpi/muisc_switch.png | Bin 730 -> 0 bytes
.../contacts/RoomSettingContacts.java | 2 ++
.../dialog/RoomSettingFragment.java | 16 +++++++----
.../moduleroom/fragment/SingSongFragment.java | 2 +-
.../presenter/RoomSettingPresenter.java | 4 +++
settings.gradle | 1 +
.../classicui/page/TUIC2CChatFragment.java | 2 +-
14 files changed, 65 insertions(+), 30 deletions(-)
delete mode 100644 moduleUtil/src/main/res/mipmap-mdpi/muisc_reward.png
delete mode 100644 moduleUtil/src/main/res/mipmap-mdpi/muisc_switch.png
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..73354269 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 22d00d55..7f38f5ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,19 +66,19 @@ android {
// // 测试版配置
beta {
- dimension "environment"
- // 测试版包名:基础包名 + .beta(com.example.myapp.beta)
- applicationIdSuffix ".beta"
- // 测试版版本名:1.0-beta
- versionNameSuffix "-beta"
-
- // 【测试版应用名称】动态生成带标识的名称
- resValue "string", "app_name", "羽声-测试版"
-
- // 【测试版图标】替换为测试专用图标
- manifestPlaceholders = [
- appIcon: "@mipmap/ic_launcher_app_bat" // 需在main/res/mipmap放置该图标
- ]
+// dimension "environment"
+// // 测试版包名:基础包名 + .beta(com.example.myapp.beta)
+// applicationIdSuffix ".beta"
+// // 测试版版本名:1.0-beta
+// versionNameSuffix "-beta"
+//
+// // 【测试版应用名称】动态生成带标识的名称
+// resValue "string", "app_name", "羽声-测试版"
+//
+// // 【测试版图标】替换为测试专用图标
+// manifestPlaceholders = [
+// appIcon: "@mipmap/ic_launcher_app_bat" // 需在main/res/mipmap放置该图标
+// ]
}
}
diff --git a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
index 6d105f8d..efe8ab33 100644
--- a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
+++ b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
@@ -406,7 +406,7 @@ public class PasswordLoginActivity extends BaseMvpActivity
+
+
+
+
+
+
Hb8~sCnQ*=~b?py-#v`+>2xeS9JkbFPP4Pk^H#G92G+UHu4T5b
zna`j*SK)g81!h0j7n9z9e6wqRxo5$G1N)3L-8y=w9rCDBS$D{hMPIPI%S73K5`X=d
zO+0emdFM-HO?vpBsL#(b6R5qiD*lP5LtxC-(r*q~(_VXRe3Y{|ddq&ThGN?}(uz}a
zOV2gTW)6xj;(m7aQ}3)Fp|hXdwr11&-nsG*lXQlzwfzFK+)_Ss5fwHy7
zBQ3tI@+#WOEU3vpVH;nIN9pn8eKD`++*MsYJO1|lsV-9e)tf`uCw+R9KcmYq)aBSB
zn{^Yac-Gfk<9(%ir001c=R-rAFS~@^q{i~<+}{#7bH>LRhjuAAZ~xSg;}f{6QdMqt
zfVPTteI4iLr3zh@Ce=)DsuU>Yk~F+2gbk(
zgS9TZ6xK~-YOadgmT~RqI+xW;cwMr%clG}`HA!aT-c@P2-rnZP$s4;9U02(z+G6H3
zsiSSrpEq64eN_*1t*AV_{-@&__um2honl;;Q{#9$_X>St3YMAXbYWh|Vi#3Y!yxlt
zPab(_1;$@G&0W~T9qgx|w>S0YBCVHml9h$;P38`)-FCA*RpWJ%*an*=fj|&h0G$SO2~fnd^5(G^0pp-qntS4=f8pqJvJAyT4a$PdWPb
z)WU*m6P}07-oNhIYNd(mzG&^fS8~zbj4`)YAWMz1-&
i!&X;4_wtYY{fsj2#pS;2N>2vnWd=`IKbLh*2~7YG*-PyJ
diff --git a/moduleUtil/src/main/res/mipmap-mdpi/muisc_switch.png b/moduleUtil/src/main/res/mipmap-mdpi/muisc_switch.png
deleted file mode 100644
index 1694e3c142ac5890599b0ffa7ad9f6b50f7e8904..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 730
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB<^=eJxB_W~^#uz1fv7=YdxgUO
z3WZ&z3j3>6cU39ussxGbu29(xB&!v6mMQP4RM=CgybGwNTxn00(vC8v-IYKE3VSP*
zc2_6?$(>b7yQ>s-mn-b91WJL_?5a@ORRv;zL_iG1-4%+vE0uRwD(n(WtEqFAFfcIg@^ojZMO3pB1$}KV!M)j2@H8)sWyhpVD5-d`>;ESO3q9?fGlj
z*=?>)d9EuUcwCIX@OH$fj>LNwl^|x2)t73cLvJ(@Cb;qa2N-j
zda1BN{_d0A>I|2djxcF5K5A@H+o@o);Lw@0|EM=B5z2oyE*yf1#M|w6K-1R|C
z$g<}X_w-(tdm@YXx^V6}-Ms4CtH$XY6dt*8o;f_vPJ6$nPtM(Y@B9+{Ik)ZFJMF-_
z^p;eG4f@fCg1CEh5?3---QTw1gQI)Ijs?%TxP{-y#3Vj!tP)gTe~DWM4f8eTRt
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
index 9e76a14a..748be4a0 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
@@ -11,6 +11,8 @@ public class RoomSettingContacts {
void changeRoomSuccess(String s,int position,RoomSettingBean bean);
void changeRoomType(String s);
+
+ void agreeSong(String s);
}
public interface IRoomPre extends IPresenter {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
index 767560d6..bd400ae4 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
@@ -380,11 +380,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment(mView);
+ }
+ MvpRef.get().agreeSong(s);
}
});
}
diff --git a/settings.gradle b/settings.gradle
index 7999babb..4bd88b77 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -63,3 +63,4 @@ include ':tuicore'
include ':moduleroom'
include ':Loadinglibrary'
+
diff --git a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
index da0c3499..0f107959 100644
--- a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
+++ b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
@@ -119,7 +119,7 @@ public class TUIC2CChatFragment extends TUIBaseChatFragment {
@Override
public boolean onMenuItemClick(android.view.MenuItem item) {
if ("举报".equals(item.getTitle())) {
- ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "https://vespa.qxyushen.top/h5/web/index.html#/pages/feedback/report?id=?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation();
+ ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "https://vespa.qxyushen.top/h5/web/index.html#/pages/feedback/report?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation();
return true;
}
return false;