该分支为 loading 更改版本；

# Conflicts:
#	lib/login/new_login_page.dart
#	lib/main.dart
#	lib/mine/mine_page.dart
#	lib/mine/mine_shop_details.dart
#	lib/retrofit/retrofit_api.dart
#	lib/setting/account_security_page.dart
#	lib/store/store_order.dart
#	lib/union/union_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

@@ -90,7 +90,7 @@ def mfph = [
 ]
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     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'
+            }
         }
     }
 
@@ -179,7 +184,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.6.5'
+//    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.6.5'
 
     implementation fileTree(include: ['*.aar'], dir: 'libs')
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

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.READ_LOGS"></uses-permission>
+<!--    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />-->
+<!--    <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/app/src/main/res/drawable-v21/launch_background.xml

@@ -4,22 +4,22 @@
     <item android:drawable="?android:colorBackground" />
 
     <!-- You can insert your own image assets here -->
-    <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/icon_splash_logo" />
-    </item>
+<!--    <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">-->
+<!--        <bitmap-->
+<!--            android:gravity="center"-->
+<!--            android:src="@mipmap/icon_splash_logo" />-->
+<!--    </item>-->
 
     <item android:width="130dp" android:height="30dp" android:bottom="80dp" android:gravity="bottom|center">
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/icon_splash_bottom" />
+            android:src="@mipmap/icon_splash2" />
     </item>
 
-    <item android:bottom="222dp" android:gravity="center">
+    <item android:bottom="107dp" android:gravity="center">
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/icon_splash_center" />
+            android:src="@mipmap/icon_splash1" />
     </item>
 
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -4,22 +4,22 @@
     <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
-    <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/icon_splash_logo" />
-    </item>
+<!--    <item android:width="100dp" android:height="100dp" android:bottom="153dp" android:gravity="bottom|center">-->
+<!--        <bitmap-->
+<!--            android:gravity="center"-->
+<!--            android:src="@mipmap/icon_splash_logo" />-->
+<!--    </item>-->
 
     <item android:width="130dp" android:height="30dp" android:bottom="80dp" android:gravity="bottom|center">
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/icon_splash_bottom" />
+            android:src="@mipmap/icon_splash2" />
     </item>
 
     <item android:bottom="107dp" android:gravity="center">
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/icon_splash_center" />
+            android:src="@mipmap/icon_splash1" />
     </item>
 
 <!--    <item>-->

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'
@@ -12,14 +12,12 @@ buildscript {
         }
 //        google()
 //        jcenter()
-        jcenter(){
-            url "http://jcenter.bintray.com/"
-        }
         maven {
             url "http://mvn.mob.com/android"
         }
         maven { url "https://www.jitpack.io" }
         maven {url 'https://developer.huawei.com/repo/'}
+        maven { url 'https://repo1.maven.org/maven2/' }
     }
 
     dependencies {
@@ -28,6 +26,11 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.huawei.agconnect:agcp:1.4.1.300'
         classpath 'com.mob.sdk:MobSDK:+'
+        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath fileTree(include:['*.jar'], dir:'libs')
+        classpath  'com.umeng.umsdk:common:9.4.7'
+        classpath  'com.umeng.umsdk:asms:1.4.0'
+        classpath  'com.umeng.umsdk:abtest:1.0.0'
     }
 }
 
@@ -49,6 +52,7 @@ allprojects {
         }
         maven { url "https://www.jitpack.io" }
         maven { url 'https://developer.huawei.com/repo/'}
+        maven { url 'https://repo1.maven.org/maven2/' }
     }
 }
 

android/gradle.properties

@@ -3,3 +3,4 @@ org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
 MobSDK.mobEnv=x
+MobSDK.spEdition=FP

android/gradle/wrapper/gradle-wrapper.properties

@@ -6,3 +6,5 @@ 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

android/tmpmob/ShareSDK/assets/ShareSDK.xml

@@ -55,4 +55,5 @@
 <Littleredbook Enable="false" />
 <Watermelonvideo Enable="false" />
 <Tiktok Enable="false" />
+<Taptap Enable="false" />
 </DevInfor>