From e07ac18bd99a4595d9c58e4248f35a64c3f7a1c1 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Tue, 11 Jun 2024 09:22:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 8196 -> 8196 bytes lib/app.dart | 6 +----- lib/main.dart | 9 +++++++- lib/mine/mineSet/mineSet/mineSet_page.dart | 20 +++++++++--------- .../starLockApplication.dart | 2 +- lib/tools/appFirstEnterHandle.dart | 2 ++ lib/tools/pay/wx_pay_tool.dart | 16 +++++++++----- lib/tools/storage.dart | 11 ++++++++++ 8 files changed, 44 insertions(+), 22 deletions(-) diff --git a/.DS_Store b/.DS_Store index 24c4d37f13efd083465bd6eb9f85faa57afc680b..2e1f43b30d6f6ee3763f1adbbe77a14a8a743420 100755 GIT binary patch delta 73 zcmZp1XmQw}D$KZj@*BZIHSy|dQ)3ey1tYUs9ffL3BLf`;6H}wwT22m8Wqs?Q`0SkA dy!_6|`-J5gyEfkw)@0etCh?tR^FI-GW&lK@7WDuC delta 42 ycmZp1XmQw}Dm?kMU>Uoav5tbNh2`Xh!qStQg;X{_5LRQ^%r5bbW%C~qc4h!Dwhiw9 diff --git a/lib/app.dart b/lib/app.dart index 0af65278..dfffaee3 100755 --- a/lib/app.dart +++ b/lib/app.dart @@ -176,8 +176,4 @@ Future getAgreePrivacyShowUpdate() async { } } -Future getAppInfo() async { - final GetAppInfo entity = await ApiRepository.to.getAppInfo(); - CustomerTool.init(entity.data?.wechatServiceUrl ?? ''); - WxPayTool.associationUrl = entity.data?.appSiteUrl ?? ''; -} + diff --git a/lib/main.dart b/lib/main.dart index 2399f005..612b0694 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,11 +4,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:star_lock/flavors.dart'; +import 'package:star_lock/login/login/app_get_version.dart'; import 'package:star_lock/mine/about/debug/debug_tool.dart'; import 'package:star_lock/network/api_provider.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/bugly/bugly_tool.dart'; +import 'package:star_lock/tools/customer_tool.dart'; import 'package:star_lock/tools/device_info_service.dart'; +import 'package:star_lock/tools/pay/wx_pay_tool.dart'; import 'package:star_lock/tools/platform_info_services.dart'; import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/tools/xs_jPhush.dart'; @@ -30,7 +33,11 @@ FutureOr main() async { final bool isLogin = await getLoginStatus(); if (isLogin) { await privacySDKInitialization(); - Future.delayed(const Duration(milliseconds: 500), getAppInfo); + Future.delayed(const Duration(milliseconds: 500), () async{ + final GetAppInfo entity = await ApiRepository.to.getAppInfo(); + CustomerTool.init(entity.data?.wechatServiceUrl ?? ''); + WxPayTool.setAssociationUrl(entity.data!.appSiteUrl!); + }); } WidgetsBinding.instance.addPostFrameCallback((_) async { diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart index a7cc2a16..6c15d874 100755 --- a/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -313,16 +313,16 @@ class _MineSetPageState extends State Navigator.pushNamed( context, Routers.aPPUnlockNeedMobileNetworkingLockPage); }), - if (!F.isLite) - CommonItem( - leftTitel: TranslationLoader.lanKeys!.valueAddedServices!.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.back(); - Get.toNamed(Routers.valueAddedServicesPage); - }, - ), + // if (!F.isLite) + CommonItem( + leftTitel: TranslationLoader.lanKeys!.valueAddedServices!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.back(); + Get.toNamed(Routers.valueAddedServicesPage); + }, + ), SizedBox( height: 10.h, ), diff --git a/lib/starLockApplication/starLockApplication.dart b/lib/starLockApplication/starLockApplication.dart index 21ec1b71..adc72d5d 100755 --- a/lib/starLockApplication/starLockApplication.dart +++ b/lib/starLockApplication/starLockApplication.dart @@ -40,7 +40,7 @@ class _StarLockApplicationState extends State { } else if (snapshot.hasData) { if (snapshot.data!) { // 如果用户已登录，返回主页面 - getAppInfo(); + // getAppInfo(); return F.sw( skyCall: () => StarLockMainPage(), xhjCall: () => const StarLockMainXHJPage()); diff --git a/lib/tools/appFirstEnterHandle.dart b/lib/tools/appFirstEnterHandle.dart index 9bb02c61..6976af6b 100755 --- a/lib/tools/appFirstEnterHandle.dart +++ b/lib/tools/appFirstEnterHandle.dart @@ -13,6 +13,7 @@ import 'package:star_lock/login/login/app_get_version.dart'; import 'package:star_lock/main.dart'; import 'package:star_lock/network/api_repository.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 '../versionUndate/versionUndateTool.dart'; @@ -67,6 +68,7 @@ class AppFirstEnterHandle { Future getAppInfo() async { final GetAppInfo entity = await ApiRepository.to.getAppInfo(); CustomerTool.init(entity.data?.wechatServiceUrl ?? ''); + WxPayTool.setAssociationUrl(entity.data!.appSiteUrl!); } //默认布局 diff --git a/lib/tools/pay/wx_pay_tool.dart b/lib/tools/pay/wx_pay_tool.dart index 20e025a5..0128de4c 100755 --- a/lib/tools/pay/wx_pay_tool.dart +++ b/lib/tools/pay/wx_pay_tool.dart @@ -1,4 +1,5 @@ import 'package:fluwx/fluwx.dart'; +import 'package:star_lock/tools/storage.dart'; /// /// 微信支付 @@ -7,24 +8,29 @@ import 'package:fluwx/fluwx.dart'; class WxPayTool { static Fluwx fluwx = Fluwx(); static bool isInit = false; - static String associationUrl = ''; + static void setAssociationUrl(String associationUrl) { + Storage.saveAssociationUrl(associationUrl); + } - static init(String appId, String universalLink) { + static Future init(String appId, String universalLink) async { fluwx.registerApi(appId: appId, universalLink: universalLink); } - static Future pay(Payment payment, WeChatResponseSubscriber listener) async { + static Future pay( + Payment payment, WeChatResponseSubscriber listener) async { if (!isInit) { isInit = true; - await init(payment.appId, associationUrl); + final String _associationUrl = await Storage.getAssociationUrl(); + await init(payment.appId, _associationUrl); //回调 - responseListener(WeChatResponse response) { + void responseListener(WeChatResponse response) { if (response is WeChatPaymentResponse) { //支付回调 listener.call(response); } } + //开启监听 fluwx.addSubscriber(responseListener); } diff --git a/lib/tools/storage.dart b/lib/tools/storage.dart index 09cefe43..842d18e5 100755 --- a/lib/tools/storage.dart +++ b/lib/tools/storage.dart @@ -28,6 +28,7 @@ const String saveUserLoginData = 'userLoginData'; const String saveLockMainListData = 'lockMainListData'; const String isOpenDeBug = 'isOpenDeBug'; //是否打开 debug const String automaticLockOffTime = 'automaticLockOffTime'; //自动关锁时间 +const String associationUrl = 'associationUrl'; //ios跳转微信的 url class Storage { factory Storage() => _instance; @@ -223,4 +224,14 @@ class Storage { final String data = await Storage.getString(automaticLockOffTime) ?? '0'; return data; } + + //设置自动关锁时间 + static Future saveAssociationUrl(String data) async { + await Storage.setString(associationUrl, data); + } + + static Future getAssociationUrl() async { + final String data = await Storage.getString(associationUrl) ?? '0'; + return data; + } }