diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index bae84a18..5d481374 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flutter/scheduler.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; import 'package:permission_handler/permission_handler.dart'; @@ -66,6 +67,7 @@ class LockDetailLogic extends BaseGetXController { state.iSClosedUnlockSuccessfulPopup.value = true; cancelBlueConnetctToastTimer(); state.closedUnlockSuccessfulTimer?.cancel(); + EasyLoading.dismiss(); // 如果没有点击关闭弹窗,3秒后自动关闭 state.closedUnlockSuccessfulTimer = Timer.periodic(3.seconds, (Timer timer) { diff --git a/lib/network/api_provider_base.dart b/lib/network/api_provider_base.dart index b67ae870..1c29ae6e 100755 --- a/lib/network/api_provider_base.dart +++ b/lib/network/api_provider_base.dart @@ -51,9 +51,10 @@ class BaseProvider extends GetConnect with Api { query: query, decoder: decoder, uploadProgress: uploadProgress); + if (EasyLoading.isShow && !isUnShowLoading!) { + await EasyLoading.dismiss(animation: true); + } if (res.body == null) { - if (EasyLoading.isShow) await EasyLoading.dismiss(animation: true); - // EasyLoading.showToast("Network Error!", duration: 2000.milliseconds); if (res.statusCode == null && isShowErrMsg!) { EasyLoading.showToast('网络访问失败,请检查网络是否正常'.tr, diff --git a/lib/network/response_interceptor_log.dart b/lib/network/response_interceptor_log.dart index 85890536..0de1e1e3 100755 --- a/lib/network/response_interceptor_log.dart +++ b/lib/network/response_interceptor_log.dart @@ -6,6 +6,5 @@ import 'package:star_lock/app_settings/app_settings.dart'; FutureOr responseLogInterceptor(Request request, Response response) { AppLog.log('HTTP request:${request.url}\n RESPONSE => stataCode:${response.statusCode} ${response.bodyString}'); // \n ${response.headers} - EasyLoading.dismiss(animation: true); return response; }