From aee1d6cad43c5883f140b1b287cddfc81352c992 Mon Sep 17 00:00:00 2001
From: 18142669586 <1669783059@qq.com>
Date: Mon, 17 Jul 2023 16:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml | 28 +++++++---------------------
 config.gradle                    | 12 ++++--------
 gradle.properties                |  8 ++++----
 3 files changed, 15 insertions(+), 33 deletions(-)

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">
 <!--        <service-->
 <!--            android:name="com.shayu.phonelive.utils.MyNotificationService">-->
@@ -133,20 +132,7 @@
 
                 <data android:scheme="smvslm" />
             </intent-filter>
-        </activity> <!-- keytool -exportcert -alias androiddebugkey -keystore feixiong.jks | openssl sha1 -binary | openssl base64 -->
-        <meta-data
-            android:name="TencentMapSDK"
-            android:value="${txMapAppKey}" />
-        <!-- 百度语音识别 -->
-        <meta-data
-            android:name="com.baidu.speech.APP_ID"
-            android:value="${baiduAppId}" />
-        <meta-data
-            android:name="com.baidu.speech.API_KEY"
-            android:value="${baiduAppKey}" />
-        <meta-data
-            android:name="com.baidu.speech.SECRET_KEY"
-            android:value="${baiduAppSecretKey}" />
+        </activity>
 
         <!-- 服务器地址 -->
         <meta-data
@@ -200,12 +186,12 @@
                 <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        <meta-data
-            android:name="com.huawei.hms.client.appid"
-            android:value="106936673"/>
-        <meta-data
-            android:name="com.huawei.hms.client.cpid"
-            android:value="30086000612391734"/>
+<!--        <meta-data-->
+<!--            android:name="com.huawei.hms.client.appid"-->
+<!--            android:value="106936673"/>-->
+<!--        <meta-data-->
+<!--            android:name="com.huawei.hms.client.cpid"-->
+<!--            android:value="30086000612391734"/>-->
     </application>
 
 </manifest>
\ 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