Android修改，移除商家端，删除选择绿币提示

android/app/build.gradle

@@ -111,6 +111,8 @@ android {
         versionName flutterVersionName
 
         manifestPlaceholders = mfph
+
+        multiDexEnabled true
     }
 
     signingConfigs {

android/app/src/main/AndroidManifest.xml

@@ -43,6 +43,7 @@
             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">
@@ -113,5 +114,11 @@
             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/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lib/mine/mine_view/mine_item.dart

@@ -353,23 +353,7 @@ class _MineItem extends State<MineItem> {
 
               ///商家管理
               Expanded(
-                child: ExamineInstance.instance.isExamine ? Container():InkWell(
+                child: Container(),
-                  onTap: () {
-                    SharedPreferences.getInstance().then((value) {
-                      if (value.getString("account") == "" ||
-                          value.getString("password") == "") {
-                        Navigator.of(context).pushNamed('/router/business_login_page');
-                      } else {
-                        login(value.getString("account"),
-                            value.getString("password"));
-                      }
-                    });
-                  },
-                  child: mineItem(
-                    "商家管理",
-                    "assets/image/business.webp",
-                  ),
-                ),
               ),
               Expanded(
                 child: Container(),

lib/retrofit/min_api.dart

@@ -27,9 +27,8 @@ import 'data/shopping_home_config.dart';
 
 part 'min_api.g.dart';
 
-// const localBaseUrl = "http://192.168.10.54:8765/app/";///本地
+const localBaseUrl = "http://192.168.10.54:8765/app/";///本地
 // const localBaseUrl = "http://pos-test.api.lotus-wallet.com/app/";///测试
-const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
 
 

lib/retrofit/retrofit_api.dart

@@ -66,9 +66,8 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-// const localBaseUrl = "http://192.168.10.54:8766/app/";///本地
+const localBaseUrl = "http://192.168.10.54:8766/app/";///本地
 // const localBaseUrl = "http://platform.test.api.lotus-wallet.com/app/";///测试
-const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
 
 const ipBaseUrl = "http://whois.pconline.com.cn";

lib/settlement/settlement_view/pay_method.dart

@@ -188,16 +188,21 @@ class _PayMethod extends State<PayMethod> {
             onTap: () {
               setState(() {
                 checkIndex = 3;
-                if(widget.promotions != "" || widget.coupons != "" || widget.useVipPriceSelect || widget.useBenefitSelect){
+                // if(widget.promotions != "" || widget.coupons != "" || widget.useVipPriceSelect || widget.useBenefitSelect){
-                  SmartDialog.show(
+                //   print("discount-promotions: ${widget.promotions}");
-                      widget: SettlementTips(
+                //   print("discount-coupons: ${widget.coupons}");
-                            () {
+                //   print("discount-useVipPriceSelect: ${widget.useVipPriceSelect}");
-                        },
+                //   print("discount-useBenefitSelect: ${widget.useBenefitSelect}");
-                        text: "绿币支付不参与任何活动优惠，请重新选择支付方式",
+                //   SmartDialog.show(
-                      ));
+                //       widget: SettlementTips(
-                  return;
+                //             () {
-                }
+                //         },
+                //         text: "绿币支付不参与任何活动优惠，请重新选择支付方式",
+                //       ));
+                //   return;
+                // }
               });
+              print("discount-payChannelCheck: 5");
               widget.payChannelCheck(5);
             },
             child: Row(

lib/utils/upload_async.dart

@@ -5,9 +5,9 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:image_pickers/image_pickers.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:thumbnails/thumbnails.dart';
 
 import '../community/release_dynamic.dart';
 import '../retrofit/data/base_data.dart';
@@ -143,11 +143,15 @@ class UploadAsync {
                 await File(element.thumbPath).exists()) {
               thumbnail = element.thumbPath;
             } else {
-              thumbnail = await Thumbnails.getThumbnail(
+              var result = await ImageGallerySaver.saveFile(
-                videoFile: file.path,
+                file.path,
-                imageType: ThumbFormat.JPEG,
+                isReturnPathOfIOS: true,
-                quality: 10,
               );
+              if (result["isSuccess"] == true) {
+                thumbnail = element.thumbPath;
+              } else {
+                thumbnail = element.thumbPath;
+              }
             }
             if (thumbnail != null &&
                 thumbnail != "" &&

pubspec.yaml

@@ -88,7 +88,7 @@ dependencies:
 
   photo_view: ^0.13.0
   video_player: ^2.2.3
-  thumbnails: ^1.0.1
+  # thumbnails: ^1.0.1
   #  media_info: ^0.9.0
   #  flutter_ffmpeg: ^0.4.2