重连延迟

拍照更改

README.md

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

android/app/build.gradle

@@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 apply plugin: 'com.mob.sdk'
 
-apply plugin: 'com.huawei.agconnect'
+//apply plugin: 'com.huawei.agconnect'
 
 MobSDK {
     appKey "m33ee7650da86a"
@@ -90,7 +90,7 @@ def mfph = [
 ]
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -106,16 +106,13 @@ android {
     defaultConfig {
         applicationId "com.zsw.huixiang"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
-        ndk {
-            /// 选择要添加的对应.so 库。
-            abiFilters 'armeabi-v7a', 'arm64-v8a','x86'
-        }
-
         manifestPlaceholders = mfph
+
+        multiDexEnabled true
     }
 
     signingConfigs {
@@ -145,6 +142,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 +154,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'
+            }
         }
     }
 
@@ -161,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'
@@ -179,7 +190,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'
@@ -192,7 +203,7 @@ dependencies {
 
     implementation 'com.tencent.tpns:xiaomi:1.2.7.1-release'
 
-    implementation 'com.tencent.tpns:huawei:1.2.6.0-release'
+//    implementation 'com.tencent.tpns:huawei:1.2.6.0-release'
     // HMS Core Push 模块依赖包
-    implementation 'com.huawei.hms:push:5.3.0.304'
+//    implementation 'com.huawei.hms:push:5.3.0.304'
 }

android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,12 @@
 <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"/>
+<!--    <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,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/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,6 +1,9 @@
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.8.10'
     repositories {
+        maven { url "https://www.jitpack.io" }
+        maven {url 'https://developer.huawei.com/repo/'}
+        maven { url 'https://repo1.maven.org/maven2/' }
         maven {
             url 'https://maven.aliyun.com/repository/google'
         }
@@ -8,26 +11,25 @@ buildscript {
             url 'https://maven.aliyun.com/repository/jcenter'
         }
         maven {
+            allowInsecureProtocol = true
             url 'http://maven.aliyun.com/nexus/content/groups/public'
         }
-//        google()
-//        jcenter()
-        jcenter(){
-            url "http://jcenter.bintray.com/"
-        }
         maven {
+            allowInsecureProtocol = true
             url "http://mvn.mob.com/android"
         }
-        maven { url "https://www.jitpack.io" }
-        maven {url 'https://developer.huawei.com/repo/'}
+        maven { url 'https://developer.huawei.com/repo/' }
     }
 
     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.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.huawei.agconnect:agcp:1.4.1.300'
+//        classpath 'com.huawei.agconnect:agcp:1.4.1.300'
         classpath 'com.mob.sdk:MobSDK:+'
+        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'
     }
 }
 
@@ -37,18 +39,14 @@ allprojects {
             url 'https://maven.aliyun.com/repository/google'
         }
         maven {
-            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" }
-        maven { url 'https://developer.huawei.com/repo/'}
+        google()
     }
 }
 
@@ -58,6 +56,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -1,5 +1,7 @@
 #org.gradle.jvmargs=-Xmx1536M
-org.gradle.jvmargs=-Xmx4096m 
+org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
-MobSDK.mobEnv=x
+MobSDK.mobEnv=x
+MobSDK.spEdition=FP
+android.injected.testOnly=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +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.6.3-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

android/tmpmob/ShareSDK/assets/ShareSDK.xml

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