Commit 48a1b64505987d35b6b2db17f37c05fdfafef821
1 parent
2a3621f8
feat:删除无效日志
Showing
4 changed files
with
8 additions
and
11 deletions
lib/common/core/user_util.dart
| @@ -60,12 +60,11 @@ class UserUtil { | @@ -60,12 +60,11 @@ class UserUtil { | ||
| 60 | if (currentPageName != AppRouteName.splash) { | 60 | if (currentPageName != AppRouteName.splash) { |
| 61 | Navigator.of(AppRouter.context).pushNamedAndRemoveUntil(AppRouteName.login, (route) => false); | 61 | Navigator.of(AppRouter.context).pushNamedAndRemoveUntil(AppRouteName.login, (route) => false); |
| 62 | }*/ | 62 | }*/ |
| 63 | - Navigator.of(AppRouter.context).pushNamedAndRemoveUntil(AppRouteName.login, (route) => false, arguments: {'showPasswordPage': showPasswordLoginPage}); | 63 | + pushNamedAndRemoveUntil(AppRouteName.login, (route) => false, arguments: {'showPasswordPage': showPasswordLoginPage}); |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | // 是否有游戏权限 | 66 | // 是否有游戏权限 |
| 67 | static bool hasGamePermission() { | 67 | static bool hasGamePermission() { |
| 68 | - debugPrint('hasGamePermission: ${_userEntity}'); | ||
| 69 | return _userEntity?.valid ?? false; | 68 | return _userEntity?.valid ?? false; |
| 70 | } | 69 | } |
| 71 | 70 |
lib/models/app_config_entity.dart
| @@ -17,14 +17,14 @@ class AppConfigEntity { | @@ -17,14 +17,14 @@ class AppConfigEntity { | ||
| 17 | String? androidUpdatePackageUrl; | 17 | String? androidUpdatePackageUrl; |
| 18 | 18 | ||
| 19 | // 安卓当前版本号 | 19 | // 安卓当前版本号 |
| 20 | - late int androidVersion; | 20 | + int? androidVersion; |
| 21 | 21 | ||
| 22 | bool? iosForceUpdate; | 22 | bool? iosForceUpdate; |
| 23 | 23 | ||
| 24 | bool? iosRecommendUpdate; | 24 | bool? iosRecommendUpdate; |
| 25 | 25 | ||
| 26 | // ios版本 | 26 | // ios版本 |
| 27 | - late int iosVersion; | 27 | + int? iosVersion; |
| 28 | 28 | ||
| 29 | // 更新说明 | 29 | // 更新说明 |
| 30 | String? updatePackageDescription; | 30 | String? updatePackageDescription; |
| @@ -38,9 +38,9 @@ class AppConfigEntity { | @@ -38,9 +38,9 @@ class AppConfigEntity { | ||
| 38 | 38 | ||
| 39 | AppConfigEntity(); | 39 | AppConfigEntity(); |
| 40 | 40 | ||
| 41 | - factory AppConfigEntity.fromJson(Map<String, dynamic> json) => $AppConfigEntityEntityFromJson(json); | 41 | + factory AppConfigEntity.fromJson(Map<String, dynamic> json) => $AppConfigEntityFromJson(json); |
| 42 | 42 | ||
| 43 | - Map<String, dynamic> toJson() => $AppConfigEntityEntityToJson(this); | 43 | + Map<String, dynamic> toJson() => $AppConfigEntityToJson(this); |
| 44 | 44 | ||
| 45 | @override | 45 | @override |
| 46 | String toString() { | 46 | String toString() { |
lib/pages/moduleSelect/bloc.dart
| @@ -23,15 +23,14 @@ class ModuleSelectBloc extends Bloc<ModuleSelectEvent, ModuleSelectState> { | @@ -23,15 +23,14 @@ class ModuleSelectBloc extends Bloc<ModuleSelectEvent, ModuleSelectState> { | ||
| 23 | if (appConfigEntity == null) { | 23 | if (appConfigEntity == null) { |
| 24 | return; | 24 | return; |
| 25 | } | 25 | } |
| 26 | - debugPrint('WQF _checkUpdate'); | ||
| 27 | if (defaultTargetPlatform == TargetPlatform.iOS) { | 26 | if (defaultTargetPlatform == TargetPlatform.iOS) { |
| 28 | - if (localVersion < appConfigEntity.iosVersion && | 27 | + if (localVersion < (appConfigEntity.iosVersion ?? 0) && |
| 29 | appConfigEntity.iosRecommendUpdate == true) { | 28 | appConfigEntity.iosRecommendUpdate == true) { |
| 30 | emit(UpdateDialogState( | 29 | emit(UpdateDialogState( |
| 31 | appConfigEntity.iosForceUpdate ?? false, appConfigEntity)); | 30 | appConfigEntity.iosForceUpdate ?? false, appConfigEntity)); |
| 32 | } | 31 | } |
| 33 | } else { | 32 | } else { |
| 34 | - if (localVersion < appConfigEntity.androidVersion && | 33 | + if (localVersion < (appConfigEntity.androidVersion ?? 0) && |
| 35 | appConfigEntity.androidRecommendUpdate == true) { | 34 | appConfigEntity.androidRecommendUpdate == true) { |
| 36 | emit(UpdateDialogState( | 35 | emit(UpdateDialogState( |
| 37 | appConfigEntity.androidForceUpdate ?? false, appConfigEntity, | 36 | appConfigEntity.androidForceUpdate ?? false, appConfigEntity, |
lib/pages/shopping/bloc.dart
| @@ -80,10 +80,9 @@ class ShoppingBloc extends Bloc<ShoppingEvent, ShoppingState> { | @@ -80,10 +80,9 @@ class ShoppingBloc extends Bloc<ShoppingEvent, ShoppingState> { | ||
| 80 | await fluwx?.registerApi(appId: "wx365e5a79956a450a", | 80 | await fluwx?.registerApi(appId: "wx365e5a79956a450a", |
| 81 | universalLink: "https://app-api.wowenglish.com.cn/app/"); | 81 | universalLink: "https://app-api.wowenglish.com.cn/app/"); |
| 82 | wxPayResponseListener = (WeChatResponse response) { | 82 | wxPayResponseListener = (WeChatResponse response) { |
| 83 | - debugPrint("WqfPay wxPayResponseListener $response"); | 83 | + debugPrint("wxPayResponseListener $response"); |
| 84 | if (response is WeChatPaymentResponse) { | 84 | if (response is WeChatPaymentResponse) { |
| 85 | if (response.errCode == 0) { | 85 | if (response.errCode == 0) { |
| 86 | - debugPrint("WqfPay wxPayResponseListener response=${response.errCode}"); | ||
| 87 | showToast("支付成功"); | 86 | showToast("支付成功"); |
| 88 | // Log.d("emitter isDone=${emitter.isDone}"); | 87 | // Log.d("emitter isDone=${emitter.isDone}"); |
| 89 | 88 |