统一Toast

star_lock/lib/login/forgetPassword/starLock_forgetPassword_logic.dart

@@ -6,7 +6,6 @@ import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_state.dar
 
 import '../../network/api_repository.dart';
 import '../../tools/baseGetXController.dart';
-import '../../tools/toast.dart';
 
 class StarLockForgetPasswordLogic extends BaseGetXController {
   final StarLockForgetPasswordState state = StarLockForgetPasswordState();
@@ -38,7 +37,7 @@ class StarLockForgetPasswordLogic extends BaseGetXController {
         "B748F838-94EE-4BDB-A0E6-7B2D16849792",
         state.verificationCode.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '重置成功');
+      showToast("重置成功");
       Get.back();
     } else {
       print('Error');

star_lock/lib/login/register/starLock_register_logic.dart

@@ -5,7 +5,6 @@ import 'package:get/get.dart';
 
 import '../../network/api_repository.dart';
 import '../../tools/baseGetXController.dart';
-import '../../tools/toast.dart';
 import 'starLock_register_state.dart';
 
 class StarLockRegisterLogic extends BaseGetXController {
@@ -39,7 +38,8 @@ class StarLockRegisterLogic extends BaseGetXController {
         state.verificationCode.value);
     if (entity.errorCode!.codeIsSuccessful) {
       // await loginSuccess(loginEntity: entity);
-      Toast.show(msg: "注册成功");
+      // Toast.show(msg: "注册成功");
+      showToast("注册成功");
       Get.back();
     } else {}
   }

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart

@@ -18,7 +18,6 @@ import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'authorizedAdmin_state.dart';
 
 class AuthorizedAdminLogic extends BaseGetXController {
@@ -115,7 +114,7 @@ class AuthorizedAdminLogic extends BaseGetXController {
         //成功
         print("添加用户数据解析成功");
         state.isSendSuccess.value = true;
-        Toast.show(msg: "添加成功");
+        showToast("添加成功");
         // bindBlueAdmin();
         break;
       case 0x06:

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart

@@ -10,7 +10,6 @@ import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
 import 'package:star_lock/tools/storage.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
@@ -210,7 +209,7 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage> {
                   logic.sendElectronicKeyRequest(context);
                 }
               } else {
-                Toast.show(msg: '演示模式');
+                logic.showToast("演示模式");
               }
             }),
         Container(
@@ -226,7 +225,7 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage> {
                       Navigator.pushNamed(
                           context, Routers.volumeAuthorizationLockManagePage);
                     } else {
-                      Toast.show(msg: '演示模式');
+                      logic.showToast("演示模式");
                     }
                   },
                   child: Text(
@@ -333,7 +332,7 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage> {
     );
     if (entity.errorCode!.codeIsSuccessful) {
       print("标记为已入住成功啦啦啦啦啦");
-      Toast.show(msg: "标记成功");
+      logic.showToast("标记成功");
       setState(() {});
     }
   }

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminDetail/authorizedAdminDetail_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
@@ -11,7 +12,6 @@ import '../../../../tools/commonItem.dart';
 import '../../../../tools/showIosTipView.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import '../../electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
 
@@ -245,7 +245,7 @@ class _AuthorizedAdminDetailPageState extends State<AuthorizedAdminDetailPage> {
     ElectronicKeyListEntity entity =
     await ApiRepository.to.deleteElectronicKey(keyId);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "删除成功");
+      EasyLoading.showToast("删除成功",duration: 2000.milliseconds);
       setState(() {
         Get.back();
       });

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_logic.dart

@@ -3,8 +3,6 @@ import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 
-import '../../../../tools/toast.dart';
-
 class AuthorizedAdminListLogic extends BaseGetXController {
   final AuthorizedAdminListState state = AuthorizedAdminListState();
 
@@ -37,7 +35,7 @@ class AuthorizedAdminListLogic extends BaseGetXController {
     ElectronicKeyListEntity entity =
     await ApiRepository.to.deleteElectronicKey(keyId);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "删除成功");
+      showToast("删除成功");
       mockNetworkDataRequest();
     }
   }

star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
 // import 'package:flutter_pickers/pickers.dart';
 // import 'package:flutter_pickers/time_picker/model/date_mode.dart';
@@ -10,7 +11,6 @@ import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../tools/commonItem.dart';
@@ -331,7 +331,7 @@ class _VolumeAuthorizationLockPageState
       _isSendSuccess = true;
       setState(() {});
     } else {
-      Toast.show(msg: '${entity.errorMsg}');
+      EasyLoading.showToast('${entity.errorMsg}',duration: 2000.milliseconds);
       if (entity.errorCode == 425) {
         //用户未注册
         _isCreateUser = true;

star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart

@@ -1,12 +1,9 @@
 
-import 'dart:math';
-
 import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../network/api_repository.dart';
-import '../../../../tools/toast.dart';
 import 'addCardType_state.dart';
 
 class AddCardTypeLogic extends BaseGetXController{
@@ -24,11 +21,11 @@ class AddCardTypeLogic extends BaseGetXController{
     } else if (state.seletType.value == "1") {
       fingerprintType = 2;
       if (state.beginTimeTimestamp.value.isEmpty) {
-        Toast.show(msg: "请选择开始时间");
+        showToast("请选择开始时间");
         return;
       }
       if (state.endTimeTimestamp.value.isEmpty) {
-        Toast.show(msg: "请选择开始时间");
+        showToast("请选择结束时间");
         return;
       }
 
@@ -39,7 +36,7 @@ class AddCardTypeLogic extends BaseGetXController{
 
       if (int.parse(state.beginTimeTimestamp.value) >=
           int.parse(state.endTimeTimestamp.value)) {
-        Toast.show(msg: "失效时间要大于生效时间");
+        showToast("失效时间要大于生效时间");
         return;
       }
 
@@ -47,16 +44,16 @@ class AddCardTypeLogic extends BaseGetXController{
       endDate = state.endTimeTimestamp.value;
     } else if (state.seletType.value == "2") {
       if (state.effectiveDateTime.value <= 0) {
-        Toast.show(msg: "请选择生效时间");
+        showToast("请选择生效时间");
         return;
       }
       if (state.failureDateTime.value <= 0) {
-        Toast.show(msg: "请选择失效时间");
+        showToast("请选择失效时间");
         return;
       }
 
       if (state.weekdaysList.value.isEmpty) {
-        Toast.show(msg: "请选择有效日");
+        showToast("请选择有效日");
         return;
       }
 
@@ -66,7 +63,7 @@ class AddCardTypeLogic extends BaseGetXController{
       // }
 
       if (state.effectiveDateTime.value >= state.failureDateTime.value) {
-        Toast.show(msg: "失效时间要大于生效时间");
+        showToast("失效时间要大于生效时间");
         return;
       }
       startDate = state.effectiveDateTime.value.toString();

star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart

@@ -11,7 +11,6 @@ import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/commonItem.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'addCardType_logic.dart';
 
@@ -196,14 +195,14 @@ class _AddCardPageState extends State<AddCardPage> {
               if (isDemoMode == false) {
                 // print("state.seletType:${state.seletType.value}");
                 if (state.nameController.text.isEmpty) {
-                  Toast.show(msg: "请输入姓名");
+                  logic.showToast("请输入姓名");
                   return;
                 }
 
                 logic.checkCardNameDuplicated(state.nameController.text);
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             }),
       ],

star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart

@@ -10,14 +10,12 @@ import '../../../../blue/blue_manage.dart';
 import '../../../../blue/io_protocol/io_addICCard.dart';
 import '../../../../blue/io_protocol/io_addStressICCard.dart';
 import '../../../../blue/io_reply.dart';
-import '../../../../blue/io_tool/io_manager.dart';
 import '../../../../blue/io_tool/io_tool.dart';
 import '../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'addICCard_state.dart';
 
 class AddICCardLogic extends BaseGetXController{
@@ -309,7 +307,7 @@ class AddICCardLogic extends BaseGetXController{
       weekDay: state.weekDay.value,
     );
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "添加成功");
+      showToast("添加成功");
       if(state.fromType.value == 2){
         // 回调指纹号
         eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(entity.data!.cardId.toString()));

star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_logic.dart

@@ -14,7 +14,6 @@ import '../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'cardDetail_state.dart';
 
 class CardDetailLogic extends BaseGetXController{
@@ -148,7 +147,7 @@ class CardDetailLogic extends BaseGetXController{
       changeType: "1",
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back(result: "addScuess");
     }
   }
@@ -162,7 +161,7 @@ class CardDetailLogic extends BaseGetXController{
         deleteType:"1"
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "删除成功");
+      showToast("删除成功");
       Get.back(result: "addScuess");
     }
   }

star_lock/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart

@@ -16,7 +16,6 @@ import '../../../../tools/showTFView.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'cardDetail_logic.dart';
 
@@ -330,7 +329,7 @@ class _CardDetailPageState extends State<CardDetailPage> with RouteAware {
             controller: state.changeNameController,
             sureClick: () {
               if(state.changeNameController.text.isEmpty){
-                Toast.show(msg: "请输入姓名");
+                logic.showToast("请输入姓名");
                 return;
               }
               Get.back();

star_lock/lib/main/lockDetail/card/cardList/cardList_logic.dart

@@ -15,7 +15,6 @@ import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'cardList_state.dart';
 
 class CardListLogic extends BaseGetXController {
@@ -328,9 +327,9 @@ class CardListLogic extends BaseGetXController {
     );
     if(entity.errorCode!.codeIsSuccessful){
       if(state.isDeletAll == false){
-        Toast.show(msg: "删除成功");
+        showToast("删除成功");
       }else{
-        Toast.show(msg: "重置成功");
+        showToast("重置成功");
       }
 
       state.isDeletCardData = false;

star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart

@@ -16,7 +16,6 @@ import '../../../../tools/showIosTipView.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import '../../fingerprint/fingerprintList/fingerprintListData_entity.dart';
 import 'cardList_logic.dart';
@@ -52,7 +51,7 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
                 showDeletAlertDialog(context);
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             },
           ),

star_lock/lib/main/lockDetail/card/otherTypeKeyChangeDate/otherTypeKeyChangeDate_logic.dart

@@ -3,7 +3,6 @@ import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
-import '../../../../tools/toast.dart';
 import 'otherTypeKeyChangeDate_state.dart';
 
 class OtherTypeKeyChangeDateLogic extends BaseGetXController{
@@ -22,7 +21,7 @@ class OtherTypeKeyChangeDateLogic extends BaseGetXController{
       changeType: "1",
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back(result: {
         "beginTimeTimestamp":state.beginTimeTimestamp.value,
         "endTimeTimestamp":state.endTimeTimestamp.value,
@@ -44,7 +43,7 @@ class OtherTypeKeyChangeDateLogic extends BaseGetXController{
       changeType: '1',
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back(result: {
         "beginTimeTimestamp":state.beginTimeTimestamp.value,
         "endTimeTimestamp":state.endTimeTimestamp.value,

star_lock/lib/main/lockDetail/card/otherTypeKeyChangeValidityDate/otherTypeKeyChangeValidityDate_logic.dart

@@ -4,7 +4,6 @@ import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
-import '../../../../tools/toast.dart';
 import 'otherTypeKeyChangeValidityDate_state.dart';
 
 class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{
@@ -23,7 +22,7 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{
       changeType: "1",
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back(result: {
         "beginTimeTimestamp":state.beginTimeTimestamp.value,
         "endTimeTimestamp":state.endTimeTimestamp.value,
@@ -46,7 +45,7 @@ class OtherTypeKeyChangeValidityDateLogic extends BaseGetXController{
       changeType: '1',
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back(result: {
         "beginTimeTimestamp":state.beginTimeTimestamp.value,
         "endTimeTimestamp":state.endTimeTimestamp.value,

star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_logic.dart

@@ -1,9 +1,6 @@
 
-
-import 'package:date_format/date_format.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 import '../../../../../network/api_repository.dart';
 import 'checkingInAddHolidays_state.dart';
 
@@ -13,7 +10,7 @@ class CheckingInAddHolidaysLogic extends BaseGetXController{
   // 添加假期
   void editStaffLoadData() async{
     if(state.staffNameController.text.isEmpty){
-      Toast.show(msg: "请输入姓名");
+      showToast("请输入姓名");
       return;
     }
 
@@ -25,7 +22,7 @@ class CheckingInAddHolidaysLogic extends BaseGetXController{
         vacationStartDate: DateTime.parse(state.beginDate.value).millisecondsSinceEpoch.toString()
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "添加成功");
+      showToast("添加成功");
       Get.back(result: "addScuess");
     }
   }

star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInDeletHolidays/checkingInDeletHolidays_logic.dart

@@ -2,7 +2,6 @@
 import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import '../../../../../network/api_repository.dart';
-import '../../../../../tools/toast.dart';
 import 'checkingInDeletHolidays_state.dart';
 
 class CheckingInDeletHolidaysLogic extends BaseGetXController{
@@ -14,7 +13,7 @@ class CheckingInDeletHolidaysLogic extends BaseGetXController{
         vacationId: state.listItem.value.vacationId.toString()
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "删除成功");
+      showToast("删除成功");
       Get.back(result: "deletScuess");
     }
   }

star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart

@@ -11,7 +11,6 @@ import '../../../../tools/showBottomSheetTool.dart';
 import '../../../../tools/showCalendar.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'checkingInListDay_entity.dart';
 import 'checkingInList_logic.dart';
@@ -46,7 +45,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
                   });
                 }else{
                   // Get.toNamed(Routers.seletLockTypePage);
-                  Toast.show(msg: "演示模式");
+                  logic.showToast("演示模式");
                 }
               },
               child: Image.asset('images/main/icon_lockDetail_checkIn_set.png', width: 36.w, height: 36.w,)),
@@ -96,7 +95,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
                         });
                       }else{
                         // Get.toNamed(Routers.seletLockTypePage);
-                        Toast.show(msg: "演示模式");
+                        logic.showToast("演示模式");
                       }
                     },
                     child: Container(
@@ -133,7 +132,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
                         });
                       }else{
                         // Get.toNamed(Routers.seletLockTypePage);
-                        Toast.show(msg: "演示模式");
+                        logic.showToast("演示模式");
                       }
                     },
                     child: Container(
@@ -174,7 +173,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
                         });
                   }else{
                     // Get.toNamed(Routers.seletLockTypePage);
-                    Toast.show(msg: "演示模式");
+                    logic.showToast("演示模式");
                   }
                 },
                 child: Row(
@@ -335,7 +334,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
           showListType();
         }else{
           // Get.toNamed(Routers.seletLockTypePage);
-          Toast.show(msg: "演示模式");
+          logic.showToast("演示模式");
         }
       },
       child: Obx(() => Container(

star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart

@@ -1,10 +1,7 @@
 
-import 'package:get/get.dart';
-
 import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
 import '../../../../tools/dateTool.dart';
-import '../../../../tools/toast.dart';
 import 'checkingInSet_state.dart';
 
 class CheckingInSetLogic extends BaseGetXController{
@@ -56,7 +53,7 @@ class CheckingInSetLogic extends BaseGetXController{
     );
     if(entity.errorCode!.codeIsSuccessful){
       state.companyName.value = state.changeNameController.text;
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
     }
   }
 

star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/app_settings/app_colors.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../tools/commonItem.dart';
@@ -136,7 +135,7 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
             controller: state.changeNameController,
             sureClick: () {
               if(state.changeNameController.text.isEmpty){
-                Toast.show(msg: "请输入公司姓名");
+                logic.showToast("请输入公司姓名");
                 return;
               }
               Get.back();

star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_logic.dart

@@ -3,7 +3,6 @@ import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../network/api_repository.dart';
-import '../../../../tools/toast.dart';
 import 'checkingInSetWorkTime_state.dart';
 
 class CheckingInSetWorkTimeLogic extends BaseGetXController{

star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart

@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
-// import 'package:flutter_pickers/pickers.dart';
-// import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/commonItem.dart';
@@ -90,18 +87,18 @@ class _CheckingInSetWorkTimePageState extends State<CheckingInSetWorkTimePage> {
             padding: EdgeInsets.only(top: 20.w, bottom: 20.w),
             onClick: () {
               if (state.beginTimeTimestamp.value.isEmpty) {
-                Toast.show(msg: "请选择开始时间");
+                logic.showToast("请选择开始时间");
                 return;
               }
 
               if (state.endTimeTimestamp.value.isEmpty) {
-                Toast.show(msg: "请选择结束时间");
+                logic.showToast("请选择结束时间");
                 return;
               }
 
               if (int.parse(state.beginTimeTimestamp.value) >
                   int.parse(state.endTimeTimestamp.value)) {
-                Toast.show(msg: "结束时间不能大于开始时间");
+                logic.showToast("结束时间不能大于开始时间");
                 return;
               }
               if (state.pushType.value == "2") {

star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 import '../../../../../network/api_repository.dart';
 import '../../../../../tools/eventBusEventManage.dart';
 import 'checkingInAddStaffSeletKey_entity.dart';
@@ -38,14 +37,14 @@ class CheckingInAddStaffLogic extends BaseGetXController{
           }
 
           if(attendanceWay.isEmpty){
-            Toast.show(msg: "请输入员工账号");
+            showToast("请输入员工账号");
             return;
           }
         }else {
           attendanceWay = state.seletKey.value;
 
           if(attendanceWay.isEmpty){
-            Toast.show(msg: "请选择员工钥匙");
+            showToast("请选择员工钥匙");
             return;
           }
         }
@@ -74,7 +73,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{
     if(entity.errorCode!.codeIsSuccessful){
       Get.back(result: "addScuess");
     }else if(entity.errorCode! == 425){
-      Toast.show(msg: entity.errorMsg!);
+      showToast(entity.errorMsg!);
     }
   }
 
@@ -106,14 +105,14 @@ class CheckingInAddStaffLogic extends BaseGetXController{
           }
 
           if(attendanceWay.isEmpty){
-            Toast.show(msg: "请输入员工账号");
+            showToast("请输入员工账号");
             return;
           }
         }else {
           attendanceWay = state.seletKey.value;
 
           if(attendanceWay.isEmpty){
-            Toast.show(msg: "请选择员工钥匙");
+            showToast("请选择员工钥匙");
             return;
           }
         }
@@ -143,14 +142,14 @@ class CheckingInAddStaffLogic extends BaseGetXController{
       eventBus.fire(RefreshCheckInStaffListDataEvent());
       Get.close(2);
     } else if (entity.errorCode! == 425) {
-      Toast.show(msg: entity.errorMsg!);
+      showToast(entity.errorMsg!);
     }
   }
 
   //获取密码请求
   void getKeyboardPwdRequest() async {
     if (state.staffNameController.text.isEmpty) {
-      Toast.show(msg: "请输入姓名");
+      showToast("请输入姓名");
       return;
     }
     // var entity = await ApiRepository.to.getPasswordKey(
@@ -186,7 +185,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{
         state.getDataPassword.value = entity.data!.keyboardPwd!;
       }
     } else {
-      Toast.show(msg: '${entity.errorMsg}');
+      showToast('${entity.errorMsg}');
     }
   }
 

star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart

@@ -8,7 +8,6 @@ import '../../../../../tools/commonItem.dart';
 import '../../../../../tools/showBottomSheetTool.dart';
 import '../../../../../tools/submitBtn.dart';
 import '../../../../../tools/titleAppBar.dart';
-import '../../../../../tools/toast.dart';
 import '../../../../../translations/trans_lib.dart';
 import 'checkingInAddStaff_logic.dart';
 
@@ -161,7 +160,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
                                     // 卡
                                     if (state
                                         .staffNameController.text.isEmpty) {
-                                      Toast.show(msg: "请输入姓名");
+                                      logic.showToast("请输入姓名");
                                       return;
                                     }
 
@@ -180,9 +179,8 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
                                     break;
                                   case 4:
                                     // 指纹
-                                    if (state
+                                    if (state.staffNameController.text.isEmpty) {
-                                        .staffNameController.text.isEmpty) {
+                                      logic.showToast("请输入姓名");
-                                      Toast.show(msg: "请输入姓名");
                                       return;
                                     }
 
@@ -232,7 +230,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
               padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
               onClick: () {
                 if (state.staffNameController.text.isEmpty) {
-                  Toast.show(msg: "请输入姓名");
+                  logic.showToast("请输入姓名");
                   return;
                 }
 

star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart

@@ -2,10 +2,8 @@ import 'dart:async';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
-import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_page.dart';
 import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_state.dart';
 import 'package:star_lock/main/lockDetail/lockOperatingRecord/lockOperatingRecordGetLastRecordTime_entity.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../blue/blue_manage.dart';
 import '../../../blue/io_protocol/io_referEventRecordTime.dart';
@@ -233,7 +231,7 @@ class DoorLockLogLogic extends BaseGetXController {
     KeyOperationRecordEntity entity =
         await ApiRepository.to.clearOperationRecord('28');
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "清除数据成功");
+      showToast("清除数据成功");
     }
   }
 

star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart

@@ -10,7 +10,6 @@ import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_logic.dart';
 import '../../../app_settings/app_colors.dart';
 import '../../../tools/storage.dart';
 import '../../../tools/titleAppBar.dart';
-import '../../../tools/toast.dart';
 import '../../../translations/trans_lib.dart';
 
 class DoorLockLogPage extends StatefulWidget {
@@ -51,7 +50,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> {
               if (isDemoMode == false) {
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             },
           ),

star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart

@@ -4,7 +4,6 @@ import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyO
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class ElectronicKeyDetailLogic extends BaseGetXController {
   final ElectronicKeyDetailState state = ElectronicKeyDetailState();
@@ -16,7 +15,7 @@ class ElectronicKeyDetailLogic extends BaseGetXController {
             state.changeNameController.text, '');
     if (entity.errorCode!.codeIsSuccessful) {
       print("修改要是名称成功啦啦啦啦啦");
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back();
     }
   }
@@ -27,7 +26,7 @@ class ElectronicKeyDetailLogic extends BaseGetXController {
         .deleteElectronicKey(state.itemData.value.keyId.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       print("删除电子钥匙成功");
-      Toast.show(msg: "删除成功");
+      showToast("删除成功");
       Get.back();
     }
   }

star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetailChangeDate/electronicKeyDetailChangeDate_logic.dart

@@ -4,7 +4,6 @@ import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyO
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class ElectronicKeyDetailChangeDateLogic extends BaseGetXController {
   final ElectronicKeyDetailChangeDateState state =
@@ -24,7 +23,7 @@ class ElectronicKeyDetailChangeDateLogic extends BaseGetXController {
         hoursEnd: state.hoursEnd.value,
         isCoerced: state.isCoerced.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back();
     }
   }
@@ -41,7 +40,7 @@ class ElectronicKeyDetailChangeDateLogic extends BaseGetXController {
         state.startDay.value,
         state.weekDays.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back();
     }
   }

star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_logic.dart

@@ -2,7 +2,6 @@ import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/electr
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class ElectronicKeyListLogic extends BaseGetXController {
   final ElectronicKeyListState state = ElectronicKeyListState();
@@ -37,7 +36,7 @@ class ElectronicKeyListLogic extends BaseGetXController {
         .resetElectronicKey(state.keyInfo.value.lockId.toString(), '0');
     if (entity.errorCode!.codeIsSuccessful) {
       print("重置电子钥匙成功啦啦啦啦啦");
-      Toast.show(msg: "重置成功");
+      showToast("重置成功");
       mockNetworkDataRequest();
     }
   }
@@ -48,7 +47,7 @@ class ElectronicKeyListLogic extends BaseGetXController {
     await ApiRepository.to.deleteElectronicKey(keyId);
     if (entity.errorCode!.codeIsSuccessful) {
       print("删除电子钥匙成功");
-      Toast.show(msg: "删除成功");
+      showToast("删除成功");
       mockNetworkDataRequest();
     }
   }

star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart

@@ -8,7 +8,6 @@ import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/electr
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
 import 'package:star_lock/tools/noData.dart';
 import 'package:star_lock/tools/storage.dart';
-import 'package:star_lock/tools/toast.dart';
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/keySearchWidget.dart';
@@ -66,7 +65,7 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
                 if (isDemoMode == false) {
                   _showDialog(context);
                 } else {
-                  Toast.show(msg: '演示模式');
+                  logic.showToast("演示模式");
                 }
               },
             ),

star_lock/lib/main/lockDetail/electronicKey/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart

@@ -6,7 +6,6 @@ import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyPeriodValid
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyPeriodValidity/electronicKeyPeriodValidity_logic.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/commonItem.dart';
@@ -200,7 +199,7 @@ class _ElectronicKeyPeriodValidityPageState
                 //时间判断
                 if (!startDateTime.isBefore(endDateTime) ||
                     startDateTime.isAtSameMomentAs(endDateTime)) {
-                  Toast.show(msg: '失效时间需大于生效时间');
+                  logic.showToast("失效时间需大于生效时间");
                 } else {
                   Map<String, dynamic> resultMap = {};
                   resultMap['validityValue'] = state.selectIndexList.value;

star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-// import 'package:flutter_pickers/pickers.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
-// import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
@@ -11,7 +10,6 @@ import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../../tools/commonItem.dart';
 import '../../../../../tools/submitBtn.dart';
@@ -174,7 +172,7 @@ class _MassSendElectronicKeyPageState extends State<MassSendElectronicKeyPage> {
         batchSendElectronicKeyRequest(data.userid ?? '');
       }
     } else {
-      Toast.show(msg: '检查失败');
+      EasyLoading.showToast("检查失败",duration: 2000.milliseconds);
     }
   }
 
@@ -204,7 +202,7 @@ class _MassSendElectronicKeyPageState extends State<MassSendElectronicKeyPage> {
       _isSendSuccess = true;
       setState(() {});
     } else {
-      Toast.show(msg: '${entity.errorMsg}');
+      EasyLoading.showToast('${entity.errorMsg}', duration: 2000.milliseconds);
       if (entity.errorCode == 425) {
         //用户未注册
         _isCreateUser = true;

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart

@@ -11,7 +11,6 @@ import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
 import 'package:star_lock/tools/storage.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../../appRouters.dart';
 import '../../../../../tools/commonItem.dart';
@@ -287,7 +286,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
                   if (int.parse(widget.type) == 0) {
                     if (!startDateTime.isBefore(endDateTime) ||
                         startDateTime.isAtSameMomentAs(endDateTime)) {
-                      Toast.show(msg: '失效时间需大于生效时间');
+                      logic.showToast("失效时间需大于生效时间");
                     } else {
                       logic.sendElectronicKeyRequest(context);
                     }
@@ -295,11 +294,11 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
                     logic.sendElectronicKeyRequest(context);
                   }
                 } else {
-                  Toast.show(msg: '请完善信息');
+                  logic.showToast("请完善信息");
                 }
               } else {
                 //演示模式不获取接口
-                Toast.show(msg: '演示模式');
+                logic.showToast("演示模式");
               }
             }),
         Container(
@@ -315,7 +314,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
                       Navigator.pushNamed(
                           context, Routers.massSendElectronicKeyManagePage);
                     } else {
-                      Toast.show(msg: '演示模式');
+                      logic.showToast("演示模式");
                     }
                   },
                   child: Text(
@@ -423,7 +422,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
     );
     if (entity.errorCode!.codeIsSuccessful) {
       print("标记为已入住成功啦啦啦啦啦");
-      Toast.show(msg: "标记成功");
+      logic.showToast("标记成功");
       setState(() {});
     }
   }

star_lock/lib/main/lockDetail/face/addFace/addFace_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
@@ -7,7 +8,6 @@ import '../../../../../app_settings/app_colors.dart';
 import '../../../../../tools/submitBtn.dart';
 import '../../../../../tools/titleAppBar.dart';
 import '../../../../../translations/trans_lib.dart';
-import '../../../../tools/toast.dart';
 
 class AddFaceTipPage extends StatefulWidget {
   const AddFaceTipPage({Key? key}) : super(key: key);
@@ -68,7 +68,7 @@ class _AddFaceTipPageState extends State<AddFaceTipPage> {
                 btnName: "开始添加", //TranslationLoader.lanKeys!.next!.tr,
                 borderRadius: 20.w,
                 onClick: () {
-                  Toast.show(msg: "请确保在设备附近，设备未被连接，设备已打开");
+                  EasyLoading.showToast("请确保在设备附近，设备未被连接，设备已打开", duration: 2000.milliseconds);
                 }),
           ),
         ],

star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-// import 'package:flutter_pickers/pickers.dart';
-// import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
@@ -12,7 +10,6 @@ import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/commonItem.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'addFaceType_logic.dart';
 
@@ -181,14 +178,14 @@ class _AddFaceTypePageState extends State<AddFaceTypePage> {
               if (isDemoMode == false) {
                 // print("state.seletType:${state.seletType.value}");
                 if (state.nameController.text.isEmpty) {
-                  Toast.show(msg: "请输入姓名");
+                  logic.showToast("请输入姓名");
                   return;
                 }
 
                 Get.toNamed(Routers.addFaceTipPage);
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             }),
       ],

star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart

@@ -11,7 +11,6 @@ import '../../../../tools/showIosTipView.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'faceList_logic.dart';
 
@@ -46,7 +45,7 @@ class _FaceListState extends State<FaceList> {
                 showDeletAlertDialog(context);
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             },
           ),

star_lock/lib/main/lockDetail/fingerprint/addFingerprint/addFingerprint_logic.dart

@@ -3,14 +3,12 @@ import 'dart:async';
 
 import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
 import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
 import 'package:star_lock/blue/io_type.dart';
 
 import '../../../../../blue/blue_manage.dart';
 import '../../../../../blue/io_protocol/io_addFingerprint.dart';
 import '../../../../../blue/io_protocol/io_addStressFingerprint.dart';
 import '../../../../../blue/io_reply.dart';
-import '../../../../../blue/io_tool/io_manager.dart';
 import '../../../../../blue/io_tool/io_tool.dart';
 import '../../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../../blue/sender_manage.dart';
@@ -18,7 +16,6 @@ import '../../../../../network/api_repository.dart';
 import '../../../../../tools/baseGetXController.dart';
 import '../../../../../tools/eventBusEventManage.dart';
 import '../../../../../tools/storage.dart';
-import '../../../../../tools/toast.dart';
 import 'addFingerprint_state.dart';
 
 class AddFingerprintLogic extends BaseGetXController {
@@ -123,7 +120,7 @@ class AddFingerprintLogic extends BaseGetXController {
         if(reply.data[5] == 255){
           // 注册指纹失败
           // print("${reply.commandType!.typeValue} 注册指纹失败");
-          Toast.show(msg: "添加失败");
+          showToast("添加失败");
           Get.close(2);
         }else{
           // state.addFingerprintProcessNumber.value++;
@@ -368,7 +365,7 @@ class AddFingerprintLogic extends BaseGetXController {
         fingerprintUserNo: state.fingerprintNumber.value,
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "添加成功");
+      showToast("添加成功");
       if(state.fromType.value == 2){
         // 回调指纹号
         eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(fingerprintId));

star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_logic.dart

@@ -3,7 +3,6 @@ import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import '../../../../appRouters.dart';
 import '../../../../network/api_repository.dart';
-import '../../../../tools/toast.dart';
 import 'addFingerprintType_state.dart';
 
 class AddFingerprintTypeLogic extends BaseGetXController{
@@ -21,11 +20,11 @@ class AddFingerprintTypeLogic extends BaseGetXController{
     } else if (state.seletType.value == "1") {
       fingerprintType = 2;
       if (state.beginTimeTimestamp.value.isEmpty) {
-        Toast.show(msg: "请选择开始时间");
+        showToast("请选择开始时间");
         return;
       }
       if (state.endTimeTimestamp.value.isEmpty) {
-        Toast.show(msg: "请选择开始时间");
+        showToast("请选择结束时间");
         return;
       }
 
@@ -36,7 +35,7 @@ class AddFingerprintTypeLogic extends BaseGetXController{
 
       if (int.parse(state.beginTimeTimestamp.value) >=
           int.parse(state.endTimeTimestamp.value)) {
-        Toast.show(msg: "失效时间要大于生效时间");
+        showToast("失效时间要大于生效时间");
         return;
       }
 
@@ -44,16 +43,16 @@ class AddFingerprintTypeLogic extends BaseGetXController{
       endDate = state.endTimeTimestamp.value;
     } else if (state.seletType.value == "2") {
       if (state.effectiveDateTime.value <= 0) {
-        Toast.show(msg: "请选择生效时间");
+        showToast("请选择生效时间");
         return;
       }
       if (state.failureDateTime.value <= 0) {
-        Toast.show(msg: "请选择失效时间");
+        showToast("请选择失效时间");
         return;
       }
 
       if (state.weekdaysList.value.isEmpty) {
-        Toast.show(msg: "请选择有效日");
+        showToast("请选择有效日");
         return;
       }
 
@@ -63,7 +62,7 @@ class AddFingerprintTypeLogic extends BaseGetXController{
       // }
 
       if (state.effectiveDateTime.value >= state.failureDateTime.value) {
-        Toast.show(msg: "失效时间要大于生效时间");
+        showToast("失效时间要大于生效时间");
         return;
       }
       startDate = state.effectiveDateTime.value.toString();

star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_page.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-// import 'package:flutter_pickers/pickers.dart';
-// import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
@@ -13,7 +11,6 @@ import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/commonItem.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'addFingerprintType_logic.dart';
 
@@ -198,13 +195,13 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
               if (isDemoMode == false) {
                 // print("state.seletType:${state.seletType.value}");
                 if (state.nameController.text.isEmpty) {
-                  Toast.show(msg: "请输入姓名");
+                  logic.showToast("请输入姓名");
                   return;
                 }
                 logic.checkFingerprintNameDuplicated(state.nameController.text);
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             }),
       ],

star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_logic.dart

@@ -12,9 +12,7 @@ import '../../../../blue/io_tool/io_tool.dart';
 import '../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
-import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'fingerprintDetail_state.dart';
 
 class FingerprintDetailLogic extends BaseGetXController{
@@ -146,8 +144,9 @@ class FingerprintDetailLogic extends BaseGetXController{
         deleteType:"1"
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "删除成功");
+      showToast("删除成功",something: (){
-      Get.back(result: "addScuess");
+        Get.back(result: "addScuess");
+      });
     }
   }
 
@@ -164,8 +163,9 @@ class FingerprintDetailLogic extends BaseGetXController{
       changeType: "1",
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "修改成功");
+      showToast("修改成功",something: (){
-      Get.back(result: "addScuess");
+        Get.back(result: "addScuess");
+      });
     }
   }
 

star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart

@@ -15,7 +15,6 @@ import '../../../../tools/showIosTipView.dart';
 import '../../../../tools/showTFView.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'fingerprintDetail_logic.dart';
 
@@ -292,7 +291,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage> with Rout
             controller: state.changeNameController,
             sureClick: () {
               if(state.changeNameController.text.isEmpty){
-                Toast.show(msg: "请输入姓名");
+                logic.showToast("请输入姓名");
                 return;
               }
               Get.back();

star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart

@@ -15,7 +15,6 @@ import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'fingerprintList_state.dart';
 
 class FingerprintListLogic extends BaseGetXController{
@@ -360,9 +359,9 @@ class FingerprintListLogic extends BaseGetXController{
     );
     if(entity.errorCode!.codeIsSuccessful){
       if(state.isDeletAll == false){
-        Toast.show(msg: "删除成功");
+        showToast("删除成功");
       }else{
-        Toast.show(msg: "重置成功");
+        showToast("重置成功");
       }
 
       state.isDeletFingerprintData = false;

star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart

@@ -1,7 +1,6 @@
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -10,7 +9,6 @@ import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
 import '../../../../blue/blue_manage.dart';
 import '../../../../tools/appRouteObserver.dart';
-import '../../../../tools/dateTool.dart';
 import '../../../../tools/keySearchWidget.dart';
 import '../../../../tools/left_slide_actions.dart';
 import '../../../../tools/noData.dart';
@@ -18,7 +16,6 @@ import '../../../../tools/showIosTipView.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'fingerprintListData_entity.dart';
 import 'fingerprintList_logic.dart';
@@ -54,7 +51,7 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
                 showDeletAlertDialog(context);
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             },
           ),

star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart

@@ -13,7 +13,6 @@ import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'automaticBlocking_state.dart';
 
 class AutomaticBlockingLogic extends BaseGetXController{
@@ -46,7 +45,7 @@ class AutomaticBlockingLogic extends BaseGetXController{
       state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond = int.parse(state.autoLockTime.value);
       eventBus.fire(RefreshLockListInfoDataEvent());
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart

@@ -11,7 +11,6 @@ import '../../../../tools/appRouteObserver.dart';
 import '../../../../tools/commonItem.dart';
 import '../../../../tools/showBottomSheetTool.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'automaticBlocking_logic.dart';
 
@@ -44,7 +43,7 @@ class _AutomaticBlockingPageState extends State<AutomaticBlockingPage> with Rout
                     return;
                   }
                   if(state.isCustomLockTime.value == true && state.timeController.text.isEmpty){
-                    Toast.show(msg: "请输入自定义时间");
+                    logic.showToast("请输入自定义时间");
                     return;
                   }
                   logic.sendAutoLock();

star_lock/lib/main/lockDetail/lcokSet/basicInformation/editLockName/editLockName_logic.dart

@@ -3,7 +3,6 @@ import 'package:get/get.dart';
 
 import '../../../../../network/api_repository.dart';
 import '../../../../../tools/baseGetXController.dart';
-import '../../../../../tools/toast.dart';
 import '../../../electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart';
 import 'editLockName_state.dart';
 
@@ -16,7 +15,7 @@ class EditLockNameLogic extends BaseGetXController{
         lockId: state.lockSetInfoData.value.lockId.toString(),
         lockName:state.changeLockNameController.text);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       state.lockBasicInfo.value.lockAlias = state.changeLockNameController.text;
       Get.back(result: {
         "lockBasicInfo":state.lockBasicInfo.value

star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_logic.dart

@@ -1,9 +1,6 @@
 
-import 'package:get/get.dart';
-
 import '../../../../../network/api_repository.dart';
 import '../../../../../tools/baseGetXController.dart';
-import '../../../../../tools/toast.dart';
 import '../../../electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart';
 import 'lockSeletGrouping_state.dart';
 
@@ -14,7 +11,7 @@ class LockSeletGroupingLogic extends BaseGetXController {
   Future<void> addLockGroupRequest() async {
     MassSendLockGroupListEntity entity = await ApiRepository.to.addLockGroup(state.changeNameController.text, '0');
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "创建成功");
+      showToast("创建成功");
       mockNetworkDataRequest();
     }
   }
@@ -24,7 +21,7 @@ class LockSeletGroupingLogic extends BaseGetXController {
     MassSendLockGroupListEntity entity = await ApiRepository.to.setLockGroup(
         state.lockSetInfoData.value.lockId.toString(), itemData.keyGroupId.toString());
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "设置锁分组成功");
+      showToast("设置锁分组成功");
       state.lockBasicInfo.value.groupId = itemData.keyGroupId;
       mockNetworkDataRequest();
     }

star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart

@@ -2,10 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart';
-import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/showTFView.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../../app_settings/app_colors.dart';
 import '../../../../../tools/commonItem.dart';
@@ -96,7 +93,7 @@ class _LockSeletGroupingPageState extends State<LockSeletGroupingPage> {
               logic.addLockGroupRequest();
               Navigator.pop(context);
             } else {
-              Toast.show(msg: '请输入分组名称');
+              logic.showToast("请输入分组名称");
             }
           },
           cancelClick: () {

star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart

@@ -0,0 +1,18 @@
+
+import '../../../../../network/api_repository.dart';
+import '../../../../../tools/baseGetXController.dart';
+import '../../../electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart';
+import 'uploadElectricQuantity_state.dart';
+
+class UploadElectricQuantityLogic extends BaseGetXController {
+  final UploadElectricQuantityState state = UploadElectricQuantityState();
+
+  //电量更新请求
+  Future<void> uploadElectricQuantityRequest() async {
+    KeyOperationRecordEntity entity = await ApiRepository.to.uploadElectricQuantity('100', state.lockSetInfoData.value.lockId.toString());
+    if (entity.errorCode!.codeIsSuccessful) {
+      showToast("锁电量更新成功");
+    }
+  }
+
+}

star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart

@@ -1,16 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart';
-import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../../app_settings/app_colors.dart';
 import '../../../../../tools/submitBtn.dart';
 import '../../../../../tools/titleAppBar.dart';
 import '../../../../../translations/trans_lib.dart';
-import '../../lockSet/lockSetInfo_entity.dart';
+import 'uploadElectricQuantity_logic.dart';
 
 class UploadElectricQuantityPage extends StatefulWidget {
   const UploadElectricQuantityPage({Key? key}) : super(key: key);
@@ -21,25 +17,11 @@ class UploadElectricQuantityPage extends StatefulWidget {
 }
 
 class _UploadElectricQuantityPageState extends State<UploadElectricQuantityPage> {
-  late LockSetInfoData lockSetInfoData;
+  final logic = Get.put(UploadElectricQuantityLogic());
-
+  final state = Get.find<UploadElectricQuantityLogic>().state;
-  //电量更新请求
-  Future<void> uploadElectricQuantityRequest() async {
-    KeyOperationRecordEntity entity = await ApiRepository.to
-        .uploadElectricQuantity('100', lockSetInfoData.lockId.toString());
-    if (entity.errorCode!.codeIsSuccessful) {
-      print("锁电量更新成功啦啦啦啦啦");
-      Toast.show(msg: "锁电量更新成功");
-    }
-  }
 
   @override
   Widget build(BuildContext context) {
-    dynamic obj = ModalRoute.of(context)?.settings.arguments;
-    if (obj != null && (obj["lockSetInfoData"] != null)) {
-      lockSetInfoData = obj["lockSetInfoData"];
-    }
-
     return Scaffold(
         backgroundColor: AppColors.mainBackgroundColor,
         appBar: TitleAppBar(
@@ -83,7 +65,7 @@ class _UploadElectricQuantityPageState extends State<UploadElectricQuantityPage>
                   // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w),
                   padding: EdgeInsets.only(top: 20.w, bottom: 20.w),
                   onClick: () {
-                    uploadElectricQuantityRequest();
+                    logic.uploadElectricQuantityRequest();
                   }),
             ],
           ),

star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_state.dart

@@ -0,0 +1,15 @@
+
+
+import 'package:get/get.dart';
+
+import '../../lockSet/lockSetInfo_entity.dart';
+
+class UploadElectricQuantityState {
+  var lockSetInfoData = LockSetInfoData().obs;
+
+  UploadElectricQuantityState() {
+    var map = Get.arguments;
+    lockSetInfoData.value = map["lockSetInfoData"];
+  }
+
+}

star_lock/lib/main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_logic.dart

@@ -13,7 +13,6 @@ import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'burglarAlarm_state.dart';
 
 class BurglarAlarmLogic extends BaseGetXController{
@@ -31,7 +30,7 @@ class BurglarAlarmLogic extends BaseGetXController{
       state.burglarAlarmEnable.value = state.burglarAlarmEnable.value == 1 ? 0 : 1;
       state.lockSetInfoData.value.lockSettingInfo!.antiPrySwitch = state.burglarAlarmEnable.value;
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_logic.dart

@@ -4,7 +4,6 @@ import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
-import '../../../../tools/toast.dart';
 import 'checkInCreatCompany_state.dart';
 
 class CheckInCreatCompanyLogic extends BaseGetXController{
@@ -39,7 +38,7 @@ class CheckInCreatCompanyLogic extends BaseGetXController{
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
       eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, 1));
       Get.back();
-      Toast.show(msg: "设置成功");
+      showToast("设置成功");
     }
   }
 }

star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifi_logic.dart

@@ -1,23 +1,18 @@
 
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
 import 'package:network_info_plus/network_info_plus.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../blue/blue_manage.dart';
 import '../../../../blue/io_protocol/io_configuringWifi.dart';
 import '../../../../blue/io_reply.dart';
-import '../../../../blue/io_tool/io_manager.dart';
 import '../../../../blue/io_tool/io_tool.dart';
 import '../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../blue/sender_manage.dart';
-import '../../../../login/login/entity/LoginData.dart';
-import '../../../../mine/mine/starLockMine_state.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/storage.dart';
 import 'configuringWifi_state.dart';
@@ -71,7 +66,7 @@ class ConfiguringWifiLogic extends BaseGetXController{
         print("${reply.commandType}数据解析成功");
         state.sureBtnState.value = 0;
         dismissEasyLoading();
-        Toast.show(msg: "配网成功");
+        showToast("配网成功");
         break;
       case 0x06:
       //无权限
@@ -132,7 +127,7 @@ class ConfiguringWifiLogic extends BaseGetXController{
         break;
       case 0xff:
         //成功
-        Toast.show(msg: "配网失败");
+        showToast("配网失败");
         break;
       default:
       //失败

star_lock/lib/main/lockDetail/lcokSet/diagnose/diagnose_logic.dart

@@ -2,8 +2,6 @@
 import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../network/api_repository.dart';
-import '../../../../tools/eventBusEventManage.dart';
-import '../../../../tools/toast.dart';
 import 'diagnose_state.dart';
 
 class DiagnoseLogic extends BaseGetXController{
@@ -22,7 +20,7 @@ class DiagnoseLogic extends BaseGetXController{
       timestamp:"1689410559456000",
     );
     if(entity.errorCode!.codeIsSuccessful){
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart

@@ -20,7 +20,6 @@ import '../../../../tools/baseGetXController.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/showTFView.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'checkingInInfoData_entity.dart';
 import 'lockSet_state.dart';
@@ -494,7 +493,7 @@ class LockSetLogic extends BaseGetXController {
           sureClick: () {
             //发送删除锁请求
             if (state.passwordTF.text.isEmpty) {
-              Toast.show(msg: "请输入登录密码");
+              showToast("请输入登录密码");
               return;
             }
             checkLoginPassword();
@@ -634,7 +633,7 @@ class LockSetLogic extends BaseGetXController {
 
       eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSettingInfo.value.attendance!));
       print("state.lockSettingInfo.value.attendance:${state.lockSettingInfo.value.attendance}");
-      Toast.show(msg: "设置成功");
+      showToast("设置成功");
     }
   }
 
@@ -649,7 +648,7 @@ class LockSetLogic extends BaseGetXController {
 
       state.isLockPickingReminder.value = (state.isLockPickingReminder.value == 1 ? 0 : 1);
       state.lockSettingInfo.value.unlockReminderPush = state.isLockPickingReminder.value;
-      Toast.show(msg: "设置成功");
+      showToast("设置成功");
     } else {}
   }
 
@@ -667,7 +666,7 @@ class LockSetLogic extends BaseGetXController {
 
       eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSettingInfo.value.appUnlockOnline!));
       print("state.lockSettingInfo.value.appUnlockOnline:${state.lockSettingInfo.value.appUnlockOnline}");
-      Toast.show(msg: "设置成功");
+      showToast("设置成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart

@@ -7,14 +7,11 @@ import 'package:star_lock/blue/blue_manage.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
-import '../../../../main.dart';
 import '../../../../tools/appRouteObserver.dart';
 import '../../../../tools/commonItem.dart';
 
-import '../../../../tools/showTFView.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'lockSet_logic.dart';
 
@@ -199,7 +196,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
               isHaveLine: true,
               isHaveDirection: true,
               action: () {
-                Toast.show(msg: "功能暂未开放");
+                logic.showToast("功能暂未开放");
               }))),
       // 开门器
       Visibility(
@@ -210,7 +207,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
               isHaveLine: false,
               isHaveDirection: true,
               action: () {
-                Toast.show(msg: "功能暂未开放");
+                logic.showToast("功能暂未开放");
               })),
       SizedBox(height: 10.h),
       // 自动闭锁
@@ -700,7 +697,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
       thumbColor: CupertinoColors.white,
       value: false,
       onChanged: (value) {
-        Toast.show(msg: "功能暂未开放");
+        logic.showToast("功能暂未开放");
       },
     );
   }

star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_logic.dart

@@ -13,7 +13,6 @@ import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'lockSoundSet_state.dart';
 
 class LockSoundSetLogic extends BaseGetXController {
@@ -32,7 +31,7 @@ class LockSoundSetLogic extends BaseGetXController {
       state.lockSetInfoData.value.lockSettingInfo!.lockSound = state.isOpenLockSound.value == true ? 1 :0;
       state.lockSetInfoData.value.lockSettingInfo!.lockSoundVolume = state.lockSoundLevel.value;
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/lockTime/lockTime_logic.dart

@@ -1,14 +1,11 @@
 
 import 'dart:async';
 
-import 'package:date_format/date_format.dart';
 import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
 
 import '../../../../blue/blue_manage.dart';
-import '../../../../blue/io_protocol/io_getLockStatu.dart';
 import '../../../../blue/io_protocol/io_timing.dart';
 import '../../../../blue/io_reply.dart';
-import '../../../../blue/io_tool/io_manager.dart';
 import '../../../../blue/io_tool/io_tool.dart';
 import '../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../blue/sender_manage.dart';
@@ -16,7 +13,6 @@ import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
 import '../../../../tools/dateTool.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'lockTime_state.dart';
 
 class LockTimeLogic extends BaseGetXController{
@@ -104,7 +100,7 @@ class LockTimeLogic extends BaseGetXController{
 
         state.sureBtnState.value = 0;
         dismissEasyLoading();
-        Toast.show(msg:"锁时间更新成功");
+        showToast("锁时间更新成功");
         break;
       case 0x06:
       //无权限

star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_logic.dart

@@ -1,10 +1,8 @@
 
-
 import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
-import '../../../../tools/toast.dart';
 import 'markedHouseState_state.dart';
 
 class MarkedHouseStateLogic extends BaseGetXController{
@@ -21,7 +19,7 @@ class MarkedHouseStateLogic extends BaseGetXController{
 
       state.lockSetInfoData.value.lockStatus!.roomStatus = state.roomStatus.value;
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }else if(entity.errorCode! == 1){
       // 跳转到高级功能界面 需要开通高级功能
 

star_lock/lib/main/lockDetail/lcokSet/motorPower/motorPower_logic.dart

@@ -14,7 +14,6 @@ import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'motorPower_state.dart';
 
 class MotorPowerLogic extends BaseGetXController {
@@ -30,7 +29,7 @@ class MotorPowerLogic extends BaseGetXController {
 
       state.lockSetInfoData.value.lockSettingInfo!.openDirectionValue = state.motorTorsion.value;
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_logic.dart

@@ -1,8 +1,6 @@
 
-
 import 'dart:async';
 
-import 'package:date_format/date_format.dart';
 import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 
@@ -10,14 +8,12 @@ import '../../../../blue/blue_manage.dart';
 import '../../../../blue/io_protocol/io_readSupportFunctionsWithParameters.dart';
 import '../../../../blue/io_protocol/io_setSupportFunctionsWithParameters.dart';
 import '../../../../blue/io_reply.dart';
-import '../../../../blue/io_tool/io_manager.dart';
 import '../../../../blue/io_tool/io_tool.dart';
 import '../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'normallyOpenMode_state.dart';
 
 class NormallyOpenModeLogic extends BaseGetXController{
@@ -26,12 +22,12 @@ class NormallyOpenModeLogic extends BaseGetXController{
   // 配置锁的常开模式设置
   void configPassageMode() async{
     if(state.weekDays.value.isEmpty){
-      Toast.show(msg:"请选择常开日期");
+      showToast("请选择常开日期");
       return;
     }
 
     if(state.endTimeMinute.value < state.beginTimeMinute.value){
-      Toast.show(msg:"结束时间不能小于开始时间哦");
+      showToast("结束时间不能小于开始时间哦");
       return;
     }
 
@@ -56,7 +52,7 @@ class NormallyOpenModeLogic extends BaseGetXController{
       state.lockSetInfoData.value.lockSettingInfo!.passageMode = state.isOpenNormallyOpenMode.value == true ? 1:0;
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
       eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(2, state.lockSetInfoData.value.lockSettingInfo!.passageMode!));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/openDoorDirection/openDoorDirection_logic.dart

@@ -14,7 +14,6 @@ import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 import 'openDoorDirection_state.dart';
 
 class OpenDoorDirectionLogic extends BaseGetXController {
@@ -32,7 +31,7 @@ class OpenDoorDirectionLogic extends BaseGetXController {
       // state.openDirectionValue.value = state.openDirectionValue.value == 1 ? 0 : 1;
       state.lockSetInfoData.value.lockSettingInfo!.openDirectionValue = state.openDirectionValue.value;
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_logic.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../blue/blue_manage.dart';
 import '../../../../blue/io_protocol/io_readSupportFunctionsNoParameters.dart';
@@ -31,7 +30,7 @@ class RemoteUnlockingLogic extends BaseGetXController{
       state.lockSetInfoData.value.lockSettingInfo!.remoteUnlock = state.remoteEnable.value;
       print("state.remoteEnable.value:${state.remoteEnable.value} state.getKeyInfosData.value.remoteEnable:${state.lockSetInfoData.value.lockSettingInfo!.remoteUnlock}");
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_logic.dart

@@ -9,14 +9,12 @@ import '../../../../blue/blue_manage.dart';
 import '../../../../blue/io_protocol/io_readSupportFunctionsNoParameters.dart';
 import '../../../../blue/io_protocol/io_setSupportFunctionsNoParameters.dart';
 import '../../../../blue/io_reply.dart';
-import '../../../../blue/io_tool/io_manager.dart';
 import '../../../../blue/io_tool/io_tool.dart';
 import '../../../../blue/io_tool/manager_event_bus.dart';
 import '../../../../blue/sender_manage.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/eventBusEventManage.dart';
 import '../../../../tools/storage.dart';
-import '../../../../tools/toast.dart';
 
 class ResetButtonLogic extends BaseGetXController{
   ResetButtonState state = ResetButtonState();
@@ -33,7 +31,7 @@ class ResetButtonLogic extends BaseGetXController{
       state.resetButtonEnable.value = state.resetButtonEnable.value == 1 ? 2 : 1;
       state.lockSetInfoData.value.lockSettingInfo!.resetSwitch = state.resetButtonEnable.value;
       eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
-      Toast.show(msg: "操作成功");
+      showToast("操作成功");
     }
   }
 

star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -609,9 +609,11 @@ class _LockDetailPageState extends State<LockDetailPage>
     // print("LockDetailPage===dispose");
     AppRouteObserver().routeObserver.unsubscribe(this);
     state.closedUnlockSuccessfulTimer?.cancel();
-    // state.animationController.reset();
+    if(state.animationController != null){
-    // state.animationController.forward();
+      state.animationController.reset();
-    // state.animationController.dispose();
+      state.animationController.forward();
+      state.animationController.dispose();
+    }
     super.dispose();
   }
 
@@ -633,9 +635,11 @@ class _LockDetailPageState extends State<LockDetailPage>
     BlueManage().stopScan();
     BlueManage().disconnect(BlueManage().connectDeviceMacAddress);
     state.openLockBtnState.value = 0;
-    state.animationController.reset();
+    if(state.animationController != null){
-    state.animationController.forward();
+      state.animationController.reset();
-    state.animationController.dispose();
+      state.animationController.forward();
+      state.animationController.dispose();
+    }
   }
 
   /// 从下级返回 当前界面即将出现

star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart

@@ -3,19 +3,15 @@ import 'dart:async';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../blue/blue_manage.dart';
-import '../../../blue/io_protocol/io_referEventRecordNumber.dart';
 import '../../../blue/io_protocol/io_referEventRecordTime.dart';
 import '../../../blue/io_reply.dart';
-import '../../../blue/io_tool/io_manager.dart';
 import '../../../blue/io_tool/io_tool.dart';
 import '../../../blue/io_tool/manager_event_bus.dart';
 import '../../../blue/sender_manage.dart';
 import '../../../network/api_repository.dart';
 import '../../../tools/baseGetXController.dart';
-import '../../../tools/dateTool.dart';
 import '../../../tools/storage.dart';
 import '../electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart';
 import 'lockOperatingRecordGetLastRecordTime_entity.dart';
@@ -235,7 +231,7 @@ class LockOperatingRecordLogic extends BaseGetXController{
     KeyOperationRecordEntity entity =
     await ApiRepository.to.clearOperationRecord('28');
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "清除数据成功");
+      showToast("清除数据成功");
     }
   }
 

star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart

@@ -4,14 +4,11 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart';
 
-import '../../../appRouters.dart';
 import '../../../app_settings/app_colors.dart';
 import '../../../tools/custom_bottom_sheet.dart';
-import '../../../tools/jh_pop_menus.dart';
 import '../../../tools/noData.dart';
 import '../../../tools/storage.dart';
 import '../../../tools/titleAppBar.dart';
-import '../../../tools/toast.dart';
 import '../../../translations/trans_lib.dart';
 import 'lockOperatingRecord_logic.dart';
 
@@ -63,7 +60,7 @@ class _LockOperatingRecordPageState extends State<LockOperatingRecordPage> {
                 _openModalBottomSheet();
               }else{
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             },
           ),

star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart

@@ -6,10 +6,7 @@ import 'package:star_lock/talk/call/callTalk.dart';
 
 import '../../../../app_settings/app_colors.dart';
 import '../../../../login/seletCountryRegion/common/index.dart';
-import '../../../../talk/udp/udp_manage.dart';
-import '../../../../talk/udp/udp_senderManage.dart';
 import '../../../../tools/showTFView.dart';
-import '../../../../tools/toast.dart';
 import 'lockMonitoring_logic.dart';
 
 class LockMonitoringPage extends StatefulWidget {
@@ -270,7 +267,7 @@ class _LockMonitoringPageState extends State<LockMonitoringPage> {
           sureClick: () async {
             //发送删除锁请求
             if (state.passwordTF.text.isEmpty) {
-              Toast.show(msg: "请输入开锁密码");
+              logic.showToast("请输入开锁密码");
               return;
             }
 

star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart

@@ -3,7 +3,6 @@ import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyDetail/password
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class PasswordKeyDetailLogic extends BaseGetXController {
   final PasswordKeyDetailState state = PasswordKeyDetailState();
@@ -15,7 +14,7 @@ class PasswordKeyDetailLogic extends BaseGetXController {
         state.itemData.value.keyboardPwdId.toString(),
         1);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "删除成功");
+      showToast("删除成功");
       Get.back();
     }
   }
@@ -34,7 +33,7 @@ class PasswordKeyDetailLogic extends BaseGetXController {
         hoursEnd: state.hoursEnd.value,
         isCoerced: state.isCoerced.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "修改成功");
+      showToast("修改成功");
       Get.back();
     }
   }

star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_logic.dart

@@ -3,7 +3,6 @@ import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyDetailChangeDat
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class PasswordKeyDetailChangeDateLogic extends BaseGetXController {
   final PasswordKeyDetailChangeDateState state =
@@ -23,8 +22,9 @@ class PasswordKeyDetailChangeDateLogic extends BaseGetXController {
         hoursEnd: state.hoursEnd.value,
         isCoerced: state.isCoerced.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "修改成功");
+      showToast("修改成功", something: (){
-      Get.back();
+        Get.back();
+      });
     }
   }
 }

star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart

@@ -2,7 +2,6 @@ import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKe
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_state.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../passwordKey_perpetual/passwordKeyEntity.dart';
 
@@ -28,7 +27,7 @@ class PasswordKeyListLogic extends BaseGetXController {
         .keyboardPwdReset(state.keyInfo.value.lockId.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       print("重置电子钥匙成功啦啦啦啦啦");
-      Toast.show(msg: "重置成功");
+      showToast("重置成功");
       mockNetworkDataRequest();
     }
   }
@@ -39,7 +38,7 @@ class PasswordKeyListLogic extends BaseGetXController {
     PasswordKeyEntity entity = await ApiRepository.to
         .deleteKeyboardPwd(lockId, keyboardPwdId, deleteType);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "删除成功");
+      showToast("删除成功");
       mockNetworkDataRequest();
     }
   }

star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart

@@ -7,7 +7,6 @@ import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKe
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart';
 import 'package:star_lock/tools/noData.dart';
 import 'package:star_lock/tools/storage.dart';
-import 'package:star_lock/tools/toast.dart';
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/keySearchWidget.dart';
@@ -64,7 +63,7 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
                 if (isDemoMode == false) {
                   _showDialog(context);
                 } else {
-                  Toast.show(msg: '演示模式');
+                  logic.showToast("演示模式");
                 }
               },
             ),

star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart

@@ -5,7 +5,6 @@ import 'package:star_lock/blue/io_type.dart';
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_state.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/eventBusEventManage.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../blue/blue_manage.dart';
 import '../../../../blue/io_reply.dart';
@@ -117,7 +116,7 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
         state.getPwdStr.value = entity.data!.keyboardPwd!;
       }
     } else {
-      Toast.show(msg: '${entity.errorMsg}');
+      showToast('${entity.errorMsg}');
     }
   }
 
@@ -154,7 +153,7 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
         state.getPwdStr.value = entity.data!.keyboardPwd!;
       }
     } else {
-      Toast.show(msg: '${entity.errorMsg}');
+      showToast('${entity.errorMsg}');
     }
   }
 

star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart

@@ -5,13 +5,11 @@ import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/app_settings/app_colors.dart';
-import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyManage/passwordKeyManage_tabbar.dart';
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/style/default_style.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
 import 'package:star_lock/tools/storage.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../tools/commonItem.dart';
@@ -414,18 +412,18 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                 if (state.widgetType.value == 3) {
                   logic.getStartDate(state.effectiveDateTime.value);
                   if (state.nameController.text.isEmpty) {
-                    Toast.show(msg: '请输入姓名');
+                    logic.showToast("请输入姓名");
                     return;
                   }
                   if (state.pwdController.text.isEmpty) {
-                    Toast.show(msg: '请输入密码');
+                    logic.showToast("请输入密码");
                     return;
                   }
                   //非永久 须有时限
                   if (state.isPermanent.value == false) {
                     if (!startDateTime.isBefore(endDateTime) ||
                         startDateTime.isAtSameMomentAs(endDateTime)) {
-                      Toast.show(msg: '失效时间需大于生效时间');
+                      logic.showToast("失效时间需大于生效时间");
                       return;
                     }
                   }
@@ -433,7 +431,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                   logic.senderCustomPasswords();
                 } else {
                   if (state.nameController.text.isEmpty) {
-                    Toast.show(msg: '请输入姓名');
+                    logic.showToast("请输入姓名");
                     return;
                   }
 
@@ -441,7 +439,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                   if (state.widgetType.value == 1) {
                     if (!startDateTime.isBefore(endDateTime) ||
                         startDateTime.isAtSameMomentAs(endDateTime)) {
-                      Toast.show(msg: '失效时间需大于生效时间');
+                      logic.showToast("失效时间需大于生效时间");
                       return;
                     }
                   }
@@ -449,12 +447,12 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                   if (state.widgetType.value == 4) {
                     if (!startDateTime.isBefore(endDateTime) ||
                         startDateTime.isAtSameMomentAs(endDateTime)) {
-                      Toast.show(msg: '结束时间需大于当前时间');
+                      logic.showToast("结束时间需大于当前时间");
                       return;
                     }
                     if (state.loopEndHours.value <=
                         state.loopStartHours.value) {
-                      Toast.show(msg: '失效时间需大于生效时间');
+                      logic.showToast("失效时间需大于生效时间");
                       return;
                     }
                   }
@@ -462,7 +460,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
                   logic.getKeyboardPwdRequest();
                 }
               } else {
-                Toast.show(msg: '演示模式');
+                logic.showToast("演示模式");
               }
             }),
       ],

star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart

@@ -9,7 +9,6 @@ import 'package:star_lock/talk/call/callTalk.dart';
 
 import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/showTFView.dart';
-import '../../../../tools/toast.dart';
 import 'realTimePicture_logic.dart';
 
 class RealTimePicturePage extends StatefulWidget {
@@ -205,7 +204,7 @@ class _RealTimePicturePageState extends State<RealTimePicturePage>
       Obx(() => bottomBtnItemWidget(
               getAnswerBtnImg(), getAnswerBtnName(), Colors.white, () async {
             //监视状态下不能发送录音
-            Toast.show(msg: '监视状态下不能发送录音');
+            logic.showToast("监视状态下不能发送录音");
           }, longPress: () async {
             /*
             // 开始长按
@@ -244,7 +243,7 @@ class _RealTimePicturePageState extends State<RealTimePicturePage>
       }),
       bottomBtnItemWidget("images/main/icon_lockDetail_monitoringUnlock.png",
           "开锁", AppColors.mainColor, () {
-        Toast.show(msg: "监视中暂不能开锁");
+        logic.showToast("监视中暂不能开锁");
         /*
         showDeletPasswordAlertDialog(context);
         */
@@ -322,7 +321,7 @@ class _RealTimePicturePageState extends State<RealTimePicturePage>
           sureClick: () async {
             //发送删除锁请求
             if (state.passwordTF.text.isEmpty) {
-              Toast.show(msg: "请输入开锁密码");
+              logic.showToast("请输入开锁密码");
               return;
             }
 

star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControl_page.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-// import 'package:flutter_pickers/pickers.dart';
-// import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
@@ -13,7 +11,6 @@ import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/commonItem.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'addRemoteControl_logic.dart';
 
@@ -183,14 +180,14 @@ class _AddRemoteControlPageState extends State<AddRemoteControlPage> {
               if (isDemoMode == false) {
                 // print("state.seletType:${state.seletType.value}");
                 if (state.nameController.text.isEmpty) {
-                  Toast.show(msg: "请输入姓名");
+                  logic.showToast("请输入姓名");
                   return;
                 }
-                Toast.show(msg: "请确保在设备附近");
+                logic.showToast("请确保在设备附近");
                 // logic.addFingerprintsData();
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             }),
       ],

star_lock/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart

@@ -12,7 +12,6 @@ import '../../../../tools/showIosTipView.dart';
 import '../../../../tools/storage.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'remoteControlList_logic.dart';
 
@@ -47,7 +46,7 @@ class _RemoteControlListPageState extends State<RemoteControlListPage> {
                 showDeletAlertDialog(context);
               } else {
                 // Get.toNamed(Routers.seletLockTypePage);
-                Toast.show(msg: "演示模式");
+                logic.showToast("演示模式");
               }
             },
           ),

star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
@@ -377,7 +376,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
 
   void gotoLogin() {
     // Get.toNamed(Routers.seletLockTypePage);
-    Toast.show(msg: "演示模式");
+    logic.showToast("演示模式");
   }
 
 }

star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart

@@ -1,17 +1,15 @@
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
-import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
 import '../../../../tools/commonItem.dart';
 import '../../../../tools/submitBtn.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
-import '../../../lockDetail/lcokSet/lockSet/lockSetInfo_entity.dart';
 
 class DemoModeLockSetPage extends StatefulWidget {
   const DemoModeLockSetPage({Key? key}) : super(key: key);
@@ -347,7 +345,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
 
   void gotoAddLock(){
     // Get.toNamed(Routers.seletLockTypePage);
-    Toast.show(msg: "演示模式");
+    EasyLoading.showToast("演示模式",duration: 2000.milliseconds);
   }
 
 }

star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart

@@ -5,12 +5,10 @@ import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../appRouters.dart';
 import '../../../app_settings/app_colors.dart';
 import '../../../login/seletCountryRegion/common/countryRegionEntity.dart';
-import '../../../login/seletCountryRegion/common/utils.dart';
 import '../../../network/api_repository.dart';
 import '../../../tools/commonItem.dart';
 import '../../../tools/titleAppBar.dart';
@@ -142,7 +140,7 @@ class _AddLockSeletCountryPageState extends State<AddLockSeletCountryPage> {
                   ),
                   onPressed: () {
                     if(seletindex == 10000){
-                      Toast.show(msg: "请选择国家");
+                      logic.showToast("请选择国家");
                       return;
                     }
                     CountryRegionModel model = countriesList[seletindex];

star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart

@@ -5,7 +5,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:amap_flutter_location/amap_flutter_location.dart';
 import 'package:amap_flutter_location/amap_location_option.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
 
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -18,7 +17,6 @@ import '../../../../app_settings/app_colors.dart';
 import '../../../../blue/blue_manage.dart';
 import '../../../../tools/appRouteObserver.dart';
 import '../../../../tools/titleAppBar.dart';
-import '../../../../tools/toast.dart';
 import '../../../../translations/trans_lib.dart';
 import 'lockAddressGaoDe_logic.dart';
 
@@ -264,7 +262,7 @@ class _LockAddressGaoDePageState extends State<LockAddressGaoDePage> with RouteA
                 ),
                 onPressed: () {
                   if(addressInfo!.isEmpty){
-                    Toast.show(msg:"还未获取到位置信息哦，请耐心等待一下！");
+                    logic.showToast("还未获取到位置信息哦，请耐心等待一下！");
                     return;
                   }
                   Get.toNamed(Routers.saveLockPage, arguments: {

star_lock/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart

@@ -1,19 +1,14 @@
-import 'dart:async';
-import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';
-import '../../../../main.dart';
 import '../../../../tools/titleAppBar.dart';
 import '../../../../translations/trans_lib.dart';
 
-import '../gaode/lockAddressGaoDe_page.dart';
-
 class LockAddressPage extends StatefulWidget {
   const LockAddressPage({Key? key}) : super(key: key);
 
@@ -40,7 +35,7 @@ class _LockAddressPageState extends State<LockAddressPage> with RouteAware{
               ),
               onPressed: () {
                 if(addressInfo!.isEmpty){
-                  Toast.show(msg:"请先获取到位置信息哦!");
+                  EasyLoading.showToast("请先获取到位置信息哦!", duration: 2000.milliseconds);
                   return;
                 }
                 Get.toNamed(Routers.saveLockPage, arguments: addressInfo);

star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart

@@ -8,9 +8,7 @@ import 'package:permission_handler/permission_handler.dart';
 import '../../../appRouters.dart';
 import '../../../app_settings/app_colors.dart';
 import '../../../baseWidget.dart';
-// import '../../../tools/store_service.dart';
 import '../../../tools/titleAppBar.dart';
-import '../../../tools/toast.dart';
 import '../../../translations/trans_lib.dart';
 
 class SeletLockTypePage extends StatefulWidget {

star_lock/lib/mine/mine/safeVerify/safeVerify_logic.dart

@@ -9,7 +9,6 @@ import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/mine/mine/safeVerify/safeVerify_state.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class SafeVerifyLogic extends BaseGetXController {
   final SafeVerifyState state = SafeVerifyState();
@@ -50,7 +49,7 @@ class SafeVerifyLogic extends BaseGetXController {
     LoginEntity entity =
         await ApiRepository.to.deleteAccount("1", state.verificationCode.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '验证成功，账号已删除');
+      showToast("验证成功，账号已删除");
       //删除账号成功，
       Get.offNamedUntil(Routers.starLockLoginPage, (route) => false);
     }

star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_logic.dart

@@ -1,15 +1,10 @@
 import 'dart:async';
 
 import 'package:flutter/cupertino.dart';
-import 'package:get/get_core/src/get_main.dart';
-import 'package:get/get_navigation/src/extension_navigation.dart';
 import 'package:get/get_utils/get_utils.dart';
-import 'package:star_lock/appRouters.dart';
-import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class PersonInfoEditAccountLogic extends BaseGetXController {
   final PersonInfoEditAccountState state = PersonInfoEditAccountState();

star_lock/lib/mine/minePersonInfo/minePersonInfoEditName/MinePersonInfoEditName_logic.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditName/MinePersonInfoEditNamePage_state.dart';
-import 'package:star_lock/tools/toast.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
 
@@ -14,7 +13,7 @@ class MinePersonInfoEditNameLogic extends BaseGetXController {
     var entity =
         await ApiRepository.to.updateUserInfo(state.inputNickName.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '操作成功');
+      showToast("操作成功");
       Get.back();
     }
   }

star_lock/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart

@@ -3,7 +3,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditName/MinePersonInfoEditName_logic.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../app_settings/app_colors.dart';
 import '../../../tools/tf_loginInput.dart';
@@ -39,7 +38,7 @@ class _MinePersonInfoEditNamePageState
               ),
               onPressed: () {
                 if (state.nickNameIsOK == false) {
-                  Toast.show(msg: '请输入昵称');
+                  logic.showToast("请输入昵称");
                 } else {
                   logic.updateUserInfoRequest();
                 }

star_lock/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_logic.dart

@@ -5,10 +5,8 @@ import 'package:get/get.dart';
 import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_state.dart';
-import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class MineBindPhoneOrEmailLogic extends BaseGetXController {
   final MineBindPhoneOrEmailState state = MineBindPhoneOrEmailState();
@@ -51,7 +49,7 @@ class MineBindPhoneOrEmailLogic extends BaseGetXController {
         state.verificationCode.value,
         state.unbindToken.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '邮箱绑定成功');
+      showToast("邮箱绑定成功");
       Get.until((route) => route.settings.name == Routers.minePersonInfoPage);
     }
   }
@@ -64,7 +62,7 @@ class MineBindPhoneOrEmailLogic extends BaseGetXController {
         state.verificationCode.value,
         state.unbindToken.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '手机绑定成功');
+      showToast("手机绑定成功");
       Get.until((route) => route.settings.name == Routers.minePersonInfoPage);
     }
   }

star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart

@@ -1,9 +1,7 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_state.dart';
-import 'package:star_lock/tools/toast.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
 import 'minePersonGetUploadFileInfo_entity.dart';
@@ -81,7 +79,7 @@ class MinePersonInfoLogic extends GetConnect{
   Future<void> updateUserInfoRequest() async {
     var entity = await ApiRepository.to.updateUserInfo(state.headUrl.value);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '操作成功');
+      EasyLoading.showToast("操作成功", duration: 2000.milliseconds);
     }
   }
 

star_lock/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_logic.dart

@@ -5,7 +5,6 @@ import 'package:get/get.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_state.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 
 class MinePersonInfoResetPasswordLogic extends BaseGetXController {
   final MinePersonInfoResetPasswordState state =
@@ -15,7 +14,7 @@ class MinePersonInfoResetPasswordLogic extends BaseGetXController {
     var entity = await ApiRepository.to.changePassword(
         state.date.value, state.surePwd.value, state.oldPwd.value, "");
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '重置成功');
+      showToast("重置成功");
       Get.back();
     } else {
       print('Error');

star_lock/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_logic.dart

@@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_state.dart';
-import 'package:star_lock/tools/toast.dart';
 import 'package:star_lock/translations/trans_lib.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
@@ -26,7 +25,7 @@ class MineSetSafetyProblemLogic extends BaseGetXController {
     var entity =
         await ApiRepository.to.setSafeAnswer(state.questionAndAnswerList);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '操作成功');
+      showToast("操作成功");
       Get.until((route) => route.settings.name == Routers.minePersonInfoPage);
     }
   }

star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_logic.dart

@@ -4,7 +4,6 @@ import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/mine/mineSet/addAuthorizedAdministrator/AddAuthorizedAdministrator_state.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/toast.dart';
 import 'package:star_lock/translations/trans_lib.dart';
 
 class AddAuthorizedAdministratorLogic extends BaseGetXController {
@@ -37,7 +36,7 @@ class AddAuthorizedAdministratorLogic extends BaseGetXController {
       print('发送电子钥匙成功');
       state.isSendSuccess.value = true;
     } else {
-      Toast.show(msg: '${entity.errorMsg}');
+      showToast("${entity.errorMsg}");
       if (entity.errorCode == 425) {
         //用户未注册
         state.isCreateUser.value = true;

star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart

@@ -1,9 +1,8 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
-// import 'package:flutter_pickers/pickers.dart';
-// import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 import 'package:get/get_utils/get_utils.dart';
 import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/app_settings/app_colors.dart';
@@ -13,9 +12,10 @@ import 'package:star_lock/tools/commonItem.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
 import 'package:star_lock/tools/submitBtn.dart';
-import 'package:star_lock/tools/toast.dart';
 import 'package:star_lock/translations/trans_lib.dart';
 
+import 'addAuthorizedAdministrator_logic.dart';
+
 class AddAuthorizedAdministratorPage extends StatefulWidget {
   const AddAuthorizedAdministratorPage({Key? key}) : super(key: key);
 
@@ -25,9 +25,10 @@ class AddAuthorizedAdministratorPage extends StatefulWidget {
   }
 }
 
-class _AddAuthorizedAdministratorPageState
+class _AddAuthorizedAdministratorPageState extends State<AddAuthorizedAdministratorPage> with SingleTickerProviderStateMixin {
-    extends State<AddAuthorizedAdministratorPage>
+  final logic = Get.put(AddAuthorizedAdministratorLogic());
-    with SingleTickerProviderStateMixin {
+  final state = Get.find<AddAuthorizedAdministratorLogic>().state;
+
   TabController? _tabController;
   final FlutterContactPicker _contactPicker = FlutterContactPicker();
   late Contact _contact;
@@ -236,7 +237,7 @@ class _AddAuthorizedAdministratorPageState
       _isSendSuccess = true;
       setState(() {});
     } else {
-      Toast.show(msg: '${entity.errorMsg}');
+      logic.showToast("${entity.errorMsg}");
       if (entity.errorCode == 425) {
         //用户未注册
         _isCreateUser = true;

star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_logic.dart

@@ -1,8 +1,6 @@
 
-
 import '../../../network/api_repository.dart';
 import '../../../tools/baseGetXController.dart';
-import '../../../tools/toast.dart';
 import 'appUnlockNeedMobileNetworkingLock_state.dart';
 import 'selectLockListEntity.dart';
 
@@ -25,7 +23,7 @@ class AppUnlockNeedMobileNetworkingLockLogic extends BaseGetXController{
     SelectLockListEntity entity =
     await ApiRepository.to.setAppUnlockMustOnline(state.selectLockIdList);
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: '操作成功');
+      showToast("操作成功");
     }
   }
 

star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/mine/mineSet/appUnlockNeedMobileNetworkingLock/selectLockListEntity.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../app_settings/app_colors.dart';
 import '../../../tools/commonItem.dart';
@@ -113,7 +112,7 @@ class _APPUnlockNeedMobileNetworkingLockPageState extends State<APPUnlockNeedMob
                   if (state.selectLockIdList.isNotEmpty) {
                     logic.setAppUnlockMustOnlineRequest();
                   } else {
-                    Toast.show(msg: '请选择需设置的锁');
+                    logic.showToast("请选择需设置的锁");
                   }
                 }),
             SizedBox(

star_lock/lib/mine/mineSet/authorizedAdministrator/administratorDetails/adminDetailChangeDate_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
-// import 'package:flutter_pickers/pickers.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
-// import 'package:flutter_pickers/time_picker/model/date_mode.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
@@ -9,7 +8,6 @@ import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
-import 'package:star_lock/tools/toast.dart';
 
 import '../../../../../app_settings/app_colors.dart';
 import '../../../../../tools/commonItem.dart';
@@ -108,7 +106,7 @@ class _AdminDetailChangeDatePage extends State<AdminDetailChangeDatePage> {
         '');
     if (entity.errorCode!.codeIsSuccessful) {
       print("修改管理员信息成功啦啦啦啦啦");
-      Toast.show(msg: "修改成功");
+      EasyLoading.showToast("修改成功",duration: 2000.milliseconds);
       setState(() {
         Navigator.pop(context);
       });

star_lock/lib/mine/mineSet/authorizedAdministrator/administratorDetails/administratorDetails_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
@@ -8,7 +9,6 @@ import 'package:star_lock/mine/mineSet/authorizedAdministrator/administratorDeta
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/jh_pop_menus.dart';
-import 'package:star_lock/tools/toast.dart';
 import 'package:star_lock/mine/mineSet/authorizedAdministrator/authorizedAdminListEntity.dart';
 
 import '../../../../../appRouters.dart';
@@ -258,7 +258,7 @@ class _AdministratorDetailsPageState extends State<AdministratorDetailsPage> {
         isRemoteUnlock);
     if (entity.errorCode!.codeIsSuccessful) {
       print("修改管理员信息成功啦啦啦啦啦");
-      Toast.show(msg: "修改成功");
+      EasyLoading.showToast("修改成功",duration: 2000.milliseconds);
       setState(() {
         if (isRemote) {
           Navigator.pop(context);
@@ -273,7 +273,7 @@ class _AdministratorDetailsPageState extends State<AdministratorDetailsPage> {
         .deleteAuthorizedAdmin(itemData.uid.toString(), '0');
     if (entity.errorCode!.codeIsSuccessful) {
       print("删除电子钥匙成功");
-      Toast.show(msg: "删除成功");
+      EasyLoading.showToast("删除成功",duration: 2000.milliseconds);
       setState(() {
         Navigator.pop(context, true);
       });

star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorList_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
@@ -13,7 +14,6 @@ import '../../../../tools/titleAppBar.dart';
 import '../../../../translations/trans_lib.dart';
 import '../../../tools/left_slide_actions.dart';
 import '../../../tools/showIosTipView.dart';
-import '../../../tools/toast.dart';
 
 class AuthorizedAdministratorListPage extends StatefulWidget {
   const AuthorizedAdministratorListPage({Key? key}) : super(key: key);
@@ -106,7 +106,7 @@ class _AuthorizedAdministratorListPageState
     AuthorizedAdminListEntity entity = await ApiRepository.to
         .deleteAuthorizedAdmin(uid, '0');
     if (entity.errorCode!.codeIsSuccessful) {
-      Toast.show(msg: "删除成功");
+      EasyLoading.showToast("删除成功",duration: 2000.milliseconds);
       mockNetworkDataRequest();
     }
   }