From 8c75b80535bfac8544667437030d3d0dd56b8a42 Mon Sep 17 00:00:00 2001
From: 18142669586 <1669783059@qq.com>
Date: Mon, 19 Sep 2022 13:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=B7=E6=AD=8C=E6=95=8F=E6=84=9F=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                 | 15 ++++++++++++++-
 app/src/main/AndroidManifest.xml |  4 ++++
 build.gradle                     |  4 +++-
 common/build.gradle              |  1 +
 config.gradle                    |  8 ++++----
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2896af99a..f0660033f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 apply plugin: 'img-optimizer'
 apply plugin: 'com.google.gms.google-services'
-// 可根据需要选择性排除
 
 android {
     dexOptions {
         jumboMode = true
     }
+
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
     packagingOptions {
@@ -113,3 +113,16 @@ dependencies {
 
 
 }
+// 链接包需要注释掉 否正无法更新 谷歌包需要打开
+project.afterEvaluate {
+    android.applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            output.processResources.doFirst { pm->
+                String manifestPath = output.processResources.manifestFile;
+                def manifestContent = file(manifestPath).getText()
+                manifestContent = manifestContent.replace('android.permission.REQUEST_INSTALL_PACKAGES', '')
+                file(manifestPath).write(manifestContent)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f11913b70..fa41b4854 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,10 @@
     <uses-permission
         android:name="android.permission.MODIFY_AUDIO_SETTINGS"
         tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.REQUEST_INSTALL_PACKAGES"
+        tools:node="remove" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/build.gradle b/build.gradle
index 8597944f4..8be518f50 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,7 @@ buildscript {
 }
 
 
+
 allprojects {
     repositories {
         maven { url "https://maven.rongcloud.cn/repository/maven-releases/" }
@@ -42,4 +43,5 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}
+
diff --git a/common/build.gradle b/common/build.gradle
index 3f9c8d5dd..d917985ff 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -63,6 +63,7 @@ repositories {
     }
 }
 
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     api rootProject.ext.dependencies["appcompat-androidx"]
diff --git a/config.gradle b/config.gradle
index b0db8e5e2..28880e074 100644
--- a/config.gradle
+++ b/config.gradle
@@ -5,14 +5,14 @@ ext {
             minSdkVersion    : 21,
             targetSdkVersion : 30,
             versionCode      : 212,
-            versionName      : "6.4.1"
+            versionName      : "6.4.0"
     ]
     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",
@@ -25,6 +25,6 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false
-            isGooglePlay     :  true
+            isGooglePlay     :  false
     ]
 }
\ No newline at end of file