Bladeren bron

optimize user free trail variable names, delete unnecessary code

Destiny 8 maanden geleden
bovenliggende
commit
1adff6df72

+ 7 - 5
lib/data/consts/constants.dart

@@ -44,7 +44,7 @@ class Constants {
 
   static const String isFirstIntoStore = 'isFirstIntoStore';
 
-  static const String isGoodsFree = 'isGoodsFree';
+  static const String isUserCanStartFreeTrial = 'isUserCanStartFreeTrial';
 
 }
 
@@ -123,15 +123,17 @@ void setFirstIntoStore(bool isFirst) {
   KVUtil.putBool(Constants.isFirstIntoStore, isFirst);
 }
 
-bool isGoodsFree() {
-  return KVUtil.getBool(Constants.isGoodsFree, false);
+bool isUserCanStartFreeTrial() {
+  return KVUtil.getBool(Constants.isUserCanStartFreeTrial, false);
 }
 
-void setGoodsFree(bool isFree) {
-  return KVUtil.putBool(Constants.isGoodsFree, isFree);
+void setUserCanStartFreeTrial(bool isFree) {
+  return KVUtil.putBool(Constants.isUserCanStartFreeTrial, isFree);
 }
 
 
 
 
 
+
+

+ 4 - 9
lib/module/splash/splash_controller.dart

@@ -72,17 +72,12 @@ class SplashController extends BaseController {
 
   void initStoreIndexData() {
     // LoadingDialog.showLoading();
-    final List<StoreItem> storeItems = <StoreItem>[];
     storeRepository.storeIndex().then((indexData) async {
-      storeItems.addAll(indexData.items);
-      var freeAppleId = "";
-      for (var item in storeItems) {
-        if (item.freeTrialName != null) {
-          freeAppleId = item.appleGoodsId;
-        }
+      final StoreItem? storeItem = indexData.items.firstWhereOrNull((element) => element.freeTrialName != null);
+      if (storeItem != null) {
+        var userCanStartFreeTrial = await ApplePay().check(storeItem.appleGoodsId);
+        setUserCanStartFreeTrial(userCanStartFreeTrial);
       }
-      var isFree = await ApplePay().check(freeAppleId);
-      setGoodsFree(isFree);
       // LoadingDialog.hide();
     });
   }

+ 1 - 8
lib/module/store/discount/discount_controller.dart

@@ -26,7 +26,7 @@ class DiscountController extends BaseController
 
   final Rxn<PaymentWay> currentSelectedPaymentWay = Rxn<PaymentWay>();
 
-  RxBool isFree = isGoodsFree().obs;
+  RxBool isFree = isUserCanStartFreeTrial().obs;
 
   @override
   Future<void> onInit() async {
@@ -54,13 +54,6 @@ class DiscountController extends BaseController
       currentSelectedPaymentWay.value =
           paymentWays.isNotEmpty ? paymentWays.first : null;
 
-      var freeAppleId = "";
-      for (var item in storeItems) {
-        if (item.freeTrialName != null) {
-          freeAppleId = item.appleGoodsId;
-        }
-      }
-      // isFree.value = await ApplePay().check(freeAppleId);
       LoadingDialog.hide();
     }, onError: (_) {
       LoadingDialog.hide();

+ 1 - 9
lib/module/store/store_controller.dart

@@ -36,7 +36,7 @@ class StoreController extends BaseController implements PaymentStatusCallback {
 
   var freeAppleId = "";
 
-  RxBool isFree = isGoodsFree().obs;
+  RxBool isFree = isUserCanStartFreeTrial().obs;
 
   @override
   Future<void> onInit() async {
@@ -75,14 +75,6 @@ class StoreController extends BaseController implements PaymentStatusCallback {
       currentSelectedPaymentWay.value =
           paymentWays.isNotEmpty ? paymentWays.first : null;
 
-      var freeAppleId = "";
-      for (var item in storeItems) {
-        if (item.freeTrialName != null) {
-          freeAppleId = item.appleGoodsId;
-        }
-      }
-
-      // isFree.value = await ApplePay().check(freeAppleId);
       LoadingDialog.hide();
     }, onError: (_) {
       LoadingDialog.hide();