YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'branch_new_dev' into branch_new

Browse Source
This commit is contained in:
骆召亮
2025-12-01 09:06:39 +08:00
parent 94a55bafea 050c9dcb8b
commit fd9af6a253
9 changed files with 41 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
View File

@@ -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();
initialization();

9
BaseModule/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
View File

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

10
MainModule/src/main/AndroidManifest.xml
View File

@@ -210,6 +210,16 @@
android:name=".service.CancelNoticeService"
android:enabled="true"
android:exported="true" />
<!-- <provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>-->
</application>
</manifest>

8
MainModule/src/main/res/color/select_item_text.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 按下状态：文本颜色为深色 -->
<item android:state_pressed="true" android:color="#FF333333" />
<!-- 默认状态：文本颜色为白色 -->
<item android:color="@android:color/white" />
</selector>

23
MainModule/src/main/res/xml/file_paths.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<!-- Environment.getExternalStorageDirectory()-->
<external-path
name="external-path"
path="."/>
<!-- Context.getExternalCacheDir() -->
<external-cache-path
name="external-cache-path"
path="."/>
<!-- Context.getExternalFilesDir(null) -->
<external-files-path
name="external-files-path"
path="."/>
<!-- Context.getFilesDir() -->
<files-path
name="files_path"
path="."/>
<root-path
name="name"
path="."/>
</paths>

6
app/build.gradle
View File

@@ -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"
]
}
}

19
app/src/main/AndroidManifest.xml
View File

@@ -202,15 +202,16 @@
android:exported="true"
/>
<!-- <provider-->
<!-- android:name="androidx.core.content.FileProvider"-->
<!-- android:authorities="${applicationId}.fileprovider"-->
<!-- android:exported="false"-->
<!-- android:grantUriPermissions="true">-->
<!-- <meta-data-->
<!-- android:name="android.support.FILE_PROVIDER_PATHS"-->
<!-- android:resource="@xml/file_paths" />-->
<!-- </provider>-->
<!--<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>-->
</application>
<!-- <queries>-->

26
app/src/main/res/xml/file_paths.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<!-- Environment.getExternalStorageDirectory()-->
<external-path
name="external-path"
path="."/>
<!-- Context.getExternalCacheDir() -->
<external-cache-path
name="external-cache-path"
path="."/>
<!-- Context.getExternalFilesDir(null) -->
<external-files-path
name="external-files-path"
path="."/>
<!-- Context.getFilesDir() -->
<files-path
name="files_path"
path="."/>
<!-- Context.getCacheDir() -->
<cache-path
name="cache-path"
path="."/>
<root-path
name="name"
path="."/>
</paths>

4
gradle.properties
View File

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