Merge remote-tracking branch 'origin/master'

# Conflicts:
#	config.gradle
This commit is contained in:
18401019693
2024-02-16 10:31:56 +08:00

View File

@@ -4,14 +4,14 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 33, targetSdkVersion : 33,
versionCode : 463, versionCode : 464,
versionName : "6.6.5" versionName : "6.6.5"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
// serverHost : " https://ceshi.yaoulive.com", //serverHost : "https://ceshi.yaoulive.com",
//百度语音识别 //百度语音识别