diff --git a/star_lock/lib/appRouters.dart b/star_lock/lib/appRouters.dart index c707ab20..c4cd51c3 100644 --- a/star_lock/lib/appRouters.dart +++ b/star_lock/lib/appRouters.dart @@ -2,7 +2,7 @@ import 'package:get/get.dart'; import 'package:star_lock/common/safetyVerification/safetyVerification_binding.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/login/register/starLock_register_binding.dart'; -import 'package:star_lock/main/accessoriesList/accessoriesList_page.dart'; +import 'package:star_lock/main/lockDetail/accessoriesList/accessoriesList_page.dart'; import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_page.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_page.dart'; @@ -13,19 +13,25 @@ import 'package:star_lock/main/lockDetail/face/faceDetail/faceDetail_page.dart'; import 'package:star_lock/main/lockDetail/iris/addIris/addIris_page.dart'; import 'package:star_lock/main/lockDetail/iris/addIrisType/addIrisTypeManage/addIrisTypeManage_page.dart'; import 'package:star_lock/main/lockDetail/iris/irisList/irisList_page.dart'; -import 'package:star_lock/main/lockDetail/lockSet/addFamily/addFamily_page.dart'; import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart'; import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart'; import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_page.dart'; import 'package:star_lock/main/lockDetail/lockSet/faceUnlock/faceUnlock_page.dart'; -import 'package:star_lock/main/lockDetail/lockSet/familyDetails/familyDetails_page.dart'; import 'package:star_lock/main/lockDetail/lockSet/liveVideo/liveVideo_page.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockUser/lockUser_page.dart'; import 'package:star_lock/main/lockDetail/lockSet/motorPower/motorPower_page.dart'; -import 'package:star_lock/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_page.dart'; -import 'package:star_lock/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart'; import 'package:star_lock/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_page.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_main_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/addFamily/addFamily_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/familyDetails/familyDetails_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/msgNotification/openDoorNotify/openDoorNotify_page.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/notificationMode/notificationMode_page.dart'; import 'package:star_lock/main/lockDetail/palm/addPalm/addPalm_page.dart'; import 'package:star_lock/main/lockDetail/palm/addPalmType/addPalmTypeManage/addPalmTypeManage_page.dart'; import 'package:star_lock/main/lockDetail/palm/palmList/palmList_page.dart'; @@ -99,12 +105,6 @@ import 'main/lockDetail/lockSet/lockSet/lockSet_page.dart'; import 'main/lockDetail/lockSet/lockSoundSet/lockSoundSet_page.dart'; import 'main/lockDetail/lockSet/lockTime/lockTime_page.dart'; import 'main/lockDetail/lockSet/markedHouseState/markedHouseState_page.dart'; -import 'main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart'; -import 'main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart'; -import 'main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart'; -import 'main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart'; -import 'main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_page.dart'; -import 'main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_page.dart'; import 'main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart'; import 'main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart'; import 'main/lockDetail/lockSet/resetButton/resetButton_page.dart'; @@ -327,7 +327,7 @@ abstract class Routers { '/ValueAddedServicesNoteAndEmailDetailPage'; // 增值服务-短信邮件详情 static const valueAddedServicesRealNamePage = '/ValueAddedServicesRealNamePage'; // 增值服务-实名认证详情 - static const valueAddedServicesRecordPage = + static const valueAddedServicesRecordPage = '/valueAddedServicesRecordPage'; // 增值服务-记录 static const valueAddedServicesHighFunctionPage = '/ValueAddedServicesHighFunctionPage'; // 增值服务-高级功能 @@ -816,7 +816,7 @@ abstract class AppRouters { ), GetPage( name: Routers.valueAddedServicesRecordPage, - page: () => ValueAddedServicesRecordPage(), + page: () => ValueAddedServicesRecordPage(), ), GetPage( name: Routers.valueAddedServicesBuyPage, diff --git a/star_lock/lib/main/accessoriesList/accessoriesList_logic.dart b/star_lock/lib/main/lockDetail/accessoriesList/accessoriesList_logic.dart similarity index 82% rename from star_lock/lib/main/accessoriesList/accessoriesList_logic.dart rename to star_lock/lib/main/lockDetail/accessoriesList/accessoriesList_logic.dart index bd305363..f9956641 100644 --- a/star_lock/lib/main/accessoriesList/accessoriesList_logic.dart +++ b/star_lock/lib/main/lockDetail/accessoriesList/accessoriesList_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/accessoriesList/accessoriesList_state.dart'; +import 'package:star_lock/main/lockDetail/accessoriesList/accessoriesList_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class AccessoriesListLogic extends BaseGetXController { diff --git a/star_lock/lib/main/accessoriesList/accessoriesList_page.dart b/star_lock/lib/main/lockDetail/accessoriesList/accessoriesList_page.dart similarity index 96% rename from star_lock/lib/main/accessoriesList/accessoriesList_page.dart rename to star_lock/lib/main/lockDetail/accessoriesList/accessoriesList_page.dart index bd0f3b3b..bfde46dd 100644 --- a/star_lock/lib/main/accessoriesList/accessoriesList_page.dart +++ b/star_lock/lib/main/lockDetail/accessoriesList/accessoriesList_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:star_lock/main/accessoriesList/accessoriesList_logic.dart'; +import 'package:star_lock/main/lockDetail/accessoriesList/accessoriesList_logic.dart'; import '../../../app_settings/app_colors.dart'; import '../../../baseWidget.dart'; diff --git a/star_lock/lib/main/accessoriesList/accessoriesList_state.dart b/star_lock/lib/main/lockDetail/accessoriesList/accessoriesList_state.dart similarity index 100% rename from star_lock/lib/main/accessoriesList/accessoriesList_state.dart rename to star_lock/lib/main/lockDetail/accessoriesList/accessoriesList_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_logic.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_page.dart b/star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_page.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_state.dart b/star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/addFamily/addFamily_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/familyDetails/familyDetails_logic.dart similarity index 64% rename from star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/familyDetails/familyDetails_logic.dart index 023b3119..3bf4eb49 100644 --- a/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_logic.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/familyDetails/familyDetails_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lockSet/familyDetails/familyDetails_state.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/familyDetails/familyDetails_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class FamilyDetailsLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_page.dart b/star_lock/lib/main/lockDetail/messageWarn/familyDetails/familyDetails_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/familyDetails/familyDetails_page.dart index 520261a0..4f5801b3 100644 --- a/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_page.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/familyDetails/familyDetails_page.dart @@ -3,7 +3,7 @@ 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/main/lockDetail/lockSet/familyDetails/familyDetails_logic.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/familyDetails/familyDetails_logic.dart'; import 'package:star_lock/tools/commonItem.dart'; import 'package:star_lock/tools/showTFView.dart'; import 'package:star_lock/tools/submitBtn.dart'; diff --git a/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_state.dart b/star_lock/lib/main/lockDetail/messageWarn/familyDetails/familyDetails_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/familyDetails/familyDetails_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_logic.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_state.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_logic.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_state.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_logic.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_state.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/lowBatteryReminder/lowBatteryReminder_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/lowBatteryReminder/lowBatteryReminder_logic.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_state.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/lowBatteryReminder/lowBatteryReminder_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/lowBatteryReminder/lowBatteryReminder_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_logic.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_page.dart index d0ef33b4..36ef5a65 100644 --- a/star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_page.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_page.dart @@ -3,7 +3,7 @@ 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/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_logic.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_logic.dart'; import '../../../../../app_settings/app_colors.dart'; import '../../../../../tools/commonItem.dart'; diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_state.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/msgNotification/msgNotification_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_logic.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_page.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_state.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/nDaysUnopened/nDaysUnopened_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/openDoorNotify/openDoorNotify_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/openDoorNotify/openDoorNotify_logic.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_page.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/openDoorNotify/openDoorNotify_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/openDoorNotify/openDoorNotify_page.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_state.dart b/star_lock/lib/main/lockDetail/messageWarn/msgNotification/openDoorNotify/openDoorNotify_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/msgNotification/openDoorNotify/openDoorNotify_state.dart diff --git a/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_logic.dart b/star_lock/lib/main/lockDetail/messageWarn/notificationMode/notificationMode_logic.dart similarity index 63% rename from star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_logic.dart rename to star_lock/lib/main/lockDetail/messageWarn/notificationMode/notificationMode_logic.dart index 9f218ab5..c1d38967 100644 --- a/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_logic.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/notificationMode/notificationMode_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lockSet/notificationMode/notificationMode_state.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/notificationMode/notificationMode_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class NotificationModeLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart b/star_lock/lib/main/lockDetail/messageWarn/notificationMode/notificationMode_page.dart similarity index 99% rename from star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart rename to star_lock/lib/main/lockDetail/messageWarn/notificationMode/notificationMode_page.dart index 4275c33c..6b38c758 100644 --- a/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart +++ b/star_lock/lib/main/lockDetail/messageWarn/notificationMode/notificationMode_page.dart @@ -2,7 +2,7 @@ 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/main/lockDetail/lockSet/notificationMode/notificationMode_logic.dart'; +import 'package:star_lock/main/lockDetail/messageWarn/notificationMode/notificationMode_logic.dart'; import 'package:star_lock/tools/commonItem.dart'; import 'package:star_lock/tools/submitBtn.dart'; import 'package:star_lock/translations/trans_lib.dart'; diff --git a/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_state.dart b/star_lock/lib/main/lockDetail/messageWarn/notificationMode/notificationMode_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_state.dart rename to star_lock/lib/main/lockDetail/messageWarn/notificationMode/notificationMode_state.dart