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 + + + + + + (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;