From cb0b4f34f96321cfd6ccfa98b38fa4bc7008f3f3 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 28 Nov 2025 11:10:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4provider?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
MainModule/src/main/AndroidManifest.xml | 4 ++--
MainModule/src/main/res/xml/file_paths.xml | 23 -------------------
app/build.gradle | 6 +++--
app/src/main/AndroidManifest.xml | 4 ++--
app/src/main/res/xml/file_paths.xml | 26 ----------------------
5 files changed, 8 insertions(+), 55 deletions(-)
delete mode 100644 MainModule/src/main/res/xml/file_paths.xml
delete mode 100644 app/src/main/res/xml/file_paths.xml
diff --git a/MainModule/src/main/AndroidManifest.xml b/MainModule/src/main/AndroidManifest.xml
index 801888ef..f3a67668 100644
--- a/MainModule/src/main/AndroidManifest.xml
+++ b/MainModule/src/main/AndroidManifest.xml
@@ -209,7 +209,7 @@
-
-
+ -->
\ No newline at end of file
diff --git a/MainModule/src/main/res/xml/file_paths.xml b/MainModule/src/main/res/xml/file_paths.xml
deleted file mode 100644
index 62e2dca1..00000000
--- a/MainModule/src/main/res/xml/file_paths.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 6f4b190b..3bd02324 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,8 @@ android {
// 【正式版图标】替换manifest中的占位符（使用main目录下的正式图标）
manifestPlaceholders = [
- appIcon: "@mipmap/ic_launcher" // 需在main/res/mipmap放置该图标
+ appIcon: "@mipmap/ic_launcher", // 需在main/res/mipmap放置该图标
+ fileProviderAuthority: "com.qxcm.qxlive.provider"
]
}
@@ -80,7 +81,8 @@ android {
//
// // 【测试版图标】替换为测试专用图标
manifestPlaceholders = [
- appIcon: "@mipmap/ic_launcher_app_bat" // 需在main/res/mipmap放置该图标
+ appIcon: "@mipmap/ic_launcher_app_bat", // 需在main/res/mipmap放置该图标
+ fileProviderAuthority: "com.qxcm.qxlive.beta.provider"
]
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a3ae9994..69b98171 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -202,7 +202,7 @@
android:exported="true"
/>
-
-
+ -->
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
deleted file mode 100644
index 91a79ed3..00000000
--- a/app/src/main/res/xml/file_paths.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From 050c9dcb8b173cf742e3a810c3ea84943f128641 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Mon, 1 Dec 2025 09:02:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9F=9F=E5=90=8D=20mqtt?=
=?UTF-8?q?=20H5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/xscm/moduleutil/base/CommonAppContext.java | 2 +-
.../xscm/moduleutil/utils/config/EnvironmentEnum.java | 9 ++++++---
gradle.properties | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 5505fc02..170922cb 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
//设置mqtt环境 false 测试环境 true 正式环境
// ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
//设置http环境 false 测试环境 true 正式环境
- ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
+ ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
index 2c5db5f9..9254b838 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
@@ -3,7 +3,8 @@ package com.xscm.moduleutil.utils.config;
public enum EnvironmentEnum {
// "https://vespa.qxyushen.top/",
PRODUCTION(//生产环境
- "https://vespa.qxyushen.top/",
+ //"https://vespa.qxyushen.top/",
+ "https://yushengapi.qxyushen.top/",
"KvNmqZc+VMzO4CfGMd5zmG6w6OFwpFO/19TwXUWfHDOBgmnl9DgIuE+kbrjNNnxqhtP3pH7bBrnSaSeFtunr72q6sgpLsfuswcUroMvz2slaTBcNzCaLi+GSnM3gB/GdO47mwLdk+iYBTvPUOCIuT608Z29z09w+vPeUDoMCHJBGXu6uh7Nj6PtV1dfGoUvByk1ZF0WYVjIqKDcb3tXY4jonFh3XAWhzMy8xKwN6F2nuK2IcdIwaSPsvuMZmhatP6f9kOE+vnfweyCHS3RxiG474WIoZGJM8omrl3/pOVqE=",
"https://oss-cn-beijing.aliyuncs.com/",
"LTAI5tKgrfcFQxH46ZwWYgFW",
@@ -13,8 +14,10 @@ public enum EnvironmentEnum {
"wxc7681513be9f926b",
1600096860,
"3e8f3add448d4692bc1d04c75ffe801b",
- "tcp://1.13.101.98",
- "https://vespa.qxyushen.top/h5",
+ //"tcp://1.13.101.98",
+ "tcp://1.13.20.30",
+ // "https://vespa.qxyushen.top/h5",
+ "https://yushengapi.qxyushen.top/h5",
0),
TEST(//测试环境
"https://test.vespa.qxyushen.top/",
diff --git a/gradle.properties b/gradle.properties
index 71918157..4ed857ad 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,8 +28,8 @@ isBuildModule=false
#org.gradle.deamon=false
android.injected.testOnly=false
-APP_VERSION_NAME=1.0.6.6
-APP_VERSION_CODE=55
+APP_VERSION_NAME=1.0.6.7
+APP_VERSION_CODE=56
org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15