feat:调通微信支付

lib/app.dart

@@ -14,6 +14,7 @@ import 'package:star_lock/tools/appFirstEnterHandle.dart';
 import 'package:star_lock/tools/app_manager.dart';
 import 'package:star_lock/tools/bindings/app_binding.dart';
 import 'package:star_lock/tools/customer_tool.dart';
+import 'package:star_lock/tools/pay/wx_pay_tool.dart';
 import 'package:star_lock/tools/storage.dart';
 
 import 'package:star_lock/translations/app_dept.dart';
@@ -117,7 +118,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
         getPages: AppRouters.routePages,
         builder: EasyLoading.init(),
         initialBinding: AppBindings(),
-        initialRoute: initialRoute );
+        initialRoute: initialRoute);
   }
 
   @override
@@ -178,4 +179,5 @@ Future<void> getAgreePrivacyShowUpdate() async {
 Future<void> getAppInfo() async {
   final GetAppInfo entity = await ApiRepository.to.getAppInfo();
   CustomerTool.init(entity.data?.wechatServiceUrl ?? '');
-}
+  WxPayTool.associationUrl = entity.data?.appSiteUrl ?? '';
+}

lib/login/login/app_get_version.dart

@@ -28,13 +28,16 @@ class GetAppInfo {
 class Data {
   Data.fromJson(Map<String, dynamic> json) {
     wechatServiceUrl = json['wechat_service_url'];
+    appSiteUrl = json['app_site_url'];
   }
 
   String? wechatServiceUrl;
+  String? appSiteUrl;
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = <String, dynamic>{};
     data['wechat_service_url'] = wechatServiceUrl;
+    data['app_site_url'] = appSiteUrl;
     return data;
   }
 }

lib/main/lockMian/lockMain/lockMain_page.dart

@@ -33,7 +33,7 @@ class StarLockMainPage extends StatefulWidget {
   State<StarLockMainPage> createState() => _StarLockMainPageState();
 }
 
-class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
+class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget ,AutomaticKeepAliveClientMixin {
   final logic = Get.put(LockMainLogic());
   final state = Get.find<LockMainLogic>().state;
 
@@ -265,8 +265,10 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
 
   @override
   void dispose() {
-    // TODO: implement dispose
     super.dispose();
     _teamEvent.cancel();
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }

lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart

@@ -26,6 +26,7 @@ class StarLockMainXHJPage extends StatefulWidget {
 
 class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
     with BaseWidget {
+  PageController _pageController = PageController();
 
   @override
   void initState() {
@@ -44,109 +45,70 @@ class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
         builder: (LockMainXHJLogic logic) {
           return Scaffold(
             backgroundColor: Colors.white,
-            body: Stack(
+            body: PageView(
+              controller: _pageController,
+              physics: const NeverScrollableScrollPhysics(), // 禁止滑动
               children: <Widget>[
-                pageView(
+                StarLockMainPage(
-                  widget: StarLockMainPage(
+                  showAppBar: false,
+                  showDrawer: false,
+                ),
+                SafeArea(
+                  bottom: false,
+                  child: LockMallPage(
+                    allowReturn: false,
+                  ),
+                ),
+                SafeArea(
+                  bottom: false,
+                  child: MessageListXHJPage(
                     showAppBar: false,
-                    showDrawer: false,
                   ),
-                  logic: logic,
-                  index: 0,
                 ),
-                pageView(
+                SafeArea(
-                  widget: SafeArea(
+                  bottom: false,
-                    bottom: false,
+                  child: MineSetPage(
-                    child: LockMallPage(
+                    showAppBar: false,
-                      allowReturn: false,
+                    showAbout: true,
-                    ),
                   ),
-                  logic: logic,
-                  index: 1,
-                ),
-                pageView(
-                  widget: SafeArea(
-                    bottom: false,
-                    child: MessageListXHJPage(
-                      showAppBar: false,
-                    ),
-                  ),
-                  logic: logic,
-                  index: 2,
-                ),
-                pageView(
-                  widget: SafeArea(
-                    bottom: false,
-                    child: MineSetPage(
-                      showAppBar: false,
-                      showAbout: true,
-                    ),
-                  ),
-                  logic: logic,
-                  index: 3,
                 ),
               ],
             ),
-            bottomNavigationBar: Container(
+            bottomNavigationBar: buildBottomNavigationBar(logic),
-              padding: EdgeInsets.only(
-                  top: 20.h, bottom: GetPlatform.isAndroid ? 20.h : 0),
-              decoration: const BoxDecoration(
-                color: Colors.transparent,
-                border: Border(
-                  top: BorderSide(
-                    color: Colors.black, // 设置边框颜色
-                    width: 0.3, // 设置边框宽度
-                  ),
-                ),
-              ),
-              child: SafeArea(
-                top: false,
-                child: Row(
-                  children: <Widget>[
-                    navigationBarItem(Icons.key,
-                        TranslationLoader.lanKeys!.device!.tr, logic, 0, () {
-                      logic.setIndex(0);
-                    }),
-                    navigationBarItem(Icons.shopping_cart, '商城'.tr, logic, 1,
-                        () {
-                      logic.setIndex(1);
-                    }),
-                    navigationBarItem(Icons.message,
-                        TranslationLoader.lanKeys!.message!.tr, logic, 2, () {
-                      logic.setIndex(2);
-                    }),
-                    navigationBarItem(Icons.account_circle, '我的'.tr, logic, 3,
-                        () {
-                      logic.setIndex(3);
-                    }),
-                  ],
-                ),
-              ),
-            ),
           );
         });
   }
 
-  //布局
+  Widget buildBottomNavigationBar(LockMainXHJLogic logic) {
-  Widget pageView(
+    return Container(
-      {required Widget widget,
+      padding:
-      required LockMainXHJLogic logic,
+          EdgeInsets.only(top: 20.h, bottom: GetPlatform.isAndroid ? 20.h : 0),
-      required int index}) {
+      decoration: const BoxDecoration(
-    return Positioned.fill(
+        color: Colors.transparent,
-      child: Offstage(
+        border: Border(top: BorderSide(color: Colors.black, width: 0.3)),
-        offstage: logic.state.index != index,
+      ),
-        child: widget,
+      child: SafeArea(
+        top: false,
+        child: Row(
+          children: <Widget>[
+            navigationBarItem(logic, Icons.key, '设备'.tr, 0),
+            navigationBarItem(logic, Icons.shopping_cart, '商城'.tr, 1),
+            navigationBarItem(logic, Icons.message, '消息'.tr, 2),
+            navigationBarItem(logic, Icons.account_circle, '我的'.tr, 3),
+          ],
+        ),
       ),
     );
   }
 
-  //底部按钮
+  Widget navigationBarItem(
-  Widget navigationBarItem(IconData icon, String text, LockMainXHJLogic logic,
+      LockMainXHJLogic logic, IconData icon, String text, int index) {
-      int index, GestureTapCallback? onTop) {
-    final bool check = logic.state.index == index;
     return Expanded(
       child: GestureDetector(
-        onTap: onTop,
+        onTap: () {
+          _pageController.jumpToPage(index);
+          logic.setIndex(index);
+        },
         child: Container(
           color: Colors.transparent,
           child: Column(
@@ -157,16 +119,18 @@ class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
                 child: Icon(
                   icon,
                   size: 32.r,
-                  color:
+                  color: logic.state.index == index
-                      check ? AppColors.mainColor : AppColors.darkGrayTextColor,
+                      ? AppColors.mainColor
+                      : AppColors.darkGrayTextColor,
                 ),
               ),
               Text(
                 text,
                 style: TextStyle(
                   fontSize: 16.sp,
-                  color:
+                  color: logic.state.index == index
-                      check ? AppColors.mainColor : AppColors.darkGrayTextColor,
+                      ? AppColors.mainColor
+                      : AppColors.darkGrayTextColor,
                 ),
               ),
             ],

lib/mine/mall/lockMall_logic.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluwx/fluwx.dart';
 import 'package:get/get.dart';
@@ -25,13 +26,12 @@ class LockMallLogic extends BaseGetXController {
 
   //获取商城跳转地址
   Future<void> getMallURLRequest() async {
-    LockMallDataEntity entity = await ApiRepository.to.getMallURLData();
+    final LockMallDataEntity entity = await ApiRepository.to.getMallURLData();
     if (entity.errorCode!.codeIsSuccessful) {
       state.lockMallUrl.value = entity.data!.url!;
       state.mallWebView.setNavigationDelegate(
         NavigationDelegate(
           onProgress: (int progress) {
-            // Update loading bar.
             state.webProgress.value = progress / 100;
           },
           onPageStarted: (String url) {
@@ -40,6 +40,7 @@ class LockMallLogic extends BaseGetXController {
           onPageFinished: (String url) {
             state.webProgress.value = 1.0;
             refreshGoBack();
+            update();
           },
           onWebResourceError: (WebResourceError error) {},
           onNavigationRequest: (NavigationRequest request) async {
@@ -53,27 +54,24 @@ class LockMallLogic extends BaseGetXController {
         ),
       );
       state.mallWebView.loadRequest(Uri.parse(state.lockMallUrl.value));
-      // FlutterBridge.postMessage({action:'',data:'{}',callFun:'回调给js的方法'})
       state.mallWebView.addJavaScriptChannel(
-        "FlutterBridge",
+        'FlutterBridge',
         onMessageReceived: (JavaScriptMessage message) async {
           flutterBridge(message);
         },
       );
-      // onMessageReceived
     }
   }
 
   //监听webview的调用
   Future<void> flutterBridge(JavaScriptMessage message) async {
     final dynamic obj = json.decode(message.message);
-    AppLog.log(obj.toString());
     if (obj is! Map && obj['action'] is String) {
       return;
     }
-    String action = obj['action'];
+    final String action = obj['action'];
-    dynamic data = obj['data'];
+    final dynamic data = obj['data'];
-    String? callFun = obj['callFun'];
+    final String? callFun = obj['callFun'];
     switch (action) {
       case 'WechatPayParams':
         //微信支付
@@ -84,9 +82,9 @@ class LockMallLogic extends BaseGetXController {
 
   //微信支付
   Future<void> wxPay(dynamic data, String? callFun) async {
-    WxPayTool.pay(WxPayTool.mapToPayment(data), (response) {
+    WxPayTool.pay(WxPayTool.mapToPayment(data), (WeChatResponse response) {
       if (response is WeChatPaymentResponse) {
-        Map data = {
+        final Map data = <String, dynamic>{
           'type': response.type,
           'extData': response.extData,
           'errCode': response.errCode,
@@ -101,7 +99,7 @@ class LockMallLogic extends BaseGetXController {
 
   //判断webview 是否可以有路由可以回退，无则退出当前页面
   Future<bool> canGoBack(bool didPop) async {
-    bool canGoBack = await state.mallWebView.canGoBack();
+    final bool canGoBack = await state.mallWebView.canGoBack();
     bool isMall = true;
     if (Get.isRegistered<LockMainXHJLogic>() && F.isXHJ) {
       isMall = Get.find<LockMainXHJLogic>().isMall;
@@ -131,7 +129,7 @@ class LockMallLogic extends BaseGetXController {
     if (state.allowReturn) {
       return;
     }
-    state.mallWebView.canGoBack().then((value) {
+    state.mallWebView.canGoBack().then((bool value) {
       state.canGoBack = value;
       update();
     });

lib/mine/mall/lockMall_page.dart

@@ -17,7 +17,7 @@ class LockMallPage extends StatefulWidget {
   State<LockMallPage> createState() => _LockMallPageState();
 }
 
-class _LockMallPageState extends State<LockMallPage> {
+class _LockMallPageState extends State<LockMallPage> with AutomaticKeepAliveClientMixin {
   @override
   void initState() {
     super.initState();
@@ -25,8 +25,8 @@ class _LockMallPageState extends State<LockMallPage> {
 
   @override
   Widget build(BuildContext context) {
-    // FIXME 如果未登录状态，应先跳转登录页
+    // 如果未登录状态，应先跳转登录页
-    // FIXME url应该使用接口获取，接口名称 “获取商城跳转地址：/mall/getUrl“ POST请求，无参数，需要登录
+    // url应该使用接口获取，接口名称 “获取商城跳转地址：/mall/getUrl“ POST请求，无参数，需要登录
     // String url = 'https://ge.mall.star-lock.cn/quick_login?id=4&key=1ffb9d37109b8351ebb04ccfcca02c8e';
     return GetBuilder<LockMallLogic>(
         init: LockMallLogic(allowReturn: widget.allowReturn),
@@ -55,7 +55,7 @@ class _LockMallPageState extends State<LockMallPage> {
                     PopScope(
                       onPopInvoked: logic.canGoBack,
                       canPop: false,
-                      child: SizedBox(),
+                      child: const SizedBox(),
                     ),
                     Container(
                       padding: EdgeInsets.only(bottom: 10.w),
@@ -76,10 +76,13 @@ class _LockMallPageState extends State<LockMallPage> {
   }
 
   String getWebTitle(LockMallLogic logic) {
-    String webTitleStr = "配件商城".tr;
+    String webTitleStr = '配件商城'.tr;
     logic.state.mallWebView.getTitle().then((result) {
       webTitleStr = result!;
     });
     return webTitleStr;
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }

lib/mine/message/messageList/messageList_xhj_page.dart

@@ -25,7 +25,7 @@ class MessageListXHJPage extends StatefulWidget {
 }
 
 class _MessageListXHJPageState extends State<MessageListXHJPage>
-    with TickerProviderStateMixin {
+    with TickerProviderStateMixin ,AutomaticKeepAliveClientMixin {
   final MessageListLogic logic = Get.put(MessageListLogic());
   final MessageListState state = Get.find<MessageListLogic>().state;
 
@@ -257,4 +257,7 @@ class _MessageListXHJPageState extends State<MessageListXHJPage>
       ),
     );
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }

lib/mine/mineSet/mineSet/mineSet_page.dart

@@ -29,7 +29,8 @@ class MineSetPage extends StatefulWidget {
   State<MineSetPage> createState() => _MineSetPageState();
 }
 
-class _MineSetPageState extends State<MineSetPage> with WidgetsBindingObserver {
+class _MineSetPageState extends State<MineSetPage>
+    with WidgetsBindingObserver, AutomaticKeepAliveClientMixin {
   final MineSetLogic logic = Get.put(MineSetLogic());
   final MineSetState state = Get.find<MineSetLogic>().state;
 
@@ -590,4 +591,7 @@ class _MineSetPageState extends State<MineSetPage> with WidgetsBindingObserver {
     WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }

lib/tools/pay/wx_pay_tool.dart

@@ -5,8 +5,10 @@ import 'package:fluwx/fluwx.dart';
 ///
 ///
 class WxPayTool {
-  static bool isInit = false;
   static Fluwx fluwx = Fluwx();
+  static bool isInit = false;
+  static String associationUrl = '';
+
 
   static init(String appId, String universalLink) {
     fluwx.registerApi(appId: appId, universalLink: universalLink);
@@ -15,7 +17,7 @@ class WxPayTool {
   static Future<void> pay(Payment payment, WeChatResponseSubscriber listener) async {
     if (!isInit) {
       isInit = true;
-      await init(payment.appId, 'https://lock.skychip.top/apple-app-site-association.json');
+      await init(payment.appId, associationUrl);
       //回调
       responseListener(WeChatResponse response) {
         if (response is WeChatPaymentResponse) {
@@ -30,7 +32,7 @@ class WxPayTool {
   }
 
   static Payment mapToPayment(dynamic data) {
-    Payment payment = Payment(
+    final Payment payment = Payment(
       appId: data['appId'],
       partnerId: data['partnerId'],
       prepayId: data['prepayId'],