diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockEscalation/lockEscalation_state.dart b/star_lock/lib/main/lockDetail/lcokSet/lockEscalation/lockEscalation_state.dart deleted file mode 100644 index 211ba75c..00000000 --- a/star_lock/lib/main/lockDetail/lcokSet/lockEscalation/lockEscalation_state.dart +++ /dev/null @@ -1,6 +0,0 @@ - -import 'package:get/get.dart'; - -class LockEscalationState{ - -} \ No newline at end of file diff --git a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart b/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_logic.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_logic.dart index d84e3fa0..394f977c 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_logic.dart @@ -5,7 +5,6 @@ import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; import 'package:star_lock/blue/io_protocol/io_setSupportFunctionsWithParameters.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../blue/blue_manage.dart'; -import '../../../../blue/io_protocol/io_readSupportFunctionsWithParameters.dart'; import '../../../../blue/io_reply.dart'; import '../../../../blue/io_tool/io_tool.dart'; import '../../../../blue/io_tool/manager_event_bus.dart'; @@ -180,7 +179,7 @@ class AutomaticBlockingLogic extends BaseGetXController{ var publicKey = await Storage.getStringList(saveBluePublicKey); List getPublicKeyList = changeStringListToIntList(publicKey!); - + String autoTime; if(state.isOpen.value == false){ autoTime = "0"; diff --git a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_state.dart b/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_state.dart similarity index 96% rename from star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_state.dart rename to star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_state.dart index aad60abb..01db9876 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_state.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import '../../../lockMian/entity/lockListInfo_entity.dart'; import '../lockSet/lockSetInfo_entity.dart'; class AutomaticBlockingState { @@ -43,4 +42,4 @@ class AutomaticBlockingState { } } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart index e7dd398c..bd3d36de 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart @@ -1,14 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import '../../../../../appRouters.dart'; import '../../../../../app_settings/app_colors.dart'; import '../../../../../tools/commonItem.dart'; import '../../../../../tools/titleAppBar.dart'; import '../../../../../translations/trans_lib.dart'; -import '../../lockSet/lockSetInfo_entity.dart'; import 'basicInformation_logic.dart'; class BasicInformationPage extends StatefulWidget { diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_state.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_state.dart similarity index 86% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_state.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_state.dart index e061ad0d..cd3a2595 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_state.dart @@ -1,7 +1,6 @@ import 'package:get/get.dart'; -import '../../../../lockMian/entity/lockListInfo_entity.dart'; import '../../lockSet/lockSetInfo_entity.dart'; class BasicInformationState { @@ -15,4 +14,4 @@ class BasicInformationState { lockSetInfoData.value = map["lockSetInfoData"]; lockBasicInfo.value = lockSetInfoData.value.lockBasicInfo!; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_logic.dart b/star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_logic.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_logic.dart index e312ab26..4d6b2a26 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_logic.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; -import 'package:star_lock/blue/io_protocol/io_readSupportFunctionsNoParameters.dart'; import 'package:star_lock/blue/io_protocol/io_setSupportFunctionsNoParameters.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../blue/blue_manage.dart'; @@ -207,4 +206,4 @@ class BurglarAlarmLogic extends BaseGetXController{ _replySubscription.cancel(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart similarity index 99% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart index bab2a18c..2dd8478c 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_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/appRouters.dart'; -import 'package:star_lock/tools/submitBtn.dart'; import '../../../../../app_settings/app_colors.dart'; import '../../../../../tools/titleAppBar.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_state.dart b/star_lock/lib/main/lockDetail/lockSet/checkInCreatCompany/checkInCreatCompany_state.dart similarity index 92% rename from star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_state.dart rename to star_lock/lib/main/lockDetail/lockSet/checkInCreatCompany/checkInCreatCompany_state.dart index 9a80bedf..7e67330e 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/checkInCreatCompany/checkInCreatCompany_state.dart @@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; -import '../../../lockMian/entity/lockListInfo_entity.dart'; import '../lockSet/lockSetInfo_entity.dart'; class CheckInCreatCompanyState{ @@ -23,4 +22,4 @@ class CheckInCreatCompanyState{ var map = Get.arguments; lockSetInfoData.value = map["lockSetInfoData"]; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifi_logic.dart b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi_logic.dart similarity index 99% rename from star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifi_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi_logic.dart index a2929839..8bcedc1a 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifi_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi_logic.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; -import 'package:get/get.dart'; import 'package:network_info_plus/network_info_plus.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:star_lock/tools/baseGetXController.dart'; @@ -266,4 +265,4 @@ class ConfiguringWifiLogic extends BaseGetXController{ _replySubscription.cancel(); super.onClose(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/diagnose/diagnose_state.dart b/star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_state.dart similarity index 80% rename from star_lock/lib/main/lockDetail/lcokSet/diagnose/diagnose_state.dart rename to star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_state.dart index b580a0bf..7bfca458 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/diagnose/diagnose_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_state.dart @@ -1,7 +1,6 @@ import 'package:get/get.dart'; -import '../../../lockMian/entity/lockListInfo_entity.dart'; import '../lockSet/lockSetInfo_entity.dart'; class DiagnoseState{ @@ -12,4 +11,4 @@ class DiagnoseState{ lockSetInfoData.value = map["lockSetInfoData"]; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockEscalation/lockEscalation_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart similarity index 93% rename from star_lock/lib/main/lockDetail/lcokSet/lockEscalation/lockEscalation_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart index 59101c6e..9c5cfb7e 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockEscalation/lockEscalation_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart @@ -2,7 +2,6 @@ import 'package:star_lock/tools/baseGetXController.dart'; -import '../../../../network/api_repository.dart'; import 'lockEscalation_state.dart'; class LockEscalationLogic extends BaseGetXController{ @@ -38,4 +37,4 @@ class LockEscalationLogic extends BaseGetXController{ // TODO: implement onClose } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_state.dart b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_state.dart new file mode 100644 index 00000000..3a0b472d --- /dev/null +++ b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_state.dart @@ -0,0 +1,4 @@ + +class LockEscalationState{ + +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart similarity index 99% rename from star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart index 1e911a59..1e36a072 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart @@ -9,7 +9,6 @@ import 'package:star_lock/blue/io_type.dart'; import '../../../../blue/blue_manage.dart'; import '../../../../blue/io_protocol/io_factoryDataReset.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_tool.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_logic.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_logic.dart index 0784dcc2..06c86829 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_logic.dart @@ -4,7 +4,6 @@ import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; import 'package:star_lock/tools/baseGetXController.dart'; 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_tool.dart'; @@ -222,4 +221,4 @@ class LockSoundSetLogic extends BaseGetXController { _replySubscription.cancel(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_state.dart b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_state.dart similarity index 92% rename from star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_state.dart rename to star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_state.dart index f1859dfc..fc2f221f 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_state.dart @@ -1,6 +1,5 @@ import 'package:get/get.dart'; -import '../../../lockMian/entity/lockListInfo_entity.dart'; import '../lockSet/lockSetInfo_entity.dart'; class LockSoundSetState { @@ -18,4 +17,4 @@ class LockSoundSetState { isOpenLockSound.value = lockSetInfoData.value.lockSettingInfo!.lockSound == 1 ? true : false; lockSoundLevel.value = lockSetInfoData.value.lockSettingInfo!.lockSoundVolume!; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_state.dart b/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_state.dart similarity index 85% rename from star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_state.dart rename to star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_state.dart index 1820563d..9c4e882b 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_state.dart @@ -1,7 +1,6 @@ import 'package:get/get.dart'; -import '../../../lockMian/entity/lockListInfo_entity.dart'; import '../lockSet/lockSetInfo_entity.dart'; class MarkedHouseStateState{ @@ -15,4 +14,4 @@ class MarkedHouseStateState{ roomStatus.value = lockSetInfoData.value.lockStatus!.roomStatus!; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/motorPower/motorPower_logic.dart b/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/motorPower/motorPower_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart index 8556b6f8..b36dbcf5 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/motorPower/motorPower_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart @@ -4,7 +4,6 @@ import 'dart:async'; import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; 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_tool.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart similarity index 99% rename from star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart index adb18730..2d778fd1 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart @@ -5,7 +5,6 @@ import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; import 'package:star_lock/tools/baseGetXController.dart'; 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_tool.dart'; @@ -266,4 +265,4 @@ class NormallyOpenModeLogic extends BaseGetXController{ _replySubscription.cancel(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/openDoorDirection/openDoorDirection_logic.dart b/star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_logic.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/openDoorDirection/openDoorDirection_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_logic.dart index 0f782546..ea5d7997 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/openDoorDirection/openDoorDirection_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_logic.dart @@ -4,7 +4,6 @@ import 'dart:async'; import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; 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_tool.dart'; @@ -192,4 +191,4 @@ class OpenDoorDirectionLogic extends BaseGetXController { _replySubscription.cancel(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_logic.dart b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart index a40fe439..766b5243 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart @@ -4,7 +4,6 @@ import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; import 'package:star_lock/tools/baseGetXController.dart'; 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_tool.dart'; @@ -206,4 +205,4 @@ class RemoteUnlockingLogic extends BaseGetXController{ _replySubscription.cancel(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_state.dart b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_state.dart similarity index 90% rename from star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_state.dart rename to star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_state.dart index 3d5c6d00..9fae5267 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_state.dart @@ -1,7 +1,6 @@ import 'package:get/get.dart'; -import '../../../lockMian/entity/lockListInfo_entity.dart'; import '../lockSet/lockSetInfo_entity.dart'; class ResetButtonState{ @@ -19,4 +18,4 @@ class ResetButtonState{ resetButtonEnable.value = lockSetInfoData.value.lockSettingInfo!.resetSwitch!; } -} \ No newline at end of file +}