From 61140449910af1c00cc7f5bbe4999bcc98f0f367 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Mon, 3 Jun 2024 11:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dxhj=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E4=B8=8B=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1=E8=B4=AD=E4=B9=B0?=
 =?UTF-8?q?=E5=90=8E=E7=8A=B6=E6=80=81=E6=9C=AA=E5=88=B7=E6=96=B0=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=BD=BF=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/login/login/starLock_login_logic.dart        |  2 +-
 lib/mine/mine/starLockMine_logic.dart            |  2 +-
 .../advancedFeaturesWeb_logic.dart               |  2 +-
 .../valueAddedServicesList_logic.dart            | 16 ++++++++++++++++
 .../valueAddedServicesList_page.dart             | 13 +++++++++----
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/lib/login/login/starLock_login_logic.dart b/lib/login/login/starLock_login_logic.dart
index 848cd6f8..94412022 100755
--- a/lib/login/login/starLock_login_logic.dart
+++ b/lib/login/login/starLock_login_logic.dart
@@ -49,7 +49,7 @@ class StarLockLoginLogic extends BaseGetXController {
         deviceInfo: state.deviceInfoMap.value);
     if (entity.errorCode!.codeIsSuccessful) {
       Storage.saveLoginData(entity.data);
-      Storage.setBool(saveIsVip, entity.data!.isVip == 0 ? false : true);
+      Storage.setBool(saveIsVip, entity.data!.isVip == 1);
       eventBus.fire(MineInfoChangeRefreshUI());
       XSJPushProvider().bindDeviceID();
       XSJPushProvider().initLocalNotification(isCancelLocalPush: false);
diff --git a/lib/mine/mine/starLockMine_logic.dart b/lib/mine/mine/starLockMine_logic.dart
index b126f569..106bcf08 100755
--- a/lib/mine/mine/starLockMine_logic.dart
+++ b/lib/mine/mine/starLockMine_logic.dart
@@ -17,7 +17,7 @@ class StarLockMineLogic extends BaseGetXController {
     final MinePersonInfoEntity entity = await ApiRepository.to.getUserInfo();
     if (entity.errorCode!.codeIsSuccessful) {
       state.mineInfoData.value = entity.data!;
-      state.isVip.value = state.mineInfoData.value.isVip! == 0 ? false : true;
+      state.isVip.value = state.mineInfoData.value.isVip! == 1;
       Storage.setBool(saveIsVip, state.isVip.value);
     }
   }
diff --git a/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_logic.dart b/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_logic.dart
index eba7f1b3..b9f550a4 100755
--- a/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_logic.dart
+++ b/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_logic.dart
@@ -115,7 +115,7 @@ class AdvancedFeaturesWebLogic extends BaseGetXController {
     if (canGoBack) {
       await state.webBuyView.goBack();
     } else if (state.allowReturn) {
-      Get.back();
+      Get.back(result: true);
     } else {
       if (_lastPressedAt == null ||
           DateTime.now().difference(_lastPressedAt!) >
diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart
index 416130bb..7e4c4298 100755
--- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart
+++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart
@@ -1,5 +1,7 @@
 import 'dart:async';
+import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart';
 import 'package:star_lock/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_state.dart';
+import 'package:star_lock/tools/storage.dart';
 
 import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
@@ -12,4 +14,18 @@ class ValueAddedServicesListLogic extends BaseGetXController {
     var entity = await ApiRepository.to.getServicePackageBuyUrl();
     if (entity.errorCode!.codeIsSuccessful) {}
   }
+
+  //用户信息
+  Future<void> getUserInfoRequest() async {
+    final MinePersonInfoEntity entity = await ApiRepository.to.getUserInfo();
+    if (entity.errorCode!.codeIsSuccessful) {
+      Storage.setBool(saveIsVip, entity.data!.isVip! == 1);
+    }
+  }
+
+  @override
+  Future<void> onReady() async {
+    super.onReady();
+    getUserInfoRequest();
+  }
 }
diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart
index 4a6af190..98d2cc47 100755
--- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart
+++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart
@@ -66,14 +66,19 @@ class _ValueAddedServicesPageListState
           _valueAddedServicesItem(
               Image.asset('images/mine/icon_mine_valueAddedServices_vip.png'),
               TranslationLoader.lanKeys!.advancedFunction!.tr, () async {
-            bool? isVip = await Storage.getBool(saveIsVip);
+            final bool? isVip = await Storage.getBool(saveIsVip);
             if (isVip == null || !isVip) {
               // if (CommonDataManage().currentKeyInfo.isLockOwner != 1) {
               //   logic.showToast('请先添加锁');
               // } else {
-              Get.toNamed(Routers.advancedFeaturesWebPage, arguments: {
-                'webBuyType': XSConstantMacro.webBuyTypeVip,
-              });
+              //刷新购买状态
+              final result = await Get.toNamed(Routers.advancedFeaturesWebPage,
+                  arguments: <String, int>{
+                    'webBuyType': XSConstantMacro.webBuyTypeVip,
+                  });
+              if (result != null && result.isNotEmpty) {
+                logic.getUserInfoRequest();
+              }
               // }
             } else {
               Get.toNamed(Routers.valueAddedServicesHighFunctionPage);