Merge remote-tracking branch 'origin/dev'

 Conflicts:

	lib/community/community_view/community_dynamic.dart

	lib/settlement/settlement.dart

	lib/settlement/settlement_view/activity_coupon_remarks.dart

README.md

@@ -16,7 +16,7 @@ For help getting started with Flutter, view our
 samples, guidance on mobile development, and a full API reference.
 
 
-
+#1.0
 
 登录页
   发送验证码
@@ -64,3 +64,29 @@ samples, guidance on mobile development, and a full API reference.
         订单详情 （订单生成时间）
             取消订单
             取件码
+
+#说明：
+    huixiang_app/pubspec.yaml #依赖
+    
+    接口build 依赖（注释了） 命令： 项目根目录 >  flutter pub run build_runner build
+                    #  retrofit_generator: ^1.4.1+3
+                    #  build_runner: ^1.11.5
+                    #  json_serializable: ^3.5.1
+                    
+    http接口需要build生成   需要上面3个依赖
+    min_api.dart   调用小程序的接口 
+    retrofit_api.dart   调用app的接口
+    
+    main.dart   程序入口   三方sdk初始化     路由
+    
+    华为开放平台  15827991714  密码： fmk7895123654 (有问题➕手机号码微信)
+    
+    小米开放平台      83364300@qq.com        具体问 ：（汪姐）
+    
+    推送：使用腾讯云推送 tpns 需扫码登录 （有问题同华为➕微信｜｜或重新注册账号替换相关appKey）
+    
+    https://pos.platform.lotus-wallet.com/app/ 生产环境
+    http://192.168.10.236:8765/app/             测试环境
+    https://pos.platform.lotus-wallet.com/app/  生产环境
+    http://192.168.10.236:8766/app/             测试环境
+    

android/app/build.gradle

@@ -36,7 +36,6 @@ MobSDK {
 
     ShareSDK {
 
-        // platform configuration information
         devInfo {
             Wechat {
                 id 4
@@ -111,10 +110,9 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
-
         ndk {
             /// 选择要添加的对应.so 库。
-            abiFilters 'armeabi-v7a', 'arm64-v8a'
+            abiFilters 'armeabi-v7a', 'arm64-v8a','x86'
         }
 
         manifestPlaceholders = mfph
@@ -192,6 +190,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     implementation 'com.alibaba:fastjson:1.2.54'
 
+    implementation 'com.tencent.tpns:xiaomi:1.2.7.1-release'
+
     implementation 'com.tencent.tpns:huawei:1.2.6.0-release'
     // HMS Core Push 模块依赖包
     implementation 'com.huawei.hms:push:5.3.0.304'

android/app/src/main/AndroidManifest.xml

@@ -100,8 +100,7 @@
 
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+            android:screenOrientation="portrait"/>
 
         <activity
             android:name="io.dcloud.PandoraEntryActivity"

android/app/src/main/assets/data/dcloud_control.xml

@@ -1,4 +1,4 @@
-<hbuilder version="1.9.9.80110" debug="false" syncDebug ="false">
+<hbuilder version="1.9.9.80110" debug="false" syncDebug="false">
     <apps>
         <app appid="__UNI__ACD00DA" appver="1.0"/>
         <app appid="__UNI__E60E056" appver="1.0"/>

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

@@ -24,7 +24,7 @@ class MinPlugin: FlutterPlugin, MethodCallHandler {
   /// This local reference serves to register the plugin with the Flutter Engine and unregister it
   /// when the Flutter Engine is detached from the Activity
   private lateinit var channel : MethodChannel
-  private lateinit var context : Context;
+  private lateinit var context : Context
 
   override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
     context = flutterPluginBinding.applicationContext;
@@ -44,7 +44,7 @@ class MinPlugin: FlutterPlugin, MethodCallHandler {
                 .setMenuDefFontColor("#000000")
                 .setMenuDefFontWeight("normal")
                 .setMenuActionSheetItems(sheetItems)
-                .setEnableBackground(true)
+                .setEnableBackground(false) //后台运行
                 .build()
         DCUniMPSDK.getInstance().initialize(context, config) {
           result.success(it)
@@ -60,6 +60,7 @@ class MinPlugin: FlutterPlugin, MethodCallHandler {
         }
         DCUniMPSDK.getInstance().setUniMPOnCloseCallBack {
           Logger.e("用户点击了退出 it: $it")
+          DCUniMPSDK.getInstance().closeCurrentApp()
         }
       }
     } else if (call.method == "isInitialize") {

android/app/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--自定义配置分享文件目录访问权限-->
+    <external-path name="sample-external-path" path="/"/>
+    <files-path name="sample-files-path" path="/"/>
+</paths>