Merge branch 'refs/heads/wr_2024_invoice' into wr_202303

# Conflicts:
#	assets/image/2x/icon_search.webp
#	assets/image/3x/icon_search.webp
#	assets/image/icon_search.webp
#	lib/generated/intl/messages_en.dart
#	lib/generated/intl/messages_en_US.dart
#	lib/generated/intl/messages_zh_CN.dart
#	lib/generated/intl/messages_zh_Hans_CN.dart
#	lib/generated/intl/messages_zh_Hant_CN.dart
#	lib/generated/intl/messages_zh_TW.dart
#	lib/union/location_map_page.dart

README.md

@@ -85,6 +85,9 @@ samples, guidance on mobile development, and a full API reference.
     
     推送：使用腾讯云推送 tpns 需扫码登录 （有问题同华为➕微信｜｜或重新注册账号替换相关appKey）
 
+    友盟： wu_rong  密码:Zxc09876
+
+    
     https://pos.platform.lotus-wallet.com/app/ 生产环境
     http://192.168.10.236:8765/app/             测试环境
     https://pos.platform.lotus-wallet.com/app/  生产环境

android/app/build.gradle

@@ -106,11 +106,13 @@ android {
     defaultConfig {
         applicationId "com.zsw.huixiang"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
         manifestPlaceholders = mfph
+
+        multiDexEnabled true
     }
 
     signingConfigs {
@@ -166,6 +168,10 @@ android {
         exclude 'assets/main_icon_zoomin.png'
         exclude 'assets/cfg/a/mode_1/reduct.sty'
         exclude 'assets/SDK_Default_Traffic_Texture_SevereCongestion.png'
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
     }
     aaptOptions {
         additionalParameters '--auto-add-overlay'

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.zsw.huixiang">
 
 <!--    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>-->
@@ -35,13 +36,14 @@
     </queries>
 
     <application
-        android:label="一心回乡"
+        android:label="海峡姐妹"
         android:name=".HxApplication"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
@@ -102,38 +104,21 @@
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"/>
 
-        <activity
-            android:name="io.dcloud.PandoraEntryActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize|mcc|mnc|fontScale|keyboard"
-            android:hardwareAccelerated="true"
-            android:launchMode="singleTask"
-            android:permission="com.miui.securitycenter.permission.AppPermissionsEditor"
-            android:screenOrientation="user"
-            android:theme="@style/DCloudTheme"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <action android:name="android.intent.action.VIEW" />
-                <data android:scheme="h56131bcf" />
-            </intent-filter>
-        </activity>
-
         <service android:name="com.amap.api.location.APSService"/>
-        <meta-data
-            android:name="dcloud_appkey"
-            android:value="" />
+
         <meta-data
             android:name="com.amap.api.v2.apikey"
             android:value="f39d1daa020a56f208eb2519f63e9534"/>
 
-        <meta-data
-            android:name="com.baidu.lbsapi.API_KEY"
-            android:value="cdM5EPFACARrrHRjCwUEoYuzIlfFWdYP" />
-
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
 
+        <receiver android:name="com.huawei.hms.support.api.push.PushMsgReceiver"
+            android:exported="true"/>
+
+        <receiver android:name="com.huawei.hms.support.api.push.PushReceiver"
+            android:exported="true"/>
+
     </application>
 </manifest>

android/app/src/main/kotlin/com/zsw/huixiang/HxApplication.kt

@@ -1,9 +1,9 @@
 package com.zsw.huixiang
 
 import android.app.Application
-import com.baidu.mapapi.base.BmfMapApplication
 
-class HxApplication : BmfMapApplication() {
+
+class HxApplication : Application() {
 
 
     override fun onCreate() {

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.0'
+    ext.kotlin_version = '1.7.10'
     repositories {
         maven {
             url 'https://maven.aliyun.com/repository/google'
@@ -8,11 +8,13 @@ buildscript {
             url 'https://maven.aliyun.com/repository/jcenter'
         }
         maven {
+            allowInsecureProtocol = true
             url 'http://maven.aliyun.com/nexus/content/groups/public'
         }
 //        google()
 //        jcenter()
         maven {
+            allowInsecureProtocol = true
             url "http://mvn.mob.com/android"
         }
         maven { url "https://www.jitpack.io" }
@@ -22,7 +24,7 @@ buildscript {
 
     dependencies {
 //        classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.huawei.agconnect:agcp:1.4.1.300'
         classpath 'com.mob.sdk:MobSDK:+'
@@ -43,11 +45,13 @@ allprojects {
             url 'https://maven.aliyun.com/repository/jcenter'
         }
         maven {
+            allowInsecureProtocol = true
             url 'http://maven.aliyun.com/nexus/content/groups/public'
         }
 //        google()
 //        jcenter()
         maven {
+            allowInsecureProtocol = true
             url "http://mvn.mob.com/android"
         }
         maven { url "https://www.jitpack.io" }

android/gradle.properties

@@ -1,6 +1,10 @@
-#org.gradle.jvmargs=-Xmx1536M
-org.gradle.jvmargs=-Xmx4096m 
+org.gradle.jvmargs=-Xmx1536M
+#org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
 MobSDK.mobEnv=x
 MobSDK.spEdition=FP
+android.injected.testOnly=false
+#org.gradle.jvmargs=-Xmx1536M --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
+
+

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,10 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-#distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
-#distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
-systemProp.http.proxyHost=proxy.com
-systemProp.http.proxyPort=8080