Merge remote-tracking branch 'origin/remove_uniapp' into remove_uniapp

外卖功能未开放;

android/app/build.gradle

@@ -90,7 +90,7 @@ def mfph = [
 ]
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -110,11 +110,6 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
-        ndk {
-            /// 选择要添加的对应.so 库。
-            abiFilters 'armeabi-v7a', 'arm64-v8a','x86'
-        }
-
         manifestPlaceholders = mfph
     }
 
@@ -145,6 +140,11 @@ android {
             minifyEnabled false
             signingConfig signingConfigs.config
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+            ndk {
+                /// 选择要添加的对应.so 库。
+                abiFilters 'armeabi-v7a','arm64-v8a','x86'
+            }
         }
         debug {
 //            debuggable true
@@ -152,6 +152,11 @@ android {
             minifyEnabled false
             signingConfig signingConfigs.config
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+            ndk {
+                /// 选择要添加的对应.so 库。
+                abiFilters 'armeabi-v7a', 'arm64-v8a','x86','x86_64'
+            }
         }
     }
 

android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.zsw.huixiang">
 
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+<!--    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"></uses-permission>
+<!--    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />-->
-    <uses-permission android:name="android.permission.READ_LOGS"></uses-permission>
+<!--    <uses-permission android:name="android.permission.READ_LOGS" />-->
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <!--允许程序打开网络套接字-->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -35,7 +35,7 @@
     </queries>
 
     <application
-        android:label="回乡"
+        android:label="一心回乡"
         android:name=".HxApplication"
         android:icon="@mipmap/ic_launcher">
         <activity

android/app/src/main/kotlin/com/zsw/huixiang/wxapi/WXPayEntryActivity.kt

@@ -22,7 +22,7 @@ class WXPayEntryActivity : AbsWXPayCallbackActivity() {
                 val wechatAppId = appInfo.metaData.getString("weChatAppId")
                 if (wechatAppId != null ){
                     WXAPiHandler.setupWxApi(wechatAppId, this)
-                    WXAPiHandler.setCoolBool(true)
+//                    WXAPiHandler.setCoolBool(true)
                     io.flutter.Log.d("fluwx", "weChatAppId:$wechatAppId")
                 }else {
                     io.flutter.Log.e("fluwx", "can't load meta-data weChatAppId")

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.6.0'
     repositories {
         maven {
             url 'https://maven.aliyun.com/repository/google'