diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 63f16650e..c6e47c1a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -99,7 +99,6 @@ android:preserveLegacyExternalStorage="true" android:requestLegacyExternalStorage="true" android:theme="@style/AppTheme" - android:usesCleartextTraffic="true" tools:replace="theme,label,icon,allowBackup"> @@ -133,20 +132,7 @@ - - - - - - + - - + + + + + + \ No newline at end of file diff --git a/config.gradle b/config.gradle index b74e191c8..5bba46103 100644 --- a/config.gradle +++ b/config.gradle @@ -4,21 +4,18 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 21, targetSdkVersion : 31, - versionCode : 432, + versionCode : 436, versionName : "6.5.3" ] manifestPlaceholders = [ //正式、 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", // 测试 - serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https://ceshi.yaoulive.com", - //腾讯地图 - txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", -// txMapAppSecret : "", - //百度语音识别m + //百度语音识别 baiduAppId : "23774720", baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB", @@ -31,4 +28,3 @@ ext { isPluginModel : false, ] } -//7664 1 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e850a38e3..a5066c177 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,8 +19,8 @@ org.gradle.configureondemand=true android.useAndroidX=true android.enableJetifier=true -systemProp.http.proxyHost=127.0.0.1 -systemProp.https.proxyHost=127.0.0.1 -systemProp.https.proxyPort=10809 -systemProp.http.proxyPort=10809 +#systemProp.http.proxyHost=127.0.0.1 +#systemProp.https.proxyHost=127.0.0.1 +#systemProp.https.proxyPort=7890 +#systemProp.http.proxyPort=7890 #android.enableR8.fullMode=true \ No newline at end of file