From 911794fd626c23df33810270e6b277a22d769859 Mon Sep 17 00:00:00 2001 From: wuqifeng <540416539@qq.com> Date: Tue, 30 Apr 2024 08:50:50 +0800 Subject: [PATCH] feat:审核控制增加ios平台条件判断 --- lib/common/core/app_config_helper.dart | 9 ++++++++- lib/common/request/token_interceptor.dart | 2 +- lib/pages/home/bloc.dart | 13 +++---------- lib/pages/home/view.dart | 3 ++- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/common/core/app_config_helper.dart b/lib/common/core/app_config_helper.dart index c105ec7..df3ea0f 100644 --- a/lib/common/core/app_config_helper.dart +++ b/lib/common/core/app_config_helper.dart @@ -2,6 +2,7 @@ import 'dart:ffi'; import 'dart:io'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:wow_english/common/core/sp_const.dart'; @@ -29,9 +30,15 @@ class AppConfigHelper { return configEntityEntity; } + // 是否是iOS平台 + static bool isIosPlatform() { + return defaultTargetPlatform == TargetPlatform.iOS; + } + // 是否需要隐藏... static bool shouldHidePay() { - return configEntityEntity?.isAppReviewing() == true || UserUtil.getUser()?.phoneNum == "17730280759"; + return isIosPlatform() && + (configEntityEntity?.isAppReviewing() == true || UserUtil.getUser()?.phoneNum == "17730280759"); } // 获取app版本号 diff --git a/lib/common/request/token_interceptor.dart b/lib/common/request/token_interceptor.dart index e5e7233..f218f9b 100644 --- a/lib/common/request/token_interceptor.dart +++ b/lib/common/request/token_interceptor.dart @@ -14,7 +14,7 @@ class TokenInterceptor extends Interceptor { // 在发送请求之前获取版本号 String version = await AppConfigHelper.getAppVersion(); options.headers["version"] = version; - options.headers["User-Agent"] = defaultTargetPlatform == TargetPlatform.iOS ? "ios" : "android"; + options.headers["User-Agent"] = AppConfigHelper.isIosPlatform() ? "ios" : "android"; super.onRequest(options, handler); } } diff --git a/lib/pages/home/bloc.dart b/lib/pages/home/bloc.dart index 5279510..d3b7ff7 100644 --- a/lib/pages/home/bloc.dart +++ b/lib/pages/home/bloc.dart @@ -30,16 +30,9 @@ class ModuleSelectBloc extends Bloc { return; } Log.d("WQF _checkUpdate appVersionEntity: $appVersionEntity localVersion=$localVersion"); - if (defaultTargetPlatform == TargetPlatform.iOS) { - if (localVersion < int.parse(appVersionEntity.version ?? '0')) { - emit(UpdateDialogState( - appVersionEntity.volType == UpdateStrategy.FORCE.name, appVersionEntity)); - } - } else { - if (localVersion < int.parse(appVersionEntity.version ?? '0')) { - emit(UpdateDialogState( - appVersionEntity.volType == UpdateStrategy.FORCE.name, appVersionEntity)); - } + if (localVersion < int.parse(appVersionEntity.version ?? '0')) { + emit(UpdateDialogState( + appVersionEntity.volType == UpdateStrategy.FORCE.name, appVersionEntity)); } } } diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index af9f5ef..246970b 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -44,6 +44,7 @@ class _HomePageView extends StatelessWidget { }), BlocListener( listener: (context, state) { + Log.d("WQF HomePage listener state: $state"); if (state is UpdateDialogState) { _showUpdateDialog(context, state.forceUpdate, state.appVersionEntity); } @@ -199,7 +200,7 @@ class _HomePageView extends StatelessWidget { TextButton( child: const Text('升级'), onPressed: () async { - if (defaultTargetPlatform == TargetPlatform.iOS) { + if (AppConfigHelper.isIosPlatform()) { _launchAppStore("6450870731"); return; } -- libgit2 0.22.2