diff --git a/star_lock/images/icon_round_selet.png b/star_lock/images/icon_round_select.png similarity index 100% rename from star_lock/images/icon_round_selet.png rename to star_lock/images/icon_round_select.png diff --git a/star_lock/images/icon_round_unSelet.png b/star_lock/images/icon_round_unSelect.png similarity index 100% rename from star_lock/images/icon_round_unSelet.png rename to star_lock/images/icon_round_unSelect.png diff --git a/star_lock/images/icon_round_white_unSelet.png b/star_lock/images/icon_round_white_unSelect.png similarity index 100% rename from star_lock/images/icon_round_white_unSelet.png rename to star_lock/images/icon_round_white_unSelect.png diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index cda22c7e..87ae5eca 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -50,7 +50,7 @@ "sendGroupKey":"Send Group Key", "lock":"Lock", "pleaseAdd":"Please Add", - "pleaseSelet":"Please Selet", + "pleaseSelect":"Please Select", "remoteUnlockingAllowed":"Remote Unlocking Allowed", "pleaseEnter":"Please Enter", "getPassword":"Get Password", @@ -170,7 +170,7 @@ "allDay":"All Day", "save":"Save", "normallyOpenModeTip":"During the set normal opening time, the lock will remain open after opening until it is manually closed During the set normal opening time, the lock will remain open after opening until it is manually closed", - "pleaseSeletLockVolume":"Please Selet Lock Volume", + "pleaseSelectLockVolume":"Please Select Lock Volume", "lockSoundTip":"When the function is enabled, you can hear the prompt tone of the smart lock. Including low battery, incorrect password and so on.", "low":"Low", "lower":"Lower", @@ -282,7 +282,7 @@ "addGateway": "Add Gateway", "turnThePowerBackOn": "Turn The Power Back On", "indicatorLight": "Indicator Light", - "seletGatewayTypeNextTip": "Repower the gateway and click Next when the indicator light flashes alternately", + "selectGatewayTypeNextTip": "Repower the gateway and click Next when the indicator light flashes alternately", "selectGateway": "Select Gateway", "gatewayConfigurationWifiTip": "5G WiFi network is not supported, please choose 2.4G WiFi network for configuration", "wifiPassward": "WiFi Passward", @@ -325,7 +325,7 @@ "email":"Email", "mobileNumber":"Mobile phone number", "countryAndRegion":"Country And Region", - "selet":"Selet", + "select":"Select", "getVerificationCode":"Get Verification Code", "businessCooperation":"Business Cooperation", @@ -349,7 +349,7 @@ "customMailTemplate":"Custom Mail Template", "record":"Record", "buyRealNameTip":"When an electronic key is sent to the user, the user can be required to authenticate with his real name before unlocking to ensure that he is operating. The real-name authentication calls the interface of the national Public security system. For the payment function, please purchase the number of times before using it.", - "buyRealNameSeletYouWantBuyTip":"Please select the frequency of real name authentication you want", + "buyRealNameSelectYouWantBuyTip":"Please select the frequency of real name authentication you want", "forTheFirstTime":"For the first time", "onceDay":"once a day", "weekOnce":"once a week", @@ -417,9 +417,9 @@ "whetherTheEmployeeHasPassword":"If The Employee Has A Password", "whetherTheEmployeeHasCard":"If The Employee Has A Card", "whetherTheEmployeeHasFingerprint":"If The Employee Has A Fingerprint", - "seletPassword":"Selet Password", - "seletCard":"Selet Card", - "seletFingerprint":"Selet Fingerprint", + "selectPassword":"Select Password", + "selectCard":"Select Card", + "selectFingerprint":"Select Fingerprint", "getKey":"Get Key", "getCard":"Get Card", "getFingerprint":"Get Fingerprint", diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index da91ebd3..0201e002 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -50,7 +50,7 @@ "sendGroupKey":"sendGroupKey", "lock":"lock", "pleaseAdd":"pleaseAdd", - "pleaseSelet":"pleaseSelet", + "pleaseSelect":"pleaseSelect", "remoteUnlockingAllowed":"remoteUnlockingAllowed", "pleaseEnter":"pleaseEnter", "getPassword":"getPassword", @@ -170,7 +170,7 @@ "allDay":"allDay", "save":"save", "normallyOpenModeTip":"normallyOpenModeTip", - "pleaseSeletLockVolume":"pleaseSeletLockVolume", + "pleaseSelectLockVolume":"pleaseSelectLockVolume", "lockSoundTip":"lockSoundTip", "low":"low", "lower":"lower", @@ -282,7 +282,7 @@ "addGateway": "addGateway", "turnThePowerBackOn": "turnThePowerBackOn", "indicatorLight": "indicatorLight", - "seletGatewayTypeNextTip": "seletGatewayTypeNextTip", + "selectGatewayTypeNextTip": "selectGatewayTypeNextTip", "selectGateway": "selectGateway", "gatewayConfigurationWifiTip": "gatewayConfigurationWifiTip", "wifiPassward": "wifiPassward", @@ -325,7 +325,7 @@ "email":"email", "mobileNumber":"mobileNumber", "countryAndRegion":"countryAndRegion", - "selet":"selet", + "select":"select", "getVerificationCode":"getVerificationCode", "businessCooperation":"businessCooperation", @@ -349,7 +349,7 @@ "customMailTemplate":"customMailTemplate", "record":"record", "buyRealNameTip":"buyRealNameTip", - "buyRealNameSeletYouWantBuyTip":"buyRealNameSeletYouWantBuyTip", + "buyRealNameSelectYouWantBuyTip":"buyRealNameSelectYouWantBuyTip", "forTheFirstTime":"forTheFirstTime", "onceDay":"onceDay", "weekOnce":"weekOnce", @@ -417,9 +417,9 @@ "whetherTheEmployeeHasPassword":"whetherTheEmployeeHasPassword", "whetherTheEmployeeHasCard":"whetherTheEmployeeHasCard", "whetherTheEmployeeHasFingerprint":"whetherTheEmployeeHasFingerprint", - "seletPassword":"seletPassword", - "seletCard":"seletCard", - "seletFingerprint":"seletFingerprint", + "selectPassword":"selectPassword", + "selectCard":"selectCard", + "selectFingerprint":"selectFingerprint", "getKey":"getKey", "getCard":"getCard", "getFingerprint":"getFingerprint", diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index 2f4064c2..323b6496 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -50,7 +50,7 @@ "sendGroupKey":"群发钥匙", "lock":"锁", "pleaseAdd":"请添加", - "pleaseSelet":"请选择", + "pleaseSelect":"请选择", "remoteUnlockingAllowed":"允许远程开锁", "pleaseEnter":"请输入", "getPassword":"获取密码", @@ -170,7 +170,7 @@ "allDay":"全天", "save":"保存", "normallyOpenModeTip":"在设置的常开时间内，锁被打开后将一直处于打开的状态，直到被手动关闭", - "pleaseSeletLockVolume":"请选择锁音量", + "pleaseSelectLockVolume":"请选择锁音量", "lockSoundTip":"功能开启后，你将可以听到智能锁的提示音。包括电量过低，密码错误等提示。", "low":"低", "lower":"较低", @@ -282,7 +282,7 @@ "addGateway": "添加网关", "turnThePowerBackOn": "重新通电", "indicatorLight": "指示灯", - "seletGatewayTypeNextTip": "将网关重新通电，指示灯交替闪烁时点击下一步", + "selectGatewayTypeNextTip": "将网关重新通电，指示灯交替闪烁时点击下一步", "selectGateway": "选择网关", "gatewayConfigurationWifiTip": "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置", "wifiPassward": "WiFi密码", @@ -325,7 +325,7 @@ "email":"邮箱", "mobileNumber":"手机号", "countryAndRegion":"国家/地区", - "selet":"选择", + "select":"选择", "getVerificationCode":"获取验证码", "businessCooperation":"商务合作", @@ -350,7 +350,7 @@ "record":"记录", "buyRealNameTip":"给用户发送电子钥匙时，可以要求其开锁前先进行实名认证，以保证是他本人在操作。实名认证调用国家公安系统接口，为付费功能，请购买次数后再使用。", - "buyRealNameSeletYouWantBuyTip":"请选择你希望的实名认证频数", + "buyRealNameSelectYouWantBuyTip":"请选择你希望的实名认证频数", "forTheFirstTime":"仅首次", "onceDay":"每日一次", "weekOnce":"每周一次", @@ -420,9 +420,9 @@ "whetherTheEmployeeHasPassword":"员工是否有密码", "whetherTheEmployeeHasCard":"员工是否有卡", "whetherTheEmployeeHasFingerprint":"员工是否有指纹", - "seletPassword":"选择密码", - "seletCard":"选择卡", - "seletFingerprint":"选择指纹", + "selectPassword":"选择密码", + "selectCard":"选择卡", + "selectFingerprint":"选择指纹", "getKey":"获取钥匙", "getCard":"获取卡", "getFingerprint":"获取指纹", diff --git a/star_lock/images/main/icon_checkInRankingListTop.png b/star_lock/images/main/icon_checkInRankingListTop.png deleted file mode 100644 index 0a6070e0..00000000 Binary files a/star_lock/images/main/icon_checkInRankingListTop.png and /dev/null differ diff --git a/star_lock/images/main/icon_lockDetail_checkInRanking_cd.png b/star_lock/images/main/icon_lockDetail_checkInRanking_cd.png new file mode 100644 index 00000000..f70a3ddd Binary files /dev/null and b/star_lock/images/main/icon_lockDetail_checkInRanking_cd.png differ diff --git a/star_lock/images/main/icon_lockDetail_checkInRanking_qf.png b/star_lock/images/main/icon_lockDetail_checkInRanking_qf.png new file mode 100644 index 00000000..58825d9f Binary files /dev/null and b/star_lock/images/main/icon_lockDetail_checkInRanking_qf.png differ diff --git a/star_lock/images/main/icon_lockDetail_checkInRanking_zd.png b/star_lock/images/main/icon_lockDetail_checkInRanking_zd.png new file mode 100644 index 00000000..0b23413d Binary files /dev/null and b/star_lock/images/main/icon_lockDetail_checkInRanking_zd.png differ diff --git a/star_lock/images/mine/icon_mine_seletGatewayType_G2.png b/star_lock/images/mine/icon_mine_selectGatewayType_G2.png similarity index 100% rename from star_lock/images/mine/icon_mine_seletGatewayType_G2.png rename to star_lock/images/mine/icon_mine_selectGatewayType_G2.png diff --git a/star_lock/images/mine/icon_mine_seletGatewayType_G4.png b/star_lock/images/mine/icon_mine_selectGatewayType_G4.png similarity index 100% rename from star_lock/images/mine/icon_mine_seletGatewayType_G4.png rename to star_lock/images/mine/icon_mine_selectGatewayType_G4.png diff --git a/star_lock/images/mine/icon_mine_seletGatewayType_next.png b/star_lock/images/mine/icon_mine_selectGatewayType_next.png similarity index 100% rename from star_lock/images/mine/icon_mine_seletGatewayType_next.png rename to star_lock/images/mine/icon_mine_selectGatewayType_next.png diff --git a/star_lock/images/tabbar/icon_tab_main_selet.png b/star_lock/images/tabbar/icon_tab_main_select.png similarity index 100% rename from star_lock/images/tabbar/icon_tab_main_selet.png rename to star_lock/images/tabbar/icon_tab_main_select.png diff --git a/star_lock/images/tabbar/icon_tab_main_unselet.png b/star_lock/images/tabbar/icon_tab_main_unselect.png similarity index 100% rename from star_lock/images/tabbar/icon_tab_main_unselet.png rename to star_lock/images/tabbar/icon_tab_main_unselect.png diff --git a/star_lock/images/tabbar/icon_tab_my_selet.png b/star_lock/images/tabbar/icon_tab_my_select.png similarity index 100% rename from star_lock/images/tabbar/icon_tab_my_selet.png rename to star_lock/images/tabbar/icon_tab_my_select.png diff --git a/star_lock/images/tabbar/icon_tab_my_unselet.png b/star_lock/images/tabbar/icon_tab_my_unselect.png similarity index 100% rename from star_lock/images/tabbar/icon_tab_my_unselet.png rename to star_lock/images/tabbar/icon_tab_my_unselect.png diff --git a/star_lock/ios/Podfile.lock b/star_lock/ios/Podfile.lock index 2d0a0ce7..a86bb578 100644 --- a/star_lock/ios/Podfile.lock +++ b/star_lock/ios/Podfile.lock @@ -63,7 +63,7 @@ PODS: - Flutter - google_maps_flutter_ios (0.0.1): - Flutter - - GoogleMaps (< 9.0) + - GoogleMaps (< 8.0) - GoogleMaps (6.2.1): - GoogleMaps/Maps (= 6.2.1) - GoogleMaps/Base (6.2.1) @@ -85,7 +85,7 @@ PODS: - FlutterMacOS - permission_handler_apple (9.1.1): - Flutter - - Protobuf (3.25.1) + - Protobuf (3.25.0) - ReachabilitySwift (5.0.0) - reactive_ble_mobile (0.0.1): - Flutter @@ -97,7 +97,7 @@ PODS: - sqflite (0.0.3): - Flutter - FMDB (>= 2.7.5) - - SwiftProtobuf (1.25.2) + - SwiftProtobuf (1.25.1) - Toast (4.0.0) - url_launcher_ios (0.0.1): - Flutter @@ -241,7 +241,7 @@ SPEC CHECKSUMS: audio_session: 4f3e461722055d21515cf3261b64c973c062f345 audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40 auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d - camera_avfoundation: 8b8d780bcfb6a4a02b0fbe2b4bd17b5b71946e68 + camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed EMASRest: 8df6f87836767a9415ad5cc4af739bc9d215b475 @@ -251,30 +251,30 @@ SPEC CHECKSUMS: flutter_sound: c60effa2a350fb977885f0db2fbc4c1ad5160900 flutter_sound_core: 26c10e5832e76aaacfae252d8925232281c486ae flutter_voice_processor: 53afbf59ad3feb82f4a379fea9ed8dc98495210f - fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265 + fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a g711_flutter: 8f2769052d2cf3549f83d11e1c42d81d94441123 - google_maps_flutter_ios: d1318b4ff711612cab16862d7a87e31a7403d458 + google_maps_flutter_ios: abdac20d6ce8931f6ebc5f46616df241bfaa2cfd GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4 image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb - image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425 + image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1 just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 - Protobuf: d94761c33f1239c0a43a0817ca1a5f7f7c900241 + Protobuf: 6a4183ec1d51649eb2be7b86ccc286e5c539219c ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c - shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a - SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1 + SwiftProtobuf: 69f02cd54fb03201c5e6bf8b76f687c5ef7541a3 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 + url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126 - webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4 + webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a PODFILE CHECKSUM: 42aa7ffc6134b996f93caa6a9b6a2b5b580ff28a -COCOAPODS: 1.14.3 +COCOAPODS: 1.12.1 diff --git a/star_lock/lib/appRouters.dart b/star_lock/lib/appRouters.dart index 7339874a..711556e1 100644 --- a/star_lock/lib/appRouters.dart +++ b/star_lock/lib/appRouters.dart @@ -7,18 +7,18 @@ import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/ma import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart'; import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart'; import 'package:star_lock/main/lockDetail/face/faceDetail/faceDetail_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/addFamily/addFamily_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/catEyeSet/catEyeSet/catEyeSet_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/faceUnlock/faceUnlock_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/familyDetails/familyDetails_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/liveVideo/liveVideo_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/lockUser/lockUser_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/motorPower/motorPower_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/msgNotification/msgNotification/msgNotification_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/notificationMode/notificationMode_page.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/openDoorDirection/openDoorDirection_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/passwordKey/passwordKeyDetailChangeDate/passwordKeyDetailChangeDate_page.dart'; import 'package:star_lock/mine/about/webviewShow_page.dart'; @@ -41,7 +41,7 @@ import 'common/safetyVerification/safetyVerification_page.dart'; import 'login/forgetPassword/starLock_forgetPassword_page.dart'; import 'login/login/starLock_login_page.dart'; import 'login/register/starLock_register_page.dart'; -import 'login/seletCountryRegion/seletCountryRegion_page.dart'; +import 'login/selectCountryRegion/selectCountryRegion_page.dart'; import 'main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_page.dart'; import 'main/lockDetail/card/addICCard/addICCard_page.dart'; import 'main/lockDetail/card/cardDetail/cardDetail_page.dart'; @@ -64,45 +64,45 @@ import 'main/lockDetail/face/addFace/addFace_page.dart'; import 'main/lockDetail/face/addFaceType/addFaceTypeManage/addFaceTypeManage_page.dart'; import 'main/lockDetail/face/faceList/faceList_page.dart'; import 'main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart'; -import 'main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_page.dart'; +import 'main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_page.dart'; import 'main/lockDetail/fingerprint/addFingerprintTip/addFingerprintTip_page.dart'; import 'main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart'; import 'main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart'; -import 'main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart'; -import 'main/lockDetail/lcokSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart'; -import 'main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart'; -import 'main/lockDetail/lcokSet/basicInformation/editLockName/editLockName_page.dart'; -import 'main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart'; -import 'main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart'; -import 'main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_page.dart'; -import 'main/lockDetail/lcokSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart'; -import 'main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_page.dart'; -import 'main/lockDetail/lcokSet/configuringWifi/configuringWifi_page.dart'; -import 'main/lockDetail/lcokSet/diagnose/diagnose_page.dart'; -import 'main/lockDetail/lcokSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart'; -import 'main/lockDetail/lcokSet/doorMagnetic/doorMagneticList/doorMagnetic_page.dart'; -import 'main/lockDetail/lcokSet/doorMagnetic/nearbyDoorMagnetic/nearbyDoorMagnetic_page.dart'; -import 'main/lockDetail/lcokSet/importOtherLockData/ImportOtherLockData_page.dart'; -import 'main/lockDetail/lcokSet/lockEscalation/lockEscalation_page.dart'; -import 'main/lockDetail/lcokSet/lockSet/lockSet_page.dart'; -import 'main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_page.dart'; -import 'main/lockDetail/lcokSet/lockTime/lockTime_page.dart'; -import 'main/lockDetail/lcokSet/markedHouseState/markedHouseState_page.dart'; -import 'main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart'; -import 'main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart'; -import 'main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart'; -import 'main/lockDetail/lcokSet/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart'; -import 'main/lockDetail/lcokSet/msgNotification/nDaysUnopened/nDaysUnopened_page.dart'; -import 'main/lockDetail/lcokSet/msgNotification/openDoorNotify/openDoorNotify_page.dart'; -import 'main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_page.dart'; -import 'main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_page.dart'; -import 'main/lockDetail/lcokSet/resetButton/resetButton_page.dart'; -import 'main/lockDetail/lcokSet/unlockQRCode/unlockQRCode_page.dart'; -import 'main/lockDetail/lcokSet/uploadData/uploadData_page.dart'; -import 'main/lockDetail/lcokSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart'; -import 'main/lockDetail/lcokSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart'; -import 'main/lockDetail/lcokSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart'; -import 'main/lockDetail/lcokSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart'; +import 'main/lockDetail/lockSet/automaticBlocking/automaticBlocking_page.dart'; +import 'main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart'; +import 'main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart'; +import 'main/lockDetail/lockSet/basicInformation/editLockName/editLockName_page.dart'; +import 'main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart'; +import 'main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart'; +import 'main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart'; +import 'main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart'; +import 'main/lockDetail/lockSet/checkInCreatCompany/checkInCreatCompany_page.dart'; +import 'main/lockDetail/lockSet/configuringWifi/configuringWifi_page.dart'; +import 'main/lockDetail/lockSet/diagnose/diagnose_page.dart'; +import 'main/lockDetail/lockSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart'; +import 'main/lockDetail/lockSet/doorMagnetic/doorMagneticList/doorMagnetic_page.dart'; +import 'main/lockDetail/lockSet/doorMagnetic/nearbyDoorMagnetic/nearbyDoorMagnetic_page.dart'; +import 'main/lockDetail/lockSet/importOtherLockData/ImportOtherLockData_page.dart'; +import 'main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart'; +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'; +import 'main/lockDetail/lockSet/unlockQRCode/unlockQRCode_page.dart'; +import 'main/lockDetail/lockSet/uploadData/uploadData_page.dart'; +import 'main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart'; +import 'main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart'; +import 'main/lockDetail/lockSet/wirelessKeyboard/selectWirelessKeyboard/selectWirelessKeyboard_page.dart'; +import 'main/lockDetail/lockSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart'; import 'main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart'; import 'main/lockDetail/monitoring/monitoringRealTimeScreen/monitoringRealTimeScreen_page.dart'; import 'main/lockDetail/realTimePicture/realTimePicture_page.dart'; @@ -132,16 +132,16 @@ import 'main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dar import 'main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart'; import 'main/lockDetail/passwordKey/passwordKeyManage/passwordKeyManage_page.dart'; import 'main/lockMian/lockMain/lockMain_page.dart'; -import 'mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart'; +import 'mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart'; import 'mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart'; import 'mine/addLock/lockAddress/lockAddress/lockAddress_page.dart'; import 'mine/addLock/nearbyLock/nearbyLock_page.dart'; import 'mine/addLock/saveLock/saveLock_page.dart'; -import 'mine/addLock/seletLockType/seletLockType_page.dart'; +import 'mine/addLock/selectLockType/selectLockType_page.dart'; import 'mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart'; -import 'mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart'; -import 'mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart'; -import 'mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart'; +import 'mine/gateway/addGateway/selectGateway/selectGatewayList_page.dart'; +import 'mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart'; +import 'mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart'; import 'mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_page.dart'; import 'mine/gateway/gatewayDetail/gatewayDetail_page.dart'; import 'mine/gateway/gatewayList/gatewayList_page.dart'; @@ -184,7 +184,7 @@ abstract class Routers { static const initial = '/'; // 加载页 static const starLockMain = '/StarLockMain'; // 首页 static const starLockMinePage = '/StarLockMinePage'; // 我的 - static const seletLockTypePage = '/SeletLockTypePage'; // 选择锁类型 + static const selectLockTypePage = '/SelectLockTypePage'; // 选择锁类型 static const LockMallPage = '/LockMallPage'; // 商城页面 static const addLockPage = '/AddLockPage'; // 选择锁类型 static const nearbyLockPage = '/NearbyLockPage'; // 附近的锁 @@ -231,7 +231,7 @@ abstract class Routers { static const uploadElectricQuantityPage = '/UploadElectricQuantityPage'; // 更新锁电量 static const editLockNamePage = '/EditLockNamePage'; // 修改锁名字 - static const lockSeletGroupingPage = '/LockSeletGroupingPage'; // 锁选择分组 + static const lockSelectGroupingPage = '/LockSelectGroupingPage'; // 锁选择分组 static const groupEditLockPage = '/GroupEditLockPage'; // 编辑锁分组里面的锁 static const adminOpenLockPasswordPage = '/AdminOpenLockPasswordPage'; // 管理员开锁密码 @@ -239,8 +239,8 @@ abstract class Routers { static const addWirelessKeyboardPage = '/AddWirelessKeyboardPage'; // 添加蓝牙键盘 static const addWirelessKeyboardScreenNotLightOnPage = '/AddWirelessKeyboardScreenNotLightOnPage'; // 添加蓝牙键盘屏幕不亮时提示 - static const seletWirelessKeyboardPage = - '/SeletWirelessKeyboardPage'; // 选择蓝牙键盘 + static const selectWirelessKeyboardPage = + '/SelectWirelessKeyboardPage'; // 选择蓝牙键盘 static const doorMagneticPage = '/DoorMagneticPage'; // 门磁列表 static const addDoorMagneticPage = '/AddDoorMagneticPage'; // 添加门磁 static const nearbyDoorMagneticPage = '/NearbyDoorMagneticPage'; // 附近的门磁 @@ -297,17 +297,17 @@ abstract class Routers { static const gatewayDetailPage = '/GatewayDetailPage'; // 我的-网关详情 static const gatewayConnectionLockPage = '/GatewayConnectionLockPage'; // 我的-网关网关链接的锁 - static const seletGatewayTypePage = '/SeletGatewayTypePage'; // 我的-选择网关类型 - static const seletGatewayTypeNextTipPage = - '/SeletGatewayTypeNextTipPage'; // 我的-选择网关类型下一步 - static const seletGatewayPage = '/SeletGatewayPage'; // 我的-选择网关 + static const selectGatewayTypePage = '/SelectGatewayTypePage'; // 我的-选择网关类型 + static const selectGatewayTypeNextTipPage = + '/SelectGatewayTypeNextTipPage'; // 我的-选择网关类型下一步 + static const selectGatewayPage = '/SelectGatewayPage'; // 我的-选择网关 static const gatewayConfigurationWifiPage = '/GatewayConfigurationWifiPage'; // 我的-网关配置wifi static const messageListPage = '/MessageListPage'; // 我的-消息 static const supportStaffPage = '/SupportStaffPage'; // 我的-客服 static const valueAddedServicesPage = '/ValueAddedServicesPage'; // 我的-增值服务 - static const abountPage = '/AbountPage'; // 我的-关于 + static const aboutPage = '/AboutPage'; // 我的-关于 static const valueAddedServicesNoteAndEmailDetailPage = '/ValueAddedServicesNoteAndEmailDetailPage'; // 增值服务-短信邮件详情 @@ -351,7 +351,7 @@ abstract class Routers { static const starLockRegisterPage = '/StarLockRegisterPage'; // 注册 static const starLockForgetPasswordPage = '/StarLockForgetPasswordPage'; // 忘记密码 - static const seletCountryRegionPage = '/SeletCountryRegionPage'; // 选择国家和地区 + static const selectCountryRegionPage = '/SelectCountryRegionPage'; // 选择国家和地区 static const safetyVerificationPage = '/SafetyVerificationPage'; // 安全验证 static const keyOperationRecordPage = '/keyOperationRecordPage'; //钥匙详情-操作记录 @@ -373,7 +373,8 @@ abstract class Routers { static const webviewShowPage = '/webviewShowPage'; //网页 static const demoModeLockDetailPage = '/DemoModeLockDetailPage'; // 演示模式锁详情页 static const demoModeLockSetPage = '/DemoModeLockSetPage'; // 演示模式锁设置页 - static const addLockSeletCountryPage = '/AddLockSeletCountryPage'; // 演示模式锁设置页 + static const addLockSelectCountryPage = + '/AddLockSelectCountryPage'; // 演示模式锁设置页 static const faceUnlockPage = '/faceUnlockPage'; //面容开锁设置 static const motorPowerPage = '/motorPowerPage'; //电机功率设置 static const openDoorDirectionPage = '/openDoorDirectionPage'; //开门方向设置 @@ -438,8 +439,8 @@ abstract class AppRouters { page: () => const StarLockMinePage(), ), GetPage( - name: Routers.seletLockTypePage, - page: () => const SeletLockTypePage(), + name: Routers.selectLockTypePage, + page: () => const SelectLockTypePage(), ), GetPage( name: Routers.LockMallPage, @@ -554,8 +555,8 @@ abstract class AppRouters { page: () => const StarLockForgetPasswordPage(), ), GetPage( - name: Routers.seletCountryRegionPage, - page: () => const SeletCountryRegionPage(), + name: Routers.selectCountryRegionPage, + page: () => const SelectCountryRegionPage(), ), GetPage( name: Routers.lockSetPage, @@ -574,8 +575,8 @@ abstract class AppRouters { page: () => const EditLockNamePage(), ), GetPage( - name: Routers.lockSeletGroupingPage, - page: () => const LockSeletGroupingPage(), + name: Routers.lockSelectGroupingPage, + page: () => const LockSelectGroupingPage(), ), GetPage( name: Routers.adminOpenLockPasswordPage, @@ -594,8 +595,8 @@ abstract class AppRouters { page: () => const AddWirelessKeyboardScreenNotLightOnPage(), ), GetPage( - name: Routers.seletWirelessKeyboardPage, - page: () => const SeletWirelessKeyboardPage(), + name: Routers.selectWirelessKeyboardPage, + page: () => const SelectWirelessKeyboardPage(), ), GetPage( name: Routers.doorMagneticPage, @@ -750,8 +751,8 @@ abstract class AppRouters { page: () => const ValueAddedServicesListPage(), ), GetPage( - name: Routers.abountPage, - page: () => const AbountPage(), + name: Routers.aboutPage, + page: () => const AboutPage(), ), GetPage( name: Routers.gatewayDetailPage, @@ -762,16 +763,16 @@ abstract class AppRouters { page: () => const GatewayConnectionLockListPage(), ), GetPage( - name: Routers.seletGatewayTypePage, - page: () => const SeletGatewayTypePage(), + name: Routers.selectGatewayTypePage, + page: () => const SelectGatewayTypePage(), ), GetPage( - name: Routers.seletGatewayTypeNextTipPage, - page: () => const SeletGatewayTypeNextTipPage(), + name: Routers.selectGatewayTypeNextTipPage, + page: () => const SelectGatewayTypeNextTipPage(), ), GetPage( - name: Routers.seletGatewayPage, - page: () => const SeletGatewayListPage(), + name: Routers.selectGatewayPage, + page: () => const SelectGatewayListPage(), ), GetPage( name: Routers.gatewayConfigurationWifiPage, @@ -927,8 +928,8 @@ abstract class AppRouters { name: Routers.demoModeLockDetailPage, page: () => const DemoModeLockDetailPage()), GetPage( - name: Routers.addLockSeletCountryPage, - page: () => const AddLockSeletCountryPage()), + name: Routers.addLockSelectCountryPage, + page: () => const AddLockSelectCountryPage()), GetPage(name: Routers.faceUnlockPage, page: () => const FaceUnlockPage()), GetPage(name: Routers.motorPowerPage, page: () => const MotorPowerPage()), GetPage( diff --git a/star_lock/lib/login/login/starLock_login_page.dart b/star_lock/lib/login/login/starLock_login_page.dart index 0d222bde..bca2f41b 100644 --- a/star_lock/lib/login/login/starLock_login_page.dart +++ b/star_lock/lib/login/login/starLock_login_page.dart @@ -90,7 +90,7 @@ class _StarLockLoginPageState extends State { state.agree.value = !state.agree.value; logic.changeAgreeState(); }, - child: Image.asset(state.agree.value ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,) + child: Image.asset(state.agree.value ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,) )), SizedBox(width: 15.w,), Flexible( diff --git a/star_lock/lib/login/register/starLock_register_page.dart b/star_lock/lib/login/register/starLock_register_page.dart index f0a87275..f0026f1b 100644 --- a/star_lock/lib/login/register/starLock_register_page.dart +++ b/star_lock/lib/login/register/starLock_register_page.dart @@ -41,7 +41,7 @@ class _StarLockRegisterPageState extends State { body: ListView( padding: EdgeInsets.only(top: 40.h, left: 40.w, right: 40.w), children: [ - topSeletCountryAndRegionWidget(), + topSelectCountryAndRegionWidget(), middleTFWidget(), Obx(() { return SubmitBtn( @@ -65,7 +65,7 @@ class _StarLockRegisterPageState extends State { )); } - Widget topSeletCountryAndRegionWidget() { + Widget topSelectCountryAndRegionWidget() { return Column( children: [ SizedBox(height: 50.h), @@ -142,7 +142,7 @@ class _StarLockRegisterPageState extends State { GestureDetector( onTap: () async { var result = await Navigator.pushNamed( - context, Routers.seletCountryRegionPage); + context, Routers.selectCountryRegionPage); if (result != null) { result as Map; logic.state.countryCode.value = result['code']; diff --git a/star_lock/lib/login/seletCountryRegion/common/countryRegionEntity.dart b/star_lock/lib/login/selectCountryRegion/common/countryRegionEntity.dart similarity index 100% rename from star_lock/lib/login/seletCountryRegion/common/countryRegionEntity.dart rename to star_lock/lib/login/selectCountryRegion/common/countryRegionEntity.dart diff --git a/star_lock/lib/login/seletCountryRegion/common/index.dart b/star_lock/lib/login/selectCountryRegion/common/index.dart similarity index 100% rename from star_lock/lib/login/seletCountryRegion/common/index.dart rename to star_lock/lib/login/selectCountryRegion/common/index.dart diff --git a/star_lock/lib/login/seletCountryRegion/common/utils.dart b/star_lock/lib/login/selectCountryRegion/common/utils.dart similarity index 96% rename from star_lock/lib/login/seletCountryRegion/common/utils.dart rename to star_lock/lib/login/selectCountryRegion/common/utils.dart index f3eea6f5..ec1dcf35 100644 --- a/star_lock/lib/login/seletCountryRegion/common/utils.dart +++ b/star_lock/lib/login/selectCountryRegion/common/utils.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:star_lock/app_settings/app_colors.dart'; -import 'package:star_lock/login/seletCountryRegion/common/countryRegionEntity.dart'; +import 'package:star_lock/login/selectCountryRegion/common/countryRegionEntity.dart'; class Utils { static String getImgPath(String name, {String format = 'png'}) { diff --git a/star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart b/star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart similarity index 86% rename from star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart rename to star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart index 23398d7c..a93058b3 100644 --- a/star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart +++ b/star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart @@ -2,7 +2,7 @@ import 'package:azlistview/azlistview.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:star_lock/login/seletCountryRegion/common/countryRegionEntity.dart'; +import 'package:star_lock/login/selectCountryRegion/common/countryRegionEntity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; @@ -11,14 +11,14 @@ import '../../tools/titleAppBar.dart'; import '../../translations/trans_lib.dart'; import 'common/index.dart'; -class SeletCountryRegionPage extends StatefulWidget { - const SeletCountryRegionPage({Key? key}) : super(key: key); +class SelectCountryRegionPage extends StatefulWidget { + const SelectCountryRegionPage({Key? key}) : super(key: key); @override - State createState() => _SeletCountryRegionPageState(); + State createState() => _SelectCountryRegionPageState(); } -class _SeletCountryRegionPageState extends State { +class _SelectCountryRegionPageState extends State { List countriesList = []; @override @@ -72,7 +72,7 @@ class _SeletCountryRegionPageState extends State { backgroundColor: const Color(0xFFFFFFFF), appBar: TitleAppBar( barTitle: - "${TranslationLoader.lanKeys!.selet!.tr} ${TranslationLoader.lanKeys!.countryAndRegion!.tr}", + "${TranslationLoader.lanKeys!.select!.tr} ${TranslationLoader.lanKeys!.countryAndRegion!.tr}", haveBack: true, backgroundColor: AppColors.mainColor, ), diff --git a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart index c72a560f..51934ce7 100644 --- a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart +++ b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart @@ -284,13 +284,13 @@ class AuthorizedAdminLogic extends BaseGetXController { }, ), CupertinoDialogAction( - child: Text(TranslationLoader.lanKeys!.selet!.tr), + child: Text(TranslationLoader.lanKeys!.select!.tr), onPressed: () async { //选择国家代码 state.isCreateUser.value = true; Navigator.of(context).pop(); - var result = await Get.toNamed(Routers.seletCountryRegionPage); + var result = await Get.toNamed(Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; diff --git a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart index f23db1a7..f64ad11f 100644 --- a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart +++ b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart @@ -101,7 +101,7 @@ class _AuthorizedAdminPageState extends State { ), action: () async { var result = await Navigator.pushNamed( - context, Routers.seletCountryRegionPage); + context, Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; diff --git a/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart b/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart index 6025bac1..b1e52e40 100644 --- a/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart +++ b/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart @@ -136,7 +136,7 @@ class _VolumeAuthorizationLockPageState ), action: () async { var result = await Navigator.pushNamed( - context, Routers.seletCountryRegionPage); + context, Routers.selectCountryRegionPage); if (result != null) { result as Map; countryCode = result['code']; @@ -203,7 +203,7 @@ class _VolumeAuthorizationLockPageState CommonItem( leftTitel: TranslationLoader.lanKeys!.lock!.tr, rightTitle: _lockIdList.isEmpty - ? TranslationLoader.lanKeys!.pleaseSelet!.tr + ? TranslationLoader.lanKeys!.pleaseSelect!.tr : _lockIdList.length.toString(), isHaveDirection: true, action: () { diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_tabbar.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_tabbar.dart index 6e42b12b..ed25cee6 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_tabbar.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_tabbar.dart @@ -26,9 +26,9 @@ class _AddCardManageTabbarState extends State with SingleTi late TabController _tabController; final List _itemTabs = [ - ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, seletType: "0"), - ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, seletType: "1"), - ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, seletType: "2"), + ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, selectType: "0"), + ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, selectType: "1"), + ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, selectType: "2"), ]; @override @@ -98,7 +98,7 @@ class _AddCardManageTabbarState extends State with SingleTi controller: _tabController, children: _itemTabs .map((ItemView item) => AddCardPage( - seletType: item.seletType, + selectType: item.selectType, lockId: widget.lockId, fromType: widget.fromType, fromTypeTwoStaffName:widget.fromTypeTwoStaffName @@ -109,8 +109,8 @@ class _AddCardManageTabbarState extends State with SingleTi } class ItemView { - const ItemView({required this.title, required this.seletType}); + const ItemView({required this.title, required this.selectType}); final String title; - final String seletType; + final String selectType; } diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart index 9a5024c7..88b5ed0f 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart @@ -14,11 +14,11 @@ class AddCardTypeLogic extends BaseGetXController{ var fingerprintType = 0; // 永久:1;限时2，单次3，循环:4 var startDate = ""; var endDate = ""; - if (state.seletType.value == "0") { + if (state.selectType.value == "0") { fingerprintType = 1; startDate = "0"; endDate = "0"; - } else if (state.seletType.value == "1") { + } else if (state.selectType.value == "1") { fingerprintType = 2; if (state.beginTimeTimestamp.value.isEmpty) { showToast("请选择开始时间"); @@ -42,7 +42,7 @@ class AddCardTypeLogic extends BaseGetXController{ startDate = state.beginTimeTimestamp.value; endDate = state.endTimeTimestamp.value; - } else if (state.seletType.value == "2") { + } else if (state.selectType.value == "2") { if (state.effectiveDateTime.value <= 0) { showToast("请选择生效时间"); return; @@ -104,4 +104,4 @@ class AddCardTypeLogic extends BaseGetXController{ } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart index b7d4a6f6..1d331952 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart @@ -15,14 +15,14 @@ import '../../../../translations/trans_lib.dart'; import 'addCardType_logic.dart'; class AddCardPage extends StatefulWidget { - final String seletType; // 永久限时循环下标 + final String selectType; // 永久限时循环下标 final int lockId; final int fromType; // // 1从添加钥匙列表进入 2从考勤添加员工入口进入 final String fromTypeTwoStaffName; // 从添加员工进入 传入员工名字 const AddCardPage( {Key? key, - required this.seletType, + required this.selectType, required this.lockId, required this.fromType, required this.fromTypeTwoStaffName}) @@ -38,7 +38,7 @@ class _AddCardPageState extends State { @override Widget build(BuildContext context) { - state.seletType.value = widget.seletType; + state.selectType.value = widget.selectType; state.lockId.value = widget.lockId; // state.nameController.text = widget.fromTypeTwoStaffName; @@ -49,7 +49,7 @@ class _AddCardPageState extends State { } Widget indexChangeWidget() { - switch (int.parse(widget.seletType)) { + switch (int.parse(widget.selectType)) { case 0: { // 永久 @@ -193,7 +193,7 @@ class _AddCardPageState extends State { onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.seletType:${state.seletType.value}"); + // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名"); return; @@ -201,7 +201,7 @@ class _AddCardPageState extends State { logic.checkCardNameDuplicated(state.nameController.text); } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }), diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart index caa9da92..8b57a0d0 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart @@ -5,7 +5,7 @@ import 'package:get/get.dart'; class AddCardTypeState{ final lockId = 0.obs; - final seletType = "0".obs;// 0永久 1显示 2循环 + final selectType = "0".obs;// 0永久 1显示 2循环 final fromType = 1.obs; // // 1从添加钥匙列表进入 2从考勤添加员工入口进入 final isStressFingerprint = false.obs; @@ -24,4 +24,4 @@ class AddCardTypeState{ // lockId.value = map["lockId"]; // fromType.value = map["fromType"]; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart b/star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart index dc8f05bf..1f54793a 100644 --- a/star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart +++ b/star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart @@ -50,7 +50,7 @@ class _CardListPageState extends State with RouteAware { if (isDemoMode == false) { showDeletAlertDialog(context); } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart index e88f95e0..cecd68b0 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart @@ -51,7 +51,7 @@ class _CheckingInAddHolidaysPageState extends State { builder: (context) { return ShowCalendar( datePickerMode: DatePickerMode.day, - seletAction: (dateTime) { + selectAction: (dateTime) { String beginDate = formatDate(dateTime, [yyyy,'-',mm,'-',dd]); state.beginDate.value = beginDate; Get.back(); @@ -70,7 +70,7 @@ class _CheckingInAddHolidaysPageState extends State { builder: (context) { return ShowCalendar( datePickerMode: DatePickerMode.day, - seletAction: (dateTime) { + selectAction: (dateTime) { String endDate = formatDate(dateTime, [yyyy,'-',mm,'-',dd]); state.endDate.value = endDate; Get.back(); @@ -88,7 +88,7 @@ class _CheckingInAddHolidaysPageState extends State { builder: (context) { return ShowCalendar( datePickerMode: DatePickerMode.day, - seletAction: (dateTime) { + selectAction: (dateTime) { String makeUpWorkDate = formatDate(dateTime, [yyyy,'-',mm,'-',dd]); state.makeUpWorkDate.value = makeUpWorkDate; Get.back(); @@ -147,7 +147,7 @@ class _CheckingInAddHolidaysPageState extends State { child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 40.w, height: 40.w, ), diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart index 7c506e68..c9685f70 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart @@ -12,7 +12,7 @@ class CheckingInSetHolidaysLogic extends BaseGetXController{ void editStaffLoadData() async{ var entity = await ApiRepository.to.holidaysListData( companyId: state.companyId.value, - vacationYear: state.seletYear.value.toString(), + vacationYear: state.selectYear.value.toString(), ); if(entity.errorCode!.codeIsSuccessful){ state.holidaysListData.value = entity.data!.holidayList!; @@ -42,4 +42,4 @@ class CheckingInSetHolidaysLogic extends BaseGetXController{ } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart index 192fc1b9..714fda1e 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart @@ -205,7 +205,7 @@ class _CheckingInSetHolidaysPageState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - "${state.seletYear.value}${TranslationLoader.lanKeys!.year!.tr}", + "${state.selectYear.value}${TranslationLoader.lanKeys!.year!.tr}", style: TextStyle(color: Colors.white, fontSize: 26.sp), ), SizedBox( @@ -259,7 +259,7 @@ class _CheckingInSetHolidaysPageState extends State { minDate: PDuration(year: 1900), maxDate: PDuration(year: 2100), onConfirm: (p) { - state.seletYear.value = p.year!; + state.selectYear.value = p.year!; logic.editStaffLoadData(); print("longer >>> 返回数据：${p.year}"); }, diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_state.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_state.dart index 5356c435..184158f7 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_state.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_state.dart @@ -7,7 +7,7 @@ import 'checkingInSetHolidays_entity.dart'; class CheckingInSetHolidaysState{ final companyId = "".obs; final mouth = "".obs; - final seletYear = DateTime.now().year.obs; + final selectYear = DateTime.now().year.obs; final holidaysListData = [].obs; CheckingInSetHolidaysState() { @@ -15,4 +15,4 @@ class CheckingInSetHolidaysState{ companyId.value = map["companyId"]; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInListMonth_entity.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInListMonth_entity.dart index 859c5002..ec6fc9ae 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInListMonth_entity.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInListMonth_entity.dart @@ -37,7 +37,7 @@ class AttendanceRecordMonthList { String? staffName; int? staffId; int? attendanceType; - String? countryCode; + int? countryCode; int? openingTimeStart; String? attendanceWay; int? avgTime; diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart index 8cea4db3..66ae6155 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart @@ -44,7 +44,7 @@ class _CheckingInListPageState extends State { "getKeyInfosData": state.getKeyInfosData.value, }); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, @@ -71,9 +71,19 @@ class _CheckingInListPageState extends State { child: Column( children: [ SizedBox(height: 30.h), - Image.asset('images/main/icon_checkInRankingListTop.png', width: 120.w, height: 120.w), + Obx(() => Container( + width: 110.w, + height: 110.w, + padding: EdgeInsets.all(10.w), + decoration: BoxDecoration( + color: AppColors.mainColor, + borderRadius: BorderRadius.circular(60.w), + ), + child: Image.asset(getTopImg(), width: 120.w, height: 120.w) + ) + ), SizedBox(height: 10.h), - Text(TranslationLoader.lanKeys!.noAttendanceRecord!.tr, style: TextStyle(fontSize: 24.sp)), + Obx(() => Text(getTopTitle(), style: TextStyle(color: Colors.black, fontSize: 24.sp))), SizedBox(height: 30.h), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -94,7 +104,7 @@ class _CheckingInListPageState extends State { logic.loadDataByType(); }); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, @@ -131,7 +141,7 @@ class _CheckingInListPageState extends State { logic.loadDataByType(); }); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, @@ -161,7 +171,7 @@ class _CheckingInListPageState extends State { builder: (context) { return ShowCalendar( datePickerMode: DatePickerMode.day, - seletAction: (dateTime) { + selectAction: (dateTime) { setState(() { state.checkListDateTimestamp.value = dateTime.millisecondsSinceEpoch; String beginDate = formatDate(dateTime, state.isDay.value ? [mm,'-',dd] : [mm]); @@ -172,7 +182,7 @@ class _CheckingInListPageState extends State { }); }); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, @@ -295,7 +305,7 @@ class _CheckingInListPageState extends State { child: Row( children: [ SizedBox(width: 30.w,), - Text("1", style: TextStyle(fontSize: 20.sp),), + Text("${index+1}", style: TextStyle(fontSize: 20.sp),), SizedBox(width: 20.w,), Image.asset('images/controls_user.png', width: 40.w, height: 40.w,), // Container( @@ -333,7 +343,7 @@ class _CheckingInListPageState extends State { if(isDemoMode == false){ showListType(); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, @@ -387,4 +397,24 @@ class _CheckingInListPageState extends State { }); }); } + + String getTopImg(){ + if(state.listType.value == "1"){ + return "images/main/icon_lockDetail_checkInRanking_zd.png"; + }else if(state.listType.value == "2"){ + return "images/main/icon_lockDetail_checkInRanking_cd.png"; + }else{ + return "images/main/icon_lockDetail_checkInRanking_qf.png"; + } + } + + String getTopTitle(){ + if(state.listType.value == "1"){ + return "无考勤记录"; + }else if(state.listType.value == "2"){ + return "大家干劲十足"; + }else{ + return "工作时长未出炉"; + } + } } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart index 89aad458..8d93cd34 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart @@ -1,7 +1,10 @@ +import 'package:get/get.dart'; + import '../../../../network/api_repository.dart'; import '../../../../tools/baseGetXController.dart'; import '../../../../tools/dateTool.dart'; +import '../../../../tools/eventBusEventManage.dart'; import 'checkingInSet_state.dart'; class CheckingInSetLogic extends BaseGetXController{ @@ -57,6 +60,17 @@ class CheckingInSetLogic extends BaseGetXController{ } } + // 删除公司 + void deletCompanyData() async{ + var entity = await ApiRepository.to.deletCompanyData( + companyId:state.checkingInSetInfo.value.companyId!, + ); + if(entity.errorCode!.codeIsSuccessful){ + eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, "0")); + Get.close(2); + } + } + // late StreamSubscription _teamEvent; // void _initLoadDataAction() { // _teamEvent = eventBus.on().listen((event) { diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart index 17d89e9f..f80251fe 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -122,7 +123,9 @@ class _CheckingInSetPageState extends State { isDelete: true, margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 20.w), padding: EdgeInsets.only(top: 20.w, bottom: 20.w), - onClick: () {}), + onClick: () { + showDeletCompanyAlertDialog(context); + }), ], ), ); @@ -196,4 +199,30 @@ class _CheckingInSetPageState extends State { ); } + void showDeletCompanyAlertDialog(context) { + showCupertinoDialog( + context: context, + builder: (context) { + return CupertinoAlertDialog( + title: const Text("提示"), + content: const Text('是否删除？'), + actions: [ + CupertinoDialogAction( + child: Text(TranslationLoader.lanKeys!.cancel!.tr), + onPressed: () { + Get.back(); + }, + ), + CupertinoDialogAction( + child: Text(TranslationLoader.lanKeys!.sure!.tr), + onPressed: () { + Get.back(); + logic.deletCompanyData(); + }, + ), + ], + ); + }, + ); + } } diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart index cdac3263..749ce6d6 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart @@ -33,8 +33,8 @@ class _CheckingInSetWorkdaySetState extends State { body: ListView( children: [ topBtnWidget(), - Obx(() => Visibility(visible: state.isCustom.value, child: bottomCustomSeletBtn())), - Obx(() => Visibility(visible: !state.isCustom.value, child: bottomOddOrEvenDaysOffSeletBtn())), + Obx(() => Visibility(visible: state.isCustom.value, child: bottomCustomSelectBtn())), + Obx(() => Visibility(visible: !state.isCustom.value, child: bottomOddOrEvenDaysOffSelectBtn())), SizedBox(height: 50.h,), Container( margin: EdgeInsets.only(left: 20.w, right: 20.w), @@ -113,7 +113,7 @@ class _CheckingInSetWorkdaySetState extends State { ); } - Widget bottomOddOrEvenDaysOffSeletBtn() { + Widget bottomOddOrEvenDaysOffSelectBtn() { return Container( padding: EdgeInsets.only(left: 10.w, right: 10.w), child: Column( @@ -138,7 +138,7 @@ class _CheckingInSetWorkdaySetState extends State { }, child: Row( children: [ - Image.asset(state.isSingledayWeekend.value == 0 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,), + Image.asset(state.isSingledayWeekend.value == 0 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,), ], ), ) @@ -158,7 +158,7 @@ class _CheckingInSetWorkdaySetState extends State { }, child: Row( children: [ - Image.asset(state.isSingledayWeekend.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,), + Image.asset(state.isSingledayWeekend.value == 1 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,), ], ), ) @@ -168,7 +168,7 @@ class _CheckingInSetWorkdaySetState extends State { ); } - Widget bottomCustomSeletBtn() { + Widget bottomCustomSelectBtn() { return Container( padding: EdgeInsets.only(left: 10.w, right: 10.w), height: 420.h, @@ -224,7 +224,7 @@ class _CheckingInSetWorkdaySetState extends State { }, child: Obx(() => Row( children: [ - Image.asset(state.weekDays.value.contains(index) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,), + Image.asset(state.weekDays.value.contains(index) ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,), ], ))) ); diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSeletKey_entity.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSelectKey_entity.dart similarity index 89% rename from star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSeletKey_entity.dart rename to star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSelectKey_entity.dart index 5c1e4e40..f153f5f5 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSeletKey_entity.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSelectKey_entity.dart @@ -1,14 +1,14 @@ -class CheckingInAddStaffSeletKeyEntity { +class CheckingInAddStaffSelectKeyEntity { int? errorCode; String? description; String? errorMsg; List? data; - CheckingInAddStaffSeletKeyEntity( + CheckingInAddStaffSelectKeyEntity( {this.errorCode, this.description, this.errorMsg, this.data}); - CheckingInAddStaffSeletKeyEntity.fromJson(Map json) { + CheckingInAddStaffSelectKeyEntity.fromJson(Map json) { errorCode = json['errorCode']; description = json['description']; errorMsg = json['errorMsg']; @@ -49,4 +49,4 @@ class CheckingInAddStaffKeyEntity { data['staffName'] = staffName; return data; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart index 7af0effb..d4a2b86e 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart @@ -4,10 +4,10 @@ import 'package:get/get.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../../network/api_repository.dart'; import '../../../../../tools/eventBusEventManage.dart'; -import 'checkingInAddStaffSeletKey_entity.dart'; +import 'checkingInAddStaffSelectKey_entity.dart'; import 'checkingInAddStaff_state.dart'; -typedef KeyClickCallback = void Function(List seletKeyList); +typedef KeyClickCallback = void Function(List selectKeyList); class CheckingInAddStaffLogic extends BaseGetXController{ CheckingInAddStaffState state = CheckingInAddStaffState(); @@ -25,7 +25,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{ void addStaffLoadData() async{ var attendanceWay = ""; var usernameType = "1"; - switch(int.parse(state.seletPrintingMethodType.value)){ + switch(int.parse(state.selectPrintingMethodType.value)){ case 1: // 打卡方式APP if(state.appUnHaveAccount.value){ @@ -41,7 +41,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{ return; } }else { - attendanceWay = state.seletKey.value; + attendanceWay = state.selectKey.value; if(attendanceWay.isEmpty){ showToast("请选择员工钥匙"); @@ -62,7 +62,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{ } var entity = await ApiRepository.to.addStaffData( - attendanceType: state.seletPrintingMethodType.value, + attendanceType: state.selectPrintingMethodType.value, attendanceWay: attendanceWay, companyId: state.companyId.value, have: state.appUnHaveAccount.value ? "2" : "1", @@ -78,10 +78,10 @@ class CheckingInAddStaffLogic extends BaseGetXController{ } // 考勤设置添加员工-选择钥匙 1为APP，2为密码，3为卡，4为指纹，返回数据中，attendanceWay分别为用户名、密码、卡号、指纹号 - void addStaffSeletKey(KeyClickCallback kyClickCallback) async{ - var entity = await ApiRepository.to.addStaffSeletKeyData( + void addStaffSelectKey(KeyClickCallback kyClickCallback) async{ + var entity = await ApiRepository.to.addStaffSelectKeyData( companyId: state.companyId.value, - type:state.seletPrintingMethodType.value, + type:state.selectPrintingMethodType.value, ); if(entity.errorCode!.codeIsSuccessful){ state.keyEntity.value = entity.data!; @@ -93,7 +93,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{ void editStaffLoadData() async{ var attendanceWay = ""; var usernameType = "1"; - switch(int.parse(state.seletPrintingMethodType.value)){ + switch(int.parse(state.selectPrintingMethodType.value)){ case 1: // 打卡方式APP if(state.appUnHaveAccount.value){ @@ -109,7 +109,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{ return; } }else { - attendanceWay = state.seletKey.value; + attendanceWay = state.selectKey.value; if(attendanceWay.isEmpty){ showToast("请选择员工钥匙"); @@ -130,7 +130,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{ } var entity = await ApiRepository.to.editStaffData( - attendanceType: state.seletPrintingMethodType.value, + attendanceType: state.selectPrintingMethodType.value, attendanceWay: attendanceWay, staffId: state.staffListItemData.value.staffId.toString(), have: state.appUnHaveAccount.value ? "2" : "1", @@ -212,4 +212,4 @@ class CheckingInAddStaffLogic extends BaseGetXController{ _getNumberEvent!.cancel(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart index de196a7d..b4c50840 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart @@ -44,12 +44,12 @@ class _CheckingInAddStaffPageState extends State { state.staffNameController)), Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.punchingMode!.tr, - rightTitle: state.seletPrintingMethodStr.value, + rightTitle: state.selectPrintingMethodStr.value, isHaveLine: false, isHaveDirection: true, action: () { var list = ["APP", "密码", "卡", "指纹"]; - _showSeletClockInType(list, "1"); + _showSelectClockInType(list, "1"); })), SizedBox( height: 10.h, @@ -82,7 +82,7 @@ class _CheckingInAddStaffPageState extends State { // 当选择App时显示 其他隐藏 Obx(() => Visibility( visible: (state.appUnHaveAccount.value && - state.seletPrintingMethodType.value == "1") + state.selectPrintingMethodType.value == "1") ? true : false, child: Column( @@ -111,7 +111,7 @@ class _CheckingInAddStaffPageState extends State { ), action: () async { var result = await Navigator.pushNamed( - context, Routers.seletCountryRegionPage); + context, Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; @@ -125,8 +125,7 @@ class _CheckingInAddStaffPageState extends State { )), // 当选择密码、卡、指纹时显示 Obx(() => Visibility( - visible: (state.seletPrintingMethodType.value != "1" && - state.appUnHaveAccount.value) + visible: (state.selectPrintingMethodType.value != "1" && state.appUnHaveAccount.value) ? true : false, child: CommonItem( @@ -135,24 +134,21 @@ class _CheckingInAddStaffPageState extends State { isHaveRightWidget: true, rightWidget: Row( children: [ - Obx(() => Text(state.getDataPassword.value, - style: TextStyle(fontSize: 24.sp))), + Obx(() => Text(state.getDataPassword.value, style: TextStyle(fontSize: 24.sp))), + SizedBox(width: 30.w), SizedBox( - width: 30.w, - ), - SizedBox( - width: 130.w, + width: 150.w, height: 40.h, child: ElevatedButton( style: ElevatedButton.styleFrom( backgroundColor: AppColors.mainColor, ), - child: Text(addStaffSeletKeyType(), + child: Text(addStaffSelectKeyType(), style: TextStyle( color: Colors.white, fontSize: 22.sp)), onPressed: () async { switch (int.parse( - state.seletPrintingMethodType.value)) { + state.selectPrintingMethodType.value)) { case 2: // 获取密码 logic.getKeyboardPwdRequest(); @@ -210,16 +206,16 @@ class _CheckingInAddStaffPageState extends State { visible: !state.appUnHaveAccount.value, child: CommonItem( leftTitel: addStaffGetKeyType(), - rightTitle: state.seletKey.value, + rightTitle: state.selectKey.value, isHaveLine: false, isHaveDirection: true, action: () { - logic.addStaffSeletKey((v) { + logic.addStaffSelectKey((v) { var list = []; for (var element in v) { list.add(element.attendanceWay); } - _showSeletClockInType(list, "2"); + _showSelectClockInType(list, "2"); }); }), )), @@ -283,7 +279,7 @@ class _CheckingInAddStaffPageState extends State { } // type 1 打卡方式 2选择钥匙 - void _showSeletClockInType(List list, String type) { + void _showSelectClockInType(List list, String type) { ShowBottomSheetTool().showSingleRowPicker( //上下文 context, @@ -300,14 +296,14 @@ class _CheckingInAddStaffPageState extends State { clickCallBack: (int index, var str) { setState(() { if (type == "1") { - state.seletPrintingMethodType.value = (index + 1).toString(); - state.seletPrintingMethodStr.value = str.toString(); + state.selectPrintingMethodType.value = (index + 1).toString(); + state.selectPrintingMethodStr.value = str.toString(); state.getDataPassword.value = ""; } else { - state.seletKey.value = str.toString(); + state.selectKey.value = str.toString(); } print( - "object:$index str:$str type:$type state.seletPrintingMethodType.value:${state.seletPrintingMethodType.value}"); + "object:$index str:$str type:$type state.selectPrintingMethodType.value:${state.selectPrintingMethodType.value}"); }); }); } @@ -320,8 +316,8 @@ class _CheckingInAddStaffPageState extends State { children: [ Image.asset( appUnHaveAccount - ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + ? 'images/icon_round_select.png' + : 'images/icon_round_unSelect.png', width: 26.w, height: 26.w, ), @@ -341,7 +337,7 @@ class _CheckingInAddStaffPageState extends State { String addStaffGetIfHaveKey() { String title = ""; - switch (int.parse(state.seletPrintingMethodType.value)) { + switch (int.parse(state.selectPrintingMethodType.value)) { case 1: title = TranslationLoader.lanKeys!.whetherTheEmployeeHasAKey!.tr; break; @@ -360,7 +356,7 @@ class _CheckingInAddStaffPageState extends State { String addStaffGetKeyType() { String title = ""; - switch (int.parse(state.seletPrintingMethodType.value)) { + switch (int.parse(state.selectPrintingMethodType.value)) { case 1: title = TranslationLoader.lanKeys!.accountNumber!.tr; break; @@ -377,9 +373,9 @@ class _CheckingInAddStaffPageState extends State { return title; } - String addStaffSeletKeyType() { + String addStaffSelectKeyType() { String title = ""; - switch (int.parse(state.seletPrintingMethodType.value)) { + switch (int.parse(state.selectPrintingMethodType.value)) { case 1: title = TranslationLoader.lanKeys!.getKey!.tr; break; diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart index d342c1ae..5d601a38 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import '../../../../lockMian/entity/lockListInfo_entity.dart'; import '../checkingInSetStaffList/checkingInStaffList_entity.dart'; -import 'checkingInAddStaffSeletKey_entity.dart'; +import 'checkingInAddStaffSelectKey_entity.dart'; class CheckingInAddStaffState{ final getKeyInfosData = LockListInfoItemEntity().obs; @@ -14,15 +14,15 @@ class CheckingInAddStaffState{ final TextEditingController staffNameController = TextEditingController(); final TextEditingController staffAccountController = TextEditingController(); - final seletPrintingMethodType = "1".obs;// 选择打卡类型 - final seletPrintingMethodStr = "APP".obs;// 选择打卡类型字符串 + final selectPrintingMethodType = "1".obs;// 选择打卡类型 + final selectPrintingMethodStr = "APP".obs;// 选择打卡类型字符串 final countryName = "中国".obs; final countryCode = "86".obs; final appUnHaveAccount = true.obs;// 默认没有账号 final keyEntity = [].obs;// 选择钥匙数据 - final seletKey = "".obs; + final selectKey = "".obs; final isAdd = "1".obs; // 1添加 2编辑 final getDataPassword = "".obs; @@ -37,29 +37,29 @@ class CheckingInAddStaffState{ staffListItemData.value = map["staffListItem"]; staffNameController.text = staffListItemData.value.staffName!; - seletPrintingMethodType.value = staffListItemData.value.attendanceType.toString(); + selectPrintingMethodType.value = staffListItemData.value.attendanceType.toString(); switch(staffListItemData.value.attendanceType){ case 1: - seletPrintingMethodStr.value = "APP"; + selectPrintingMethodStr.value = "APP"; break; case 2: - seletPrintingMethodStr.value = "密码"; + selectPrintingMethodStr.value = "密码"; break; case 3: - seletPrintingMethodStr.value = "卡"; + selectPrintingMethodStr.value = "卡"; break; case 4: - seletPrintingMethodStr.value = "指纹"; + selectPrintingMethodStr.value = "指纹"; break; } if(staffListItemData.value.attendanceWay!.isNotEmpty){ appUnHaveAccount.value = false; - seletKey.value = staffListItemData.value.attendanceWay!; + selectKey.value = staffListItemData.value.attendanceWay!; }else{ appUnHaveAccount.value = true; } } } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_entity.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_entity.dart index d52c0140..d34af350 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_entity.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_entity.dart @@ -36,7 +36,7 @@ class CheckingInAddStaffListItemEntity { String? staffName; int? staffId; int? attendanceType; - String? countryCode; + int? countryCode; String? attendanceWay; CheckingInAddStaffListItemEntity( diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart index f8422ba0..33bfe351 100644 --- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart +++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart @@ -47,7 +47,7 @@ class _DoorLockLogPageState extends State { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart index f7a68770..1fca986a 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart @@ -248,7 +248,7 @@ class _MassSendElectronicKeyPageState extends State { ), action: () async { var result = await Navigator.pushNamed( - context, Routers.seletCountryRegionPage); + context, Routers.selectCountryRegionPage); if (result != null) { result as Map; countryCode = result['code']; @@ -260,7 +260,7 @@ class _MassSendElectronicKeyPageState extends State { CommonItem( leftTitel: TranslationLoader.lanKeys!.lock!.tr, rightTitle: _lockIdList.isEmpty - ? TranslationLoader.lanKeys!.pleaseSelet!.tr + ? TranslationLoader.lanKeys!.pleaseSelect!.tr : _lockIdList.length.toString(), isHaveDirection: true, action: () { diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_page.dart index 46738132..eb6a1846 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_page.dart @@ -201,8 +201,8 @@ class _LockUserListPageState extends State { }, child: Image.asset( itemData.isCheck! - ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + ? 'images/icon_round_select.png' + : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, )), diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart index b3240f85..f78ab3fd 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart @@ -66,8 +66,8 @@ class massSendLockGroupCell extends StatelessWidget { )), Image.asset( itemData.isChecked - ? "images/icon_round_selet.png" - : "images/icon_round_unSelet.png", + ? "images/icon_round_select.png" + : "images/icon_round_unSelect.png", width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart index 6960fbd7..c0fa0216 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart @@ -123,15 +123,15 @@ class _MassSendLockGroupListPageState extends State { // clickIndex = index; //是否选中组 if (itemData.isChecked) { - var seletList = itemData.lockList; - for(LockListItem lockListItem in seletList!){ + var selectList = itemData.lockList; + for(LockListItem lockListItem in selectList!){ lockListItem.isChecked = true; selectLockIdList.add(lockListItem.lockId); } // lockItemList[selectIndex] = }else{ - var seletList = itemData.lockList; - for(LockListItem lockListItem in seletList!){ + var selectList = itemData.lockList; + for(LockListItem lockListItem in selectList!){ lockListItem.isChecked = false; selectLockIdList.remove(lockListItem.lockId); } diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart index b9bd561f..97a9de03 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart @@ -80,7 +80,7 @@ class _MassSendReceiverPageState extends State { ), action: () async { var result = await Navigator.pushNamed( - context, Routers.seletCountryRegionPage); + context, Routers.selectCountryRegionPage); if (result != null) { result as Map; countryCode = result['code']; diff --git a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart index 65e4e191..7d7577da 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart @@ -106,7 +106,7 @@ class SendElectronicKeyLogic extends BaseGetXController { ), CupertinoDialogAction( child: Text( - TranslationLoader.lanKeys!.selet!.tr, + TranslationLoader.lanKeys!.select!.tr, style: TextStyle(color: AppColors.mainColor), ), onPressed: () async { @@ -114,7 +114,7 @@ class SendElectronicKeyLogic extends BaseGetXController { state.isCreateUser.value = true; Navigator.of(context).pop(); - var result = await Get.toNamed(Routers.seletCountryRegionPage); + var result = await Get.toNamed(Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; diff --git a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart index 05dbcc09..1dac77e1 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart @@ -139,7 +139,7 @@ class _SendElectronicKeyPageState extends State { ), action: () async { var result = await Navigator.pushNamed( - context, Routers.seletCountryRegionPage); + context, Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; diff --git a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceTypeManage/addFaceTypeManage_tabbar.dart b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceTypeManage/addFaceTypeManage_tabbar.dart index 5fea8222..6bb172cb 100644 --- a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceTypeManage/addFaceTypeManage_tabbar.dart +++ b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceTypeManage/addFaceTypeManage_tabbar.dart @@ -21,9 +21,9 @@ class _AddFaceTypeManageTabbarState extends State with late TabController _tabController; final List _itemTabs = [ - ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, seletType: "0"), - ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, seletType: "1"), - ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, seletType: "2"), + ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, selectType: "0"), + ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, selectType: "1"), + ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, selectType: "2"), ]; @override @@ -83,7 +83,7 @@ class _AddFaceTypeManageTabbarState extends State with child: TabBarView( controller: _tabController, children: _itemTabs - .map((ItemView item) => AddFaceTypePage(seletType: item.seletType,)) + .map((ItemView item) => AddFaceTypePage(selectType: item.selectType,)) .toList(), ), ); @@ -91,8 +91,8 @@ class _AddFaceTypeManageTabbarState extends State with } class ItemView { - const ItemView({required this.title, required this.seletType}); + const ItemView({required this.title, required this.selectType}); final String title; - final String seletType; + final String selectType; } diff --git a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart index e6b1e4fd..15d03eb4 100644 --- a/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart +++ b/star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart @@ -14,9 +14,9 @@ import '../../../../translations/trans_lib.dart'; import 'addFaceType_logic.dart'; class AddFaceTypePage extends StatefulWidget { - final String seletType; + final String selectType; - const AddFaceTypePage({Key? key, required this.seletType}) : super(key: key); + const AddFaceTypePage({Key? key, required this.selectType}) : super(key: key); @override State createState() => _AddFaceTypePageState(); @@ -32,7 +32,7 @@ class _AddFaceTypePageState extends State { } Widget indexChangeWidget() { - switch (int.parse(widget.seletType)) { + switch (int.parse(widget.selectType)) { case 0: { // 永久 @@ -176,14 +176,14 @@ class _AddFaceTypePageState extends State { onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.seletType:${state.seletType.value}"); + // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名"); return; } logic.checkFaceNameDuplicated(state.nameController.text); } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }), diff --git a/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart b/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart index f516c027..d427e482 100644 --- a/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart +++ b/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart @@ -46,7 +46,7 @@ class _FaceListState extends State { if (isDemoMode == false) { showDeletAlertDialog(context); } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_page.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_page.dart rename to star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_page.dart diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart similarity index 94% rename from star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart rename to star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart index 3378e53b..baef6122 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart @@ -25,9 +25,9 @@ class _AddFingerprintTypeManageTabbarState extends State _itemTabs = [ - ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, seletType: "0"), - ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, seletType: "1"), - ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, seletType: "2"), + ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, selectType: "0"), + ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, selectType: "1"), + ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, selectType: "2"), ]; @override @@ -97,7 +97,7 @@ class _AddFingerprintTypeManageTabbarState extends State AddFingerprintTypePage( - seletType: item.seletType, + selectType: item.selectType, lockId: widget.lockId, fromType: widget.fromType, fromTypeTwoStaffName:widget.fromTypeTwoStaffName @@ -109,8 +109,8 @@ class _AddFingerprintTypeManageTabbarState extends State { @override Widget build(BuildContext context) { - state.seletType.value = widget.seletType; + state.selectType.value = widget.selectType; state.lockId.value = widget.lockId; // state.nameController.text = widget.fromTypeTwoStaffName; @@ -49,7 +49,7 @@ class _AddFingerprintTypePageState extends State { } Widget indexChangeWidget() { - switch (int.parse(widget.seletType)) { + switch (int.parse(widget.selectType)) { case 0: { // 永久 @@ -193,14 +193,14 @@ class _AddFingerprintTypePageState extends State { onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.seletType:${state.seletType.value}"); + // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名"); return; } logic.checkFingerprintNameDuplicated(state.nameController.text); } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }), diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_state.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_state.dart similarity index 93% rename from star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_state.dart rename to star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_state.dart index 18e3573f..eaf5039c 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_state.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_state.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; class AddFingerprintState{ final lockId = 0.obs; - final seletType = "0".obs;// 0永久 1显示 2循环 + final selectType = "0".obs;// 0永久 1显示 2循环 final fromType = 1.obs; // // 1从添加钥匙列表进入 2从考勤添加员工入口进入 final isStressFingerprint = false.obs; @@ -23,4 +23,4 @@ class AddFingerprintState{ // lockId.value = map["lockId"]; // fromType.value = map["fromType"]; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart b/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart index 1f75997d..3a0a3dc4 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart @@ -50,7 +50,7 @@ class _FingerprintListPageState extends State with RouteAwa if (isDemoMode == false) { showDeletAlertDialog(context); } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, 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/lockDetail/lockDetail_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index 66cd304d..b7d9343d 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -594,8 +594,7 @@ class LockDetailLogic extends BaseGetXController { // 获取手机联网token，根据锁设置里面获取的开锁时是否联网来判断是否调用这个接口 void getLockNetToken() async { - LockNetTokenEntity entity = await ApiRepository.to - .getLockNetToken(lockId: state.keyInfos.value.lockId.toString()); + LockNetTokenEntity entity = await ApiRepository.to.getLockNetToken(lockId: state.keyInfos.value.lockId.toString()); if (entity.errorCode!.codeIsSuccessful) { state.lockNetToken = entity.data!.token!; print("state.lockNetToken:${state.lockNetToken}"); diff --git a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart index 627755ed..f3fd5131 100644 --- a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart +++ b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart @@ -59,7 +59,7 @@ class _LockOperatingRecordPageState extends State { _openModalBottomSheet(); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, diff --git a/star_lock/lib/main/lockDetail/lcokSet/addFamily/addFamily_logic.dart b/star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/addFamily/addFamily_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/addFamily/addFamily_page.dart b/star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/addFamily/addFamily_page.dart rename to star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/addFamily/addFamily_state.dart b/star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/addFamily/addFamily_state.dart rename to star_lock/lib/main/lockDetail/lockSet/addFamily/addFamily_state.dart 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 71% 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 8bd033a7..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'; @@ -59,43 +58,43 @@ class AutomaticBlockingLogic extends BaseGetXController{ } // 读取支持功能(带参数) - if(reply is ReadSupportFunctionsWithParametersReply) { - _readSupportFunctionsWithParametersReply(reply); - } + // if(reply is ReadSupportFunctionsWithParametersReply) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch(status){ - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - state.autoLockTime.value = reply.data[7].toString(); - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - - break; - default: - //失败 - print("${reply.commandType}失败"); - - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch(status){ + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // state.autoLockTime.value = reply.data[7].toString(); + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // + // break; + // } + // } // 设置自动落锁数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { @@ -133,30 +132,30 @@ class AutomaticBlockingLogic extends BaseGetXController{ } // 读取支持功能-带参数 - Future _readSupportFunctionsWithParameters() async { - BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { - if (connectionState == DeviceConnectionState.connected) { - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - - var token = await Storage.getStringList(saveBlueToken); - List getTokenList = changeStringListToIntList(token!); - - var publicKey = await Storage.getStringList(saveBluePublicKey); - List getPublicKeyList = changeStringListToIntList(publicKey!); - - IoSenderManage.readSupportFunctionsWithParametersCommand( - keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), - userID: await Storage.getUid(), - featureBit: 29, - token: getTokenList, - needAuthor: 1, - publicKey: getPublicKeyList, - privateKey: getPrivateKeyList - ); - } - }); - } + // Future _readSupportFunctionsWithParameters() async { + // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { + // if (connectionState == DeviceConnectionState.connected) { + // var privateKey = await Storage.getStringList(saveBluePrivateKey); + // List getPrivateKeyList = changeStringListToIntList(privateKey!); + // + // var token = await Storage.getStringList(saveBlueToken); + // List getTokenList = changeStringListToIntList(token!); + // + // var publicKey = await Storage.getStringList(saveBluePublicKey); + // List getPublicKeyList = changeStringListToIntList(publicKey!); + // + // IoSenderManage.readSupportFunctionsWithParametersCommand( + // keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), + // userID: await Storage.getUid(), + // featureBit: 29, + // token: getTokenList, + // needAuthor: 1, + // publicKey: getPublicKeyList, + // privateKey: getPrivateKeyList + // ); + // } + // }); + // } // 设置支持功能(带参数) Future sendAutoLock() async { @@ -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"; @@ -228,7 +227,7 @@ class AutomaticBlockingLogic extends BaseGetXController{ super.onInit(); print("onInit()"); - _readSupportFunctionsWithParameters(); + // _readSupportFunctionsWithParameters(); } @override diff --git a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart b/star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart rename to star_lock/lib/main/lockDetail/lockSet/automaticBlocking/automaticBlocking_page.dart 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/adminOpenLockPassword/adminOpenLockPassword_logic.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_state.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_state.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/KeyDetailEntity.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/KeyDetailEntity.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/KeyDetailEntity.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/KeyDetailEntity.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_logic.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_logic.dart 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 96% 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 51de02dc..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 { @@ -97,7 +95,7 @@ class _BasicInformationPageState extends State { isHaveLine: true, isHaveDirection: true, action: () async { - Get.toNamed(Routers.lockSeletGroupingPage, arguments: { + Get.toNamed(Routers.lockSelectGroupingPage, arguments: { 'lockSetInfoData': state.lockSetInfoData.value })! .then((val) { 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/basicInformation/editLockName/editLockName_logic.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/editLockName/editLockName_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/editLockName/editLockName_page.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/editLockName/editLockName_page.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/editLockName/editLockName_state.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/editLockName/editLockName_state.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockGroupList_entity.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockGroupList_entity.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockGroupList_entity.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockGroupList_entity.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_logic.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_logic.dart similarity index 92% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_logic.dart index 6d9401f7..3921368b 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_logic.dart @@ -3,10 +3,10 @@ import '../../../../../network/api_repository.dart'; import '../../../../../tools/baseGetXController.dart'; import '../../../../../tools/eventBusEventManage.dart'; import '../../../electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart'; -import 'lockSeletGrouping_state.dart'; +import 'lockSelectGrouping_state.dart'; -class LockSeletGroupingLogic extends BaseGetXController { - final LockSeletGroupingState state = LockSeletGroupingState(); +class LockSelectGroupingLogic extends BaseGetXController { + final LockSelectGroupingState state = LockSelectGroupingState(); //创建锁分组请求 Future addLockGroupRequest() async { @@ -64,4 +64,4 @@ class LockSeletGroupingLogic extends BaseGetXController { // TODO: implement onClose } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart similarity index 88% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart index a0480e27..667779de 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart @@ -10,18 +10,18 @@ import '../../../../../tools/noData.dart'; import '../../../../../tools/submitBtn.dart'; import '../../../../../tools/titleAppBar.dart'; import '../../../../../translations/trans_lib.dart'; -import 'lockSeletGrouping_logic.dart'; +import 'lockSelectGrouping_logic.dart'; -class LockSeletGroupingPage extends StatefulWidget { - const LockSeletGroupingPage({Key? key}) : super(key: key); +class LockSelectGroupingPage extends StatefulWidget { + const LockSelectGroupingPage({Key? key}) : super(key: key); @override - State createState() => _LockSeletGroupingPageState(); + State createState() => _LockSelectGroupingPageState(); } -class _LockSeletGroupingPageState extends State { - final logic = Get.put(LockSeletGroupingLogic()); - final state = Get.find().state; +class _LockSelectGroupingPageState extends State { + final logic = Get.put(LockSelectGroupingLogic()); + final state = Get.find().state; @override Widget build(BuildContext context) { diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_state.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_state.dart similarity index 90% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_state.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_state.dart index 479a01cd..d7554f96 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_state.dart @@ -6,16 +6,16 @@ import 'package:get/get.dart'; import '../../../electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart'; import '../../lockSet/lockSetInfo_entity.dart'; -class LockSeletGroupingState { +class LockSelectGroupingState { var lockSetInfoData = LockSetInfoData().obs; var lockBasicInfo = LockBasicInfo().obs; var groupList = [].obs; final TextEditingController changeNameController = TextEditingController(); - LockSeletGroupingState() { + LockSelectGroupingState() { var map = Get.arguments; lockSetInfoData.value = map["lockSetInfoData"]; lockBasicInfo.value = lockSetInfoData.value.lockBasicInfo!; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_state.dart b/star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_state.dart rename to star_lock/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_state.dart 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 69% 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 9f0a0179..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'; @@ -44,39 +43,39 @@ class BurglarAlarmLogic extends BaseGetXController{ } // 读取支持功能(带参数) - if(reply is ReadSupportFunctionsNoParametersReply) { - _readSupportFunctionsWithParametersReply(reply); - } + // if(reply is ReadSupportFunctionsNoParametersReply) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch(status){ - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - state.burglarAlarmEnable.value = reply.data[6]; - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - break; - default: - //失败 - print("${reply.commandType}失败"); - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch(status){ + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // state.burglarAlarmEnable.value = reply.data[6]; + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // break; + // } + // } // 设置自动落锁数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { @@ -114,30 +113,30 @@ class BurglarAlarmLogic extends BaseGetXController{ } // 读取支持功能-带参数 - Future _readSupportFunctionsNoParameters() async { - BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { - if (connectionState == DeviceConnectionState.connected) { - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - - var token = await Storage.getStringList(saveBlueToken); - List getTokenList = changeStringListToIntList(token!); - - var publicKey = await Storage.getStringList(saveBluePublicKey); - List getPublicKeyList = changeStringListToIntList(publicKey!); - - IoSenderManage.readSupportFunctionsNoParametersCommand( - keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), - userID: await Storage.getUid(), - featureBit: 30, - token: getTokenList, - needAuthor: 1, - publicKey: getPublicKeyList, - privateKey: getPrivateKeyList - ); - } - }); - } + // Future _readSupportFunctionsNoParameters() async { + // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { + // if (connectionState == DeviceConnectionState.connected) { + // var privateKey = await Storage.getStringList(saveBluePrivateKey); + // List getPrivateKeyList = changeStringListToIntList(privateKey!); + // + // var token = await Storage.getStringList(saveBlueToken); + // List getTokenList = changeStringListToIntList(token!); + // + // var publicKey = await Storage.getStringList(saveBluePublicKey); + // List getPublicKeyList = changeStringListToIntList(publicKey!); + // + // IoSenderManage.readSupportFunctionsNoParametersCommand( + // keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), + // userID: await Storage.getUid(), + // featureBit: 30, + // token: getTokenList, + // needAuthor: 1, + // publicKey: getPublicKeyList, + // privateKey: getPrivateKeyList + // ); + // } + // }); + // } // 设置支持功能(带参数) Future sendBurglarAlarm() async { @@ -197,7 +196,7 @@ class BurglarAlarmLogic extends BaseGetXController{ super.onInit(); print("onInit()"); - _readSupportFunctionsNoParameters(); + // _readSupportFunctionsNoParameters(); } @override @@ -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/burglarAlarm/burglarAlarm_page.dart b/star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_page.dart rename to star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_state.dart b/star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_state.dart rename to star_lock/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart similarity index 77% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart index bce600a1..3c539dd7 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_state.dart'; +import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class CatEyeCustomModeLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart index e7cba823..313fee0c 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart @@ -4,7 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/appRouters.dart'; import 'package:star_lock/app_settings/app_colors.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart'; import 'package:star_lock/tools/commonItem.dart'; import 'package:star_lock/tools/custom_bottom_sheet.dart'; import 'package:star_lock/tools/titleAppBar.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_state.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_state.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeSet/catEyeSet_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeSet/catEyeSet_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeSet/catEyeSet_page.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeSet/catEyeSet_page.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart index 2b9bb695..ce771065 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeSet/catEyeSet_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_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/lcokSet/catEyeSet/catEyeSet/catEyeSet_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart'; import 'package:star_lock/tools/commonItem.dart'; import 'package:star_lock/tools/custom_bottom_sheet.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeSet/catEyeSet_state.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/catEyeSet/catEyeSet_state.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_state.dart 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/catEyeSet/videoSlot/videoSlot_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart similarity index 74% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart index aa452976..2e5fe60b 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_state.dart'; +import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class VideoSlotLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_page.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_page.dart similarity index 99% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_page.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_page.dart index ef8524aa..0acc0049 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_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/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_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/translations/trans_lib.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_state.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/catEyeSet/videoSlot/videoSlot_state.dart rename to star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_logic.dart b/star_lock/lib/main/lockDetail/lockSet/checkInCreatCompany/checkInCreatCompany_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/checkInCreatCompany/checkInCreatCompany_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_page.dart b/star_lock/lib/main/lockDetail/lockSet/checkInCreatCompany/checkInCreatCompany_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_page.dart rename to star_lock/lib/main/lockDetail/lockSet/checkInCreatCompany/checkInCreatCompany_page.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/configuringWifiEntity.dart b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifiEntity.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifiEntity.dart rename to star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifiEntity.dart 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/configuringWifi/configuringWifi_page.dart b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifi_page.dart rename to star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifi_state.dart b/star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifi_state.dart rename to star_lock/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/diagnose/diagnose_logic.dart b/star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/diagnose/diagnose_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/diagnose/diagnose_page.dart b/star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/diagnose/diagnose_page.dart rename to star_lock/lib/main/lockDetail/lockSet/diagnose/diagnose_page.dart 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/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart b/star_lock/lib/main/lockDetail/lockSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart rename to star_lock/lib/main/lockDetail/lockSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/doorMagnetic/doorMagneticList/doorMagnetic_page.dart b/star_lock/lib/main/lockDetail/lockSet/doorMagnetic/doorMagneticList/doorMagnetic_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/doorMagnetic/doorMagneticList/doorMagnetic_page.dart rename to star_lock/lib/main/lockDetail/lockSet/doorMagnetic/doorMagneticList/doorMagnetic_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/doorMagnetic/nearbyDoorMagnetic/nearbyDoorMagnetic_page.dart b/star_lock/lib/main/lockDetail/lockSet/doorMagnetic/nearbyDoorMagnetic/nearbyDoorMagnetic_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/doorMagnetic/nearbyDoorMagnetic/nearbyDoorMagnetic_page.dart rename to star_lock/lib/main/lockDetail/lockSet/doorMagnetic/nearbyDoorMagnetic/nearbyDoorMagnetic_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/faceUnlock/faceUnlock_logic.dart b/star_lock/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart similarity index 74% rename from star_lock/lib/main/lockDetail/lcokSet/faceUnlock/faceUnlock_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart index 1e57c852..05fe5acf 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/faceUnlock/faceUnlock_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lcokSet/faceUnlock/faceUnlock_state.dart'; +import 'package:star_lock/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class FaceUnlockLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lcokSet/faceUnlock/faceUnlock_page.dart b/star_lock/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/faceUnlock/faceUnlock_page.dart rename to star_lock/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_page.dart index dad35bde..7732de2b 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/faceUnlock/faceUnlock_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_page.dart @@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/faceUnlock/faceUnlock_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart'; import 'package:star_lock/tools/custom_bottom_sheet.dart'; import '../../../../app_settings/app_colors.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/faceUnlock/faceUnlock_state.dart b/star_lock/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/faceUnlock/faceUnlock_state.dart rename to star_lock/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/familyDetails/familyDetails_logic.dart b/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_logic.dart similarity index 75% rename from star_lock/lib/main/lockDetail/lcokSet/familyDetails/familyDetails_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_logic.dart index dc8c8e61..023b3119 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/familyDetails/familyDetails_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lcokSet/familyDetails/familyDetails_state.dart'; +import 'package:star_lock/main/lockDetail/lockSet/familyDetails/familyDetails_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class FamilyDetailsLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lcokSet/familyDetails/familyDetails_page.dart b/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/familyDetails/familyDetails_page.dart rename to star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_page.dart index 667e4e12..520261a0 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/familyDetails/familyDetails_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/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/lcokSet/familyDetails/familyDetails_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/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/lcokSet/familyDetails/familyDetails_state.dart b/star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/familyDetails/familyDetails_state.dart rename to star_lock/lib/main/lockDetail/lockSet/familyDetails/familyDetails_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/importOtherLockData/ImportOtherLockData_page.dart b/star_lock/lib/main/lockDetail/lockSet/importOtherLockData/ImportOtherLockData_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/importOtherLockData/ImportOtherLockData_page.dart rename to star_lock/lib/main/lockDetail/lockSet/importOtherLockData/ImportOtherLockData_page.dart index 5b4f6329..faead0db 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/importOtherLockData/ImportOtherLockData_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/importOtherLockData/ImportOtherLockData_page.dart @@ -105,7 +105,7 @@ class _ImportOtherLockDataPageState extends State { return ListView.separated( itemCount: 2, itemBuilder: (c, index) { - return _electronicKeyItem('images/icon_round_unSelet.png', "张三", + return _electronicKeyItem('images/icon_round_unSelect.png', "张三", "2023.6.21 11.15", "2023.6.21 11.15", index,() { // Navigator.pushNamed(context, Routers.electronicKeyDetailPage); }); diff --git a/star_lock/lib/main/lockDetail/lcokSet/liveVideo/liveVideo_logic.dart b/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart similarity index 73% rename from star_lock/lib/main/lockDetail/lcokSet/liveVideo/liveVideo_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart index 2ad94803..54439bfe 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/liveVideo/liveVideo_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lcokSet/liveVideo/liveVideo_state.dart'; +import 'package:star_lock/main/lockDetail/lockSet/liveVideo/liveVideo_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class LiveVideoLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lcokSet/liveVideo/liveVideo_page.dart b/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/liveVideo/liveVideo_page.dart rename to star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_page.dart index 688b4d5e..eed2b299 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/liveVideo/liveVideo_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_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/lockDetail/lcokSet/liveVideo/liveVideo_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart'; import 'package:star_lock/translations/trans_lib.dart'; import '../../../../../app_settings/app_colors.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/liveVideo/liveVideo_state.dart b/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/liveVideo/liveVideo_state.dart rename to star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_state.dart 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/lcokSet/lockEscalation/lockEscalation_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockEscalation/lockEscalation_page.dart rename to star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart 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/checkingInInfoData_entity.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/checkingInInfoData_entity.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockSet/checkingInInfoData_entity.dart rename to star_lock/lib/main/lockDetail/lockSet/lockSet/checkingInInfoData_entity.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSetInfo_entity.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSetInfo_entity.dart rename to star_lock/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart 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 96% 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 e7cea7c2..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'; @@ -51,9 +50,9 @@ class LockSetLogic extends BaseGetXController { } // 读取支持功能(不带参数) - if ((reply is ReadSupportFunctionsNoParametersReply) && (state.settingUpSupportFeatures == 56)) { - _readSupportFunctionsWithParametersReply(reply); - } + // if ((reply is ReadSupportFunctionsNoParametersReply) && (state.settingUpSupportFeatures == 56)) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } @@ -176,33 +175,33 @@ class LockSetLogic extends BaseGetXController { } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch (status) { - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - state.isOpenBlueBroadcast.value = reply.data[6]; - print("isOpenBlueBroadcast:${state.isOpenBlueBroadcast.value}"); - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - break; - default: - //失败 - print("${reply.commandType}失败"); - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch (status) { + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // state.isOpenBlueBroadcast.value = reply.data[6]; + // print("isOpenBlueBroadcast:${state.isOpenBlueBroadcast.value}"); + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // break; + // } + // } // 锁设置数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart rename to star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_state.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_state.dart rename to star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_state.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 70% 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 344dc8b4..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'; @@ -45,44 +44,44 @@ class LockSoundSetLogic extends BaseGetXController { } // 读取支持功能(带参数) - if(reply is ReadSupportFunctionsWithParametersReply) { - _readSupportFunctionsWithParametersReply(reply); - } + // if(reply is ReadSupportFunctionsWithParametersReply) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch(status){ - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - // state.autoLockTime.value = reply.data[7].toString(); - - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - - break; - default: - //失败 - print("${reply.commandType}失败"); - - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch(status){ + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // // state.autoLockTime.value = reply.data[7].toString(); + // + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // + // break; + // } + // } // 设置支持功能解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { @@ -120,30 +119,30 @@ class LockSoundSetLogic extends BaseGetXController { } // 读取支持功能-带参数 - Future _readSupportFunctionsWithParameters() async { - BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { - if (connectionState == DeviceConnectionState.connected) { - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - - var token = await Storage.getStringList(saveBlueToken); - List getTokenList = changeStringListToIntList(token!); - - var publicKey = await Storage.getStringList(saveBluePublicKey); - List getPublicKeyList = changeStringListToIntList(publicKey!); - - IoSenderManage.readSupportFunctionsWithParametersCommand( - keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), - userID: await Storage.getUid(), - featureBit: 33, - token: getTokenList, - needAuthor: 1, - publicKey: getPublicKeyList, - privateKey: getPrivateKeyList - ); - } - }); - } + // Future _readSupportFunctionsWithParameters() async { + // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { + // if (connectionState == DeviceConnectionState.connected) { + // var privateKey = await Storage.getStringList(saveBluePrivateKey); + // List getPrivateKeyList = changeStringListToIntList(privateKey!); + // + // var token = await Storage.getStringList(saveBlueToken); + // List getTokenList = changeStringListToIntList(token!); + // + // var publicKey = await Storage.getStringList(saveBluePublicKey); + // List getPublicKeyList = changeStringListToIntList(publicKey!); + // + // IoSenderManage.readSupportFunctionsWithParametersCommand( + // keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), + // userID: await Storage.getUid(), + // featureBit: 33, + // token: getTokenList, + // needAuthor: 1, + // publicKey: getPublicKeyList, + // privateKey: getPrivateKeyList + // ); + // } + // }); + // } // 设置支持功能(带参数) Future sendLockSound() async { @@ -212,7 +211,7 @@ class LockSoundSetLogic extends BaseGetXController { super.onInit(); print("onInit()"); - _readSupportFunctionsWithParameters(); + // _readSupportFunctionsWithParameters(); } @override @@ -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_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_page.dart similarity index 95% rename from star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_page.dart rename to star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_page.dart index 718fc307..b27e61a8 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_page.dart @@ -70,7 +70,7 @@ class _LockSoundSetPageState extends State with RouteAware { children: [ CommonItem( leftTitel: TranslationLoader - .lanKeys!.pleaseSeletLockVolume!.tr, + .lanKeys!.pleaseSelectLockVolume!.tr, rightTitle: "", isHaveLine: true), CommonItem( @@ -87,7 +87,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 1 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -108,7 +108,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 2 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 2 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -129,7 +129,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 3 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 3 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -150,7 +150,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 4 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 4 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -171,7 +171,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 5 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 5 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), 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/lockTime/getServerDatetime_entity.dart b/star_lock/lib/main/lockDetail/lockSet/lockTime/getServerDatetime_entity.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockTime/getServerDatetime_entity.dart rename to star_lock/lib/main/lockDetail/lockSet/lockTime/getServerDatetime_entity.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockTime/lockTime_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockTime/lockTime_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockTime/lockTime_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockTime/lockTime_page.dart rename to star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockTime/lockTime_state.dart b/star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockTime/lockTime_state.dart rename to star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_logic.dart similarity index 73% rename from star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_logic.dart index f670945a..c3eb30db 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lcokSet/lockUser/lockUser_state.dart'; +import 'package:star_lock/main/lockDetail/lockSet/lockUser/lockUser_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class LockUserLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_page.dart similarity index 96% rename from star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_page.dart rename to star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_page.dart index d41f1087..ab4af23a 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_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/lockDetail/lcokSet/lockUser/lockUser_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/lockUser/lockUser_logic.dart'; import '../../../../app_settings/app_colors.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; @@ -156,8 +156,8 @@ class _LockUserPageState extends State { ), Obx(() => Image.asset( state.isCheck.value == true - ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + ? 'images/icon_round_select.png' + : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, )), diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_state.dart b/star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_state.dart rename to star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_logic.dart b/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_page.dart b/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_page.dart similarity index 96% rename from star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_page.dart rename to star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_page.dart index 10224bf2..f34d4cce 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_page.dart @@ -44,7 +44,7 @@ class _MarkedHouseStatePageState extends State { child: Row( children: [ Image.asset( - state.roomStatus.value == 0 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.roomStatus.value == 0 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -65,7 +65,7 @@ class _MarkedHouseStatePageState extends State { child: Row( children: [ Image.asset( - state.roomStatus.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.roomStatus.value == 1 ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), 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 84% 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 acb35164..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'; @@ -42,39 +41,39 @@ class MotorPowerLogic extends BaseGetXController { } // 读取支持功能(带参数) - if(reply is ReadSupportFunctionsNoParametersReply) { - _readSupportFunctionsWithParametersReply(reply); - } + // if(reply is ReadSupportFunctionsNoParametersReply) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch(status){ - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - state.motorTorsion.value = reply.data[6]; - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - break; - default: - //失败 - print("${reply.commandType}失败"); - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch(status){ + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // state.motorTorsion.value = reply.data[6]; + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // break; + // } + // } // 设置自动落锁数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { diff --git a/star_lock/lib/main/lockDetail/lcokSet/motorPower/motorPower_page.dart b/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/motorPower/motorPower_page.dart rename to star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/motorPower/motorPower_state.dart b/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/motorPower/motorPower_state.dart rename to star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_logic.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_state.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_state.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprint/coerceFingerprint_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_logic.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart similarity index 96% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart index 1e7ad2e2..feda7712 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_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/lockDetail/lcokSet/lockUser/lockUser_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/lockUser/lockUser_logic.dart'; import '../../../../../../app_settings/app_colors.dart'; import '../../../../../../tools/submitBtn.dart'; @@ -158,8 +158,8 @@ class _CoerceFingerprintListPageState extends State { ), Obx(() => Image.asset( state.isCheck.value == true - ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + ? 'images/icon_round_select.png' + : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, )), diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_state.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_state.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_logic.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_state.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_state.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceOpenDoor/coerceOpenDoor_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/lowBatteryReminder/lowBatteryReminder_logic.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/lowBatteryReminder/lowBatteryReminder_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/lowBatteryReminder/lowBatteryReminder_state.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/lowBatteryReminder/lowBatteryReminder_state.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/lowBatteryReminder/lowBatteryReminder_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/msgNotification/msgNotification_logic.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/msgNotification/msgNotification_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/msgNotification/msgNotification_page.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_page.dart similarity index 99% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/msgNotification/msgNotification_page.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_page.dart index 85fafd44..d7e02d58 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/msgNotification/msgNotification_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/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/lcokSet/msgNotification/msgNotification/msgNotification_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_logic.dart'; import '../../../../../app_settings/app_colors.dart'; import '../../../../../tools/commonItem.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/msgNotification/msgNotification_state.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/msgNotification/msgNotification_state.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/msgNotification/msgNotification_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/nDaysUnopened/nDaysUnopened_logic.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/nDaysUnopened/nDaysUnopened_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/nDaysUnopened/nDaysUnopened_page.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/nDaysUnopened/nDaysUnopened_page.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/nDaysUnopened/nDaysUnopened_state.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/nDaysUnopened/nDaysUnopened_state.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/nDaysUnopened/nDaysUnopened_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/openDoorNotify/openDoorNotify_logic.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/openDoorNotify/openDoorNotify_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_logic.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/openDoorNotify/openDoorNotify_page.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/openDoorNotify/openDoorNotify_page.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/openDoorNotify/openDoorNotify_state.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/msgNotification/openDoorNotify/openDoorNotify_state.dart rename to star_lock/lib/main/lockDetail/lockSet/msgNotification/openDoorNotify/openDoorNotify_state.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 75% 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 75ab6c3f..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'; @@ -65,44 +64,44 @@ class NormallyOpenModeLogic extends BaseGetXController{ } // 读取支持功能(带参数) - if(reply is ReadSupportFunctionsWithParametersReply) { - _readSupportFunctionsWithParametersReply(reply); - } + // if(reply is ReadSupportFunctionsWithParametersReply) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch(status){ - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - state.isOpenNormallyOpenMode.value = reply.data[4] == 0 ? false : true; - - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - - break; - default: - //失败 - print("${reply.commandType}失败"); - - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch(status){ + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // state.isOpenNormallyOpenMode.value = reply.data[4] == 0 ? false : true; + // + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // + // break; + // } + // } // 设置自动落锁数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { @@ -140,30 +139,30 @@ class NormallyOpenModeLogic extends BaseGetXController{ } // 读取支持功能-带参数 - Future _readSupportFunctionsWithParameters() async { - BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { - if (connectionState == DeviceConnectionState.connected) { - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - - var token = await Storage.getStringList(saveBlueToken); - List getTokenList = changeStringListToIntList(token!); - - var publicKey = await Storage.getStringList(saveBluePublicKey); - List getPublicKeyList = changeStringListToIntList(publicKey!); - - IoSenderManage.readSupportFunctionsWithParametersCommand( - keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), - userID: await Storage.getUid(), - featureBit: 50, - token: getTokenList, - needAuthor: 1, - publicKey: getPublicKeyList, - privateKey: getPrivateKeyList - ); - } - }); - } + // Future _readSupportFunctionsWithParameters() async { + // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { + // if (connectionState == DeviceConnectionState.connected) { + // var privateKey = await Storage.getStringList(saveBluePrivateKey); + // List getPrivateKeyList = changeStringListToIntList(privateKey!); + // + // var token = await Storage.getStringList(saveBlueToken); + // List getTokenList = changeStringListToIntList(token!); + // + // var publicKey = await Storage.getStringList(saveBluePublicKey); + // List getPublicKeyList = changeStringListToIntList(publicKey!); + // + // IoSenderManage.readSupportFunctionsWithParametersCommand( + // keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), + // userID: await Storage.getUid(), + // featureBit: 50, + // token: getTokenList, + // needAuthor: 1, + // publicKey: getPublicKeyList, + // privateKey: getPrivateKeyList + // ); + // } + // }); + // } // 设置支持功能(带参数) Future sendAutoLock() async { @@ -256,7 +255,7 @@ class NormallyOpenModeLogic extends BaseGetXController{ super.onInit(); print("onInit()"); - _readSupportFunctionsWithParameters(); + // _readSupportFunctionsWithParameters(); } @override @@ -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/normallyOpenMode/normallyOpenMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart similarity index 99% rename from star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_page.dart rename to star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart index 9fd3bed0..6c938d82 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart @@ -253,8 +253,8 @@ class _NormallyOpenModePageState extends State with RouteA ), Image.asset( state.isAllDay.value == 1 - ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + ? 'images/icon_round_select.png' + : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_state.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_state.dart rename to star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/notificationMode/notificationMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_logic.dart similarity index 76% rename from star_lock/lib/main/lockDetail/lcokSet/notificationMode/notificationMode_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_logic.dart index c793f3d8..9f218ab5 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/notificationMode/notificationMode_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_logic.dart @@ -1,4 +1,4 @@ -import 'package:star_lock/main/lockDetail/lcokSet/notificationMode/notificationMode_state.dart'; +import 'package:star_lock/main/lockDetail/lockSet/notificationMode/notificationMode_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; class NotificationModeLogic extends BaseGetXController { diff --git a/star_lock/lib/main/lockDetail/lcokSet/notificationMode/notificationMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/notificationMode/notificationMode_page.dart rename to star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart index d3f1eba8..4275c33c 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/notificationMode/notificationMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/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/lcokSet/notificationMode/notificationMode_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/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'; @@ -262,7 +262,7 @@ class _NotificationModePageState extends State { ), ), onTap: () async { - var result = await Get.toNamed(Routers.seletCountryRegionPage); + var result = await Get.toNamed(Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; diff --git a/star_lock/lib/main/lockDetail/lcokSet/notificationMode/notificationMode_state.dart b/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/notificationMode/notificationMode_state.dart rename to star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_state.dart 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 67% 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 fac236c9..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'; @@ -44,39 +43,39 @@ class OpenDoorDirectionLogic extends BaseGetXController { } // 读取支持功能(带参数) - if(reply is ReadSupportFunctionsNoParametersReply) { - _readSupportFunctionsWithParametersReply(reply); - } + // if(reply is ReadSupportFunctionsNoParametersReply) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch(status){ - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - state.openDirectionValue.value = reply.data[6]; - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - break; - default: - //失败 - print("${reply.commandType}失败"); - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch(status){ + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // state.openDirectionValue.value = reply.data[6]; + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // break; + // } + // } // 设置自动落锁数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { @@ -111,30 +110,30 @@ class OpenDoorDirectionLogic extends BaseGetXController { } // 读取支持功能-带参数 - Future _readSupportFunctionsNoParameters() async { - BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { - if (connectionState == DeviceConnectionState.connected) { - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - - var token = await Storage.getStringList(saveBlueToken); - List getTokenList = changeStringListToIntList(token!); - - var publicKey = await Storage.getStringList(saveBluePublicKey); - List getPublicKeyList = changeStringListToIntList(publicKey!); - - IoSenderManage.readSupportFunctionsNoParametersCommand( - keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), - userID: await Storage.getUid(), - featureBit: 41, - token: getTokenList, - needAuthor: 1, - publicKey: getPublicKeyList, - privateKey: getPrivateKeyList - ); - } - }); - } + // Future _readSupportFunctionsNoParameters() async { + // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { + // if (connectionState == DeviceConnectionState.connected) { + // var privateKey = await Storage.getStringList(saveBluePrivateKey); + // List getPrivateKeyList = changeStringListToIntList(privateKey!); + // + // var token = await Storage.getStringList(saveBlueToken); + // List getTokenList = changeStringListToIntList(token!); + // + // var publicKey = await Storage.getStringList(saveBluePublicKey); + // List getPublicKeyList = changeStringListToIntList(publicKey!); + // + // IoSenderManage.readSupportFunctionsNoParametersCommand( + // keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), + // userID: await Storage.getUid(), + // featureBit: 41, + // token: getTokenList, + // needAuthor: 1, + // publicKey: getPublicKeyList, + // privateKey: getPrivateKeyList + // ); + // } + // }); + // } // 设置支持功能(带参数) Future sendOpenDoorDirection() async { @@ -182,7 +181,7 @@ class OpenDoorDirectionLogic extends BaseGetXController { super.onInit(); print("onInit()"); - _readSupportFunctionsNoParameters(); + // _readSupportFunctionsNoParameters(); } @override @@ -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/openDoorDirection/openDoorDirection_page.dart b/star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/openDoorDirection/openDoorDirection_page.dart rename to star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/openDoorDirection/openDoorDirection_state.dart b/star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/openDoorDirection/openDoorDirection_state.dart rename to star_lock/lib/main/lockDetail/lockSet/openDoorDirection/openDoorDirection_state.dart 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 69% 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 1f26a280..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'; @@ -43,39 +42,39 @@ class RemoteUnlockingLogic extends BaseGetXController{ } // 读取支持功能(带参数) - if(reply is ReadSupportFunctionsNoParametersReply) { - _readSupportFunctionsWithParametersReply(reply); - } + // if(reply is ReadSupportFunctionsNoParametersReply) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch(status){ - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - state.remoteEnable.value = reply.data[6]; - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - break; - default: - //失败 - print("${reply.commandType}失败"); - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch(status){ + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // state.remoteEnable.value = reply.data[6]; + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // break; + // } + // } // 设置自动落锁数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { @@ -113,30 +112,30 @@ class RemoteUnlockingLogic extends BaseGetXController{ } // 读取支持功能-带参数 - Future _readSupportFunctionsNoParameters() async { - BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { - if (connectionState == DeviceConnectionState.connected) { - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - - var token = await Storage.getStringList(saveBlueToken); - List getTokenList = changeStringListToIntList(token!); - - var publicKey = await Storage.getStringList(saveBluePublicKey); - List getPublicKeyList = changeStringListToIntList(publicKey!); - - IoSenderManage.readSupportFunctionsNoParametersCommand( - keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), - userID: await Storage.getUid(), - featureBit: 28, - token: getTokenList, - needAuthor: 1, - publicKey: getPublicKeyList, - privateKey: getPrivateKeyList - ); - } - }); - } + // Future _readSupportFunctionsNoParameters() async { + // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { + // if (connectionState == DeviceConnectionState.connected) { + // var privateKey = await Storage.getStringList(saveBluePrivateKey); + // List getPrivateKeyList = changeStringListToIntList(privateKey!); + // + // var token = await Storage.getStringList(saveBlueToken); + // List getTokenList = changeStringListToIntList(token!); + // + // var publicKey = await Storage.getStringList(saveBluePublicKey); + // List getPublicKeyList = changeStringListToIntList(publicKey!); + // + // IoSenderManage.readSupportFunctionsNoParametersCommand( + // keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), + // userID: await Storage.getUid(), + // featureBit: 28, + // token: getTokenList, + // needAuthor: 1, + // publicKey: getPublicKeyList, + // privateKey: getPrivateKeyList + // ); + // } + // }); + // } // 设置支持功能(带参数) 远程开锁 Future sendBurglarAlarm() async { @@ -196,7 +195,7 @@ class RemoteUnlockingLogic extends BaseGetXController{ super.onInit(); print("onInit()"); - _readSupportFunctionsNoParameters(); + // _readSupportFunctionsNoParameters(); } @override @@ -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/remoteUnlocking/remoteUnlocking_page.dart b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart similarity index 98% rename from star_lock/lib/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_page.dart rename to star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart index 934aca06..8c35816d 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart @@ -2,7 +2,7 @@ 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/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_logic.dart'; +import 'package:star_lock/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_logic.dart'; import '../../../../app_settings/app_colors.dart'; import '../../../../blue/blue_manage.dart'; diff --git a/star_lock/lib/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_state.dart b/star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/remoteUnlocking/remoteUnlocking_state.dart rename to star_lock/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_logic.dart b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_logic.dart similarity index 68% rename from star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_logic.dart rename to star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_logic.dart index f9fe02aa..fe76ca7a 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_logic.dart @@ -2,11 +2,10 @@ import 'dart:async'; import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/resetButton/resetButton_state.dart'; +import 'package:star_lock/main/lockDetail/lockSet/resetButton/resetButton_state.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'; @@ -44,39 +43,39 @@ class ResetButtonLogic extends BaseGetXController{ } // 读取支持功能(带参数) - if(reply is ReadSupportFunctionsNoParametersReply) { - _readSupportFunctionsWithParametersReply(reply); - } + // if(reply is ReadSupportFunctionsNoParametersReply) { + // _readSupportFunctionsWithParametersReply(reply); + // } }); } // 读取支持功能带参数数据解析 - Future _readSupportFunctionsWithParametersReply(Reply reply) async { - int status = reply.data[2]; - switch(status){ - case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); - state.resetButtonEnable.value = reply.data[6]; - break; - case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - break; - case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - break; - case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - break; - default: - //失败 - print("${reply.commandType}失败"); - break; - } - } + // Future _readSupportFunctionsWithParametersReply(Reply reply) async { + // int status = reply.data[2]; + // switch(status){ + // case 0x00: + // //成功 + // print("${reply.commandType}数据解析成功"); + // state.resetButtonEnable.value = reply.data[6]; + // break; + // case 0x06: + // //无权限 + // print("${reply.commandType}需要鉴权"); + // break; + // case 0x07: + // //无权限 + // print("${reply.commandType}用户无权限"); + // break; + // case 0x09: + // // 权限校验错误 + // print("${reply.commandType}权限校验错误"); + // break; + // default: + // //失败 + // print("${reply.commandType}失败"); + // break; + // } + // } // 设置自动落锁数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { @@ -114,30 +113,30 @@ class ResetButtonLogic extends BaseGetXController{ } // 读取支持功能-带参数 - Future _readSupportFunctionsNoParameters() async { - BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { - if (connectionState == DeviceConnectionState.connected) { - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - - var token = await Storage.getStringList(saveBlueToken); - List getTokenList = changeStringListToIntList(token!); - - var publicKey = await Storage.getStringList(saveBluePublicKey); - List getPublicKeyList = changeStringListToIntList(publicKey!); - - IoSenderManage.readSupportFunctionsNoParametersCommand( - keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), - userID: await Storage.getUid(), - featureBit: 31, - token: getTokenList, - needAuthor: 1, - publicKey: getPublicKeyList, - privateKey: getPrivateKeyList - ); - } - }); - } + // Future _readSupportFunctionsNoParameters() async { + // BlueManage().bludSendData(BlueManage().connectDeviceName, (DeviceConnectionState connectionState) async { + // if (connectionState == DeviceConnectionState.connected) { + // var privateKey = await Storage.getStringList(saveBluePrivateKey); + // List getPrivateKeyList = changeStringListToIntList(privateKey!); + // + // var token = await Storage.getStringList(saveBlueToken); + // List getTokenList = changeStringListToIntList(token!); + // + // var publicKey = await Storage.getStringList(saveBluePublicKey); + // List getPublicKeyList = changeStringListToIntList(publicKey!); + // + // IoSenderManage.readSupportFunctionsNoParametersCommand( + // keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), + // userID: await Storage.getUid(), + // featureBit: 31, + // token: getTokenList, + // needAuthor: 1, + // publicKey: getPublicKeyList, + // privateKey: getPrivateKeyList + // ); + // } + // }); + // } // 设置支持功能(带参数) Future sendBurglarAlarm() async { @@ -197,7 +196,7 @@ class ResetButtonLogic extends BaseGetXController{ super.onInit(); print("onInit()"); - _readSupportFunctionsNoParameters(); + // _readSupportFunctionsNoParameters(); } @override @@ -206,4 +205,4 @@ class ResetButtonLogic extends BaseGetXController{ super.onClose(); _replySubscription.cancel(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_page.dart b/star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_page.dart rename to star_lock/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart 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 +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/unlockQRCode/unlockQRCode_page.dart b/star_lock/lib/main/lockDetail/lockSet/unlockQRCode/unlockQRCode_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/unlockQRCode/unlockQRCode_page.dart rename to star_lock/lib/main/lockDetail/lockSet/unlockQRCode/unlockQRCode_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/uploadData/uploadData_page.dart b/star_lock/lib/main/lockDetail/lockSet/uploadData/uploadData_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/uploadData/uploadData_page.dart rename to star_lock/lib/main/lockDetail/lockSet/uploadData/uploadData_page.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart similarity index 97% rename from star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart rename to star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart index 1a702446..11c5a8fe 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart @@ -72,7 +72,7 @@ class _AddWirelessKeyboardPageState extends State { btnName: TranslationLoader.lanKeys!.next!.tr, onClick: () { Navigator.pushNamed( - context, Routers.seletWirelessKeyboardPage); + context, Routers.selectWirelessKeyboardPage); }), ), SizedBox( diff --git a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart similarity index 97% rename from star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart rename to star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart index 5efce422..22b46edc 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart @@ -85,7 +85,7 @@ class _AddWirelessKeyboardScreenNotLightOnPageState btnName: TranslationLoader.lanKeys!.next!.tr, onClick: () { Navigator.pushNamed( - context, Routers.seletWirelessKeyboardPage); + context, Routers.selectWirelessKeyboardPage); }), ), ], diff --git a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/selectWirelessKeyboard/selectWirelessKeyboard_page.dart similarity index 85% rename from star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart rename to star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/selectWirelessKeyboard/selectWirelessKeyboard_page.dart index e283a5c4..5a6833be 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/selectWirelessKeyboard/selectWirelessKeyboard_page.dart @@ -7,15 +7,15 @@ import '../../../../../app_settings/app_colors.dart'; import '../../../../../tools/titleAppBar.dart'; import '../../../../../translations/trans_lib.dart'; -class SeletWirelessKeyboardPage extends StatefulWidget { - const SeletWirelessKeyboardPage({Key? key}) : super(key: key); +class SelectWirelessKeyboardPage extends StatefulWidget { + const SelectWirelessKeyboardPage({Key? key}) : super(key: key); @override - State createState() => - _SeletWirelessKeyboardPageState(); + State createState() => + _SelectWirelessKeyboardPageState(); } -class _SeletWirelessKeyboardPageState extends State { +class _SelectWirelessKeyboardPageState extends State { List dataList = []; @override Widget build(BuildContext context) { @@ -23,7 +23,7 @@ class _SeletWirelessKeyboardPageState extends State { backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( barTitle: - "${TranslationLoader.lanKeys!.selet!.tr}${TranslationLoader.lanKeys!.wirelessKeyboard!.tr}", + "${TranslationLoader.lanKeys!.select!.tr}${TranslationLoader.lanKeys!.wirelessKeyboard!.tr}", haveBack: true, backgroundColor: AppColors.mainColor), body: dataList.isEmpty diff --git a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart rename to star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart diff --git a/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart b/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart index 55d086a2..3992c601 100644 --- a/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart +++ b/star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart @@ -5,7 +5,7 @@ import 'package:get/get.dart'; import 'package:star_lock/talk/call/callTalk.dart'; import '../../../../app_settings/app_colors.dart'; -import '../../../../login/seletCountryRegion/common/index.dart'; +import '../../../../login/selectCountryRegion/common/index.dart'; import '../../../../tools/showTFView.dart'; import 'lockMonitoring_logic.dart'; diff --git a/star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControlManage/addRemoteControlManage_tabbar.dart b/star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControlManage/addRemoteControlManage_tabbar.dart index c0efdb5d..537ced04 100644 --- a/star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControlManage/addRemoteControlManage_tabbar.dart +++ b/star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControlManage/addRemoteControlManage_tabbar.dart @@ -22,9 +22,9 @@ class _AddRemoteControlManageTabbarState extends State _itemTabs = [ - ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, seletType: "0"), - ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, seletType: "1"), - ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, seletType: "2"), + ItemView(title: TranslationLoader.lanKeys!.permanent!.tr, selectType: "0"), + ItemView(title: TranslationLoader.lanKeys!.timeLimit!.tr, selectType: "1"), + ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, selectType: "2"), ]; @override @@ -84,7 +84,7 @@ class _AddRemoteControlManageTabbarState extends State AddRemoteControlPage(seletType: item.seletType,)) + .map((ItemView item) => AddRemoteControlPage(selectType: item.selectType,)) .toList(), ), ); @@ -92,9 +92,9 @@ class _AddRemoteControlManageTabbarState extends State { } Widget indexChangeWidget() { - switch (int.parse(widget.seletType)) { + switch (int.parse(widget.selectType)) { case 0: { // 永久 @@ -178,7 +178,7 @@ class _AddRemoteControlPageState extends State { onClick: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - // print("state.seletType:${state.seletType.value}"); + // print("state.selectType:${state.selectType.value}"); if (state.nameController.text.isEmpty) { logic.showToast("请输入姓名"); return; @@ -186,7 +186,7 @@ class _AddRemoteControlPageState extends State { logic.showToast("请确保在设备附近"); // logic.addFingerprintsData(); } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }), diff --git a/star_lock/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart b/star_lock/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart index 87bba6aa..07a89927 100644 --- a/star_lock/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart +++ b/star_lock/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart @@ -45,7 +45,7 @@ class _RemoteControlListPageState extends State { if (isDemoMode == false) { showDeletAlertDialog(context); } else { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, diff --git a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart index 3fb69069..3889695f 100644 --- a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart +++ b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart @@ -23,7 +23,7 @@ class _EditVideoLogPageState extends State { return Scaffold( backgroundColor: Colors.white, appBar: TitleAppBar( - barTitle: "已选${state.seletVideoLog.value}项", + barTitle: "已选${state.selectVideoLog.value}项", haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ @@ -33,7 +33,7 @@ class _EditVideoLogPageState extends State { style: TextStyle(color: Colors.white, fontSize: 24.sp), ), onPressed: () async { - state.isSeletAll.value = !state.isSeletAll.value; + state.isSelectAll.value = !state.isSelectAll.value; }, ), ], @@ -115,7 +115,7 @@ class _EditVideoLogPageState extends State { onTap: (){ }, - child: Image(width: 40.w, height: 40.w, image: state.isSeletAll.value ? const AssetImage("images/icon_round_selet.png") : const AssetImage("images/icon_round_unSelet.png")) + child: Image(width: 40.w, height: 40.w, image: state.isSelectAll.value ? const AssetImage("images/icon_round_select.png") : const AssetImage("images/icon_round_unSelect.png")) ) ), ) diff --git a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart index a5f8f4f5..900badec 100644 --- a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart +++ b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; class EditVideoLogState{ - var seletVideoLog = 0.obs; - var isSeletAll = false.obs; + var selectVideoLog = 0.obs; + var isSelectAll = false.obs; -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart index 21d0d8e1..dc8618c1 100644 --- a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart +++ b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart @@ -375,7 +375,7 @@ class _DemoModeLockDetailPageState extends State { } void gotoLogin() { - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } diff --git a/star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart b/star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart index 5d877735..befc6a56 100644 --- a/star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart +++ b/star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart @@ -344,7 +344,7 @@ class _DemoModeLockSetPageState extends State { } void gotoAddLock(){ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); EasyLoading.showToast("演示模式",duration: 2000.milliseconds); } diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart index 97401bd5..f6dcdc47 100644 --- a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart @@ -146,7 +146,7 @@ class _StarLockMainPageState extends State with BaseWidget { onTap: () { //实现回调函数 Navigator.pushNamed( - context, Routers.seletLockTypePage, + context, Routers.selectLockTypePage, // arguments: { // "url": ConstConfig.privacAgreementUrl, // "title": '隐私政策' diff --git a/star_lock/lib/mine/about/about_page.dart b/star_lock/lib/mine/about/about_page.dart index 14e8e25b..5f1777b9 100644 --- a/star_lock/lib/mine/about/about_page.dart +++ b/star_lock/lib/mine/about/about_page.dart @@ -8,15 +8,16 @@ import '../../app_settings/app_colors.dart'; import '../../tools/commonItem.dart'; import '../../tools/titleAppBar.dart'; import '../../translations/trans_lib.dart'; +import '../../network/api.dart'; -class AbountPage extends StatefulWidget { - const AbountPage({Key? key}) : super(key: key); +class AboutPage extends StatefulWidget { + const AboutPage({Key? key}) : super(key: key); @override - State createState() => _AbountPageState(); + State createState() => _AboutPageState(); } -class _AbountPageState extends State { +class _AboutPageState extends State { @override Widget build(BuildContext context) { return Scaffold( @@ -40,6 +41,11 @@ class _AbountPageState extends State { "星锁 1.0.0.07(preRelease-20240118-1)", style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), ), + SizedBox(height: 20.h), + Text( + Api.baseAddress, + style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), + ), SizedBox( height: 60.h, ), diff --git a/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_logic.dart b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_logic.dart new file mode 100644 index 00000000..ffc9f8b6 --- /dev/null +++ b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_logic.dart @@ -0,0 +1,8 @@ + +import '../../../tools/baseGetXController.dart'; +import 'addLockSelectCountry_state.dart'; + +class AddLockSelectCountryLogic extends BaseGetXController { + AddLockSelectCountryState state = AddLockSelectCountryState(); + +} diff --git a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart similarity index 88% rename from star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart rename to star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart index 9fabbe5f..b7112ab4 100644 --- a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart +++ b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart @@ -8,26 +8,26 @@ import 'package:star_lock/tools/baseGetXController.dart'; import '../../../appRouters.dart'; import '../../../app_settings/app_colors.dart'; -import '../../../login/seletCountryRegion/common/countryRegionEntity.dart'; +import '../../../login/selectCountryRegion/common/countryRegionEntity.dart'; import '../../../network/api_repository.dart'; import '../../../tools/commonItem.dart'; import '../../../tools/titleAppBar.dart'; import '../../../translations/trans_lib.dart'; -import 'addLockSeletCountry_logic.dart'; +import 'addLockSelectCountry_logic.dart'; -class AddLockSeletCountryPage extends StatefulWidget { - const AddLockSeletCountryPage({Key? key}) : super(key: key); +class AddLockSelectCountryPage extends StatefulWidget { + const AddLockSelectCountryPage({Key? key}) : super(key: key); @override - State createState() => _AddLockSeletCountryPageState(); + State createState() => _AddLockSelectCountryPageState(); } -class _AddLockSeletCountryPageState extends State { - final logic = Get.put(AddLockSeletCountryLogic()); - final state = Get.find().state; +class _AddLockSelectCountryPageState extends State { + final logic = Get.put(AddLockSelectCountryLogic()); + final state = Get.find().state; List countriesList = []; - int seletindex = 10000; + int selectindex = 10000; @override void initState() { @@ -99,12 +99,12 @@ class _AddLockSeletCountryPageState extends State { isHaveRightWidget: true, action: (){ setState(() { - seletindex = index; + selectindex = index; }); }, rightWidget: Row( children: [ - Image.asset((seletindex == index) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,), + Image.asset((selectindex == index) ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,), ], ) ); @@ -139,11 +139,11 @@ class _AddLockSeletCountryPageState extends State { style: TextStyle(color: Colors.black, fontSize: 24.sp), ), onPressed: () { - if(seletindex == 10000){ + if(selectindex == 10000){ logic.showToast("请选择国家"); return; } - CountryRegionModel model = countriesList[seletindex]; + CountryRegionModel model = countriesList[selectindex]; Get.toNamed(Routers.saveLockPage, arguments: { "addressInfo": {"country":model.name}, "pwdTimestamp": state.pwdTimestamp.value, diff --git a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_state.dart b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_state.dart similarity index 87% rename from star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_state.dart rename to star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_state.dart index e04acc2d..92f0bd30 100644 --- a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_state.dart +++ b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_state.dart @@ -1,14 +1,14 @@ import 'package:get/get.dart'; -class AddLockSeletCountryState{ +class AddLockSelectCountryState{ var pwdTimestamp= 0.obs; var lockInfo = {}; var featureValue = ''; var featureSettingValue = ''; var featureSettingParams = []; - AddLockSeletCountryState() { + AddLockSelectCountryState() { Map map = Get.arguments; pwdTimestamp.value = map["pwdTimestamp"]; lockInfo = map["lockInfo"]; diff --git a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_logic.dart b/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_logic.dart deleted file mode 100644 index 1a85f750..00000000 --- a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_logic.dart +++ /dev/null @@ -1,8 +0,0 @@ - -import '../../../tools/baseGetXController.dart'; -import 'addLockSeletCountry_state.dart'; - -class AddLockSeletCountryLogic extends BaseGetXController { - AddLockSeletCountryState state = AddLockSeletCountryState(); - -} \ No newline at end of file diff --git a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart index f63ec119..b385a5b0 100644 --- a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart +++ b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart @@ -245,7 +245,7 @@ class _LockAddressGaoDePageState extends State with RouteA style: TextStyle(color: Colors.black, fontSize: 24.sp), ), onPressed: () { - Get.toNamed(Routers.addLockSeletCountryPage, arguments: { + Get.toNamed(Routers.addLockSelectCountryPage, arguments: { "addressInfo": {}, "pwdTimestamp": state.pwdTimestamp.value, "lockInfo": state.lockInfo, diff --git a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart index 57da7bcf..c9469477 100644 --- a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart +++ b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart @@ -55,7 +55,7 @@ class _NearbyLockPageState extends State with RouteAware { return nearbyLockItem('images/icon_lockGroup_item.png', state.devices[index], () { // Navigator.pushNamed(context, Routers.lockAddressPage); // logic.getPublicKey(state.devices[index].serviceUuids[0].toString()); - state.seletLockName.value = state.devices[index].name; + state.selectLockName.value = state.devices[index].name; // print("connect-lockId:${state.devices[index].id} deviceName:${state.devices[index].name}"); logic.connect(state.devices[index].name); // Get.toNamed(Routers.lockAddressGaoDePage); diff --git a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_state.dart b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_state.dart index b40cbab0..5331c5c2 100644 --- a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_state.dart +++ b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_state.dart @@ -8,7 +8,7 @@ class NearbyLockState { RxList devices = [].obs; var ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示 - var seletLockName = "".obs; + var selectLockName = "".obs; var timestampValue = 0; var lockInfo = {}; @@ -16,4 +16,4 @@ class NearbyLockState { var featureSettingValue = ''; var featureSettingParams = []; -} \ No newline at end of file +} diff --git a/star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart b/star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart index 593ad4c1..296fc809 100644 --- a/star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart +++ b/star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart @@ -399,6 +399,7 @@ class SaveLockLogic extends BaseGetXController { ); if (entity.errorCode!.codeIsSuccessful) { state.lockId = entity.data!.lockId!; + eventBus.fire(RefreshLockListInfoDataEvent()); senderCustomPasswords(); // BlueManage().disconnect(BlueManage().connectDeviceMacAddress); @@ -459,7 +460,6 @@ class SaveLockLogic extends BaseGetXController { void backAction(){ BlueManage().disconnect(BlueManage().connectDeviceMacAddress); - eventBus.fire(RefreshLockListInfoDataEvent()); Get.close(state.isFromMap == 1 ? 6 : 7); } diff --git a/star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart b/star_lock/lib/mine/addLock/selectLockType/selectLockType_page.dart similarity index 96% rename from star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart rename to star_lock/lib/mine/addLock/selectLockType/selectLockType_page.dart index 5375ae7a..1c7f2bf9 100644 --- a/star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart +++ b/star_lock/lib/mine/addLock/selectLockType/selectLockType_page.dart @@ -11,14 +11,14 @@ import '../../../baseWidget.dart'; import '../../../tools/titleAppBar.dart'; import '../../../translations/trans_lib.dart'; -class SeletLockTypePage extends StatefulWidget { - const SeletLockTypePage({Key? key}) : super(key: key); +class SelectLockTypePage extends StatefulWidget { + const SelectLockTypePage({Key? key}) : super(key: key); @override - State createState() => _SeletLockTypePageState(); + State createState() => _SelectLockTypePageState(); } -class _SeletLockTypePageState extends State with BaseWidget { +class _SelectLockTypePageState extends State with BaseWidget { @override Widget build(BuildContext context) { return Scaffold( diff --git a/star_lock/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart b/star_lock/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart index c0ae5903..d1794ef5 100644 --- a/star_lock/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart @@ -153,7 +153,7 @@ class _GatewayConfigurationWifiPageState left: 30.w, right: 30.w, top: 20.w, bottom: 20.w), padding: EdgeInsets.only(top: 15.w, bottom: 15.w), onClick: () { - // Navigator.pushNamed(context, Routers.seletGatewayPage); + // Navigator.pushNamed(context, Routers.selectGatewayPage); }), ), SizedBox( diff --git a/star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart b/star_lock/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_page.dart similarity index 89% rename from star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart rename to star_lock/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_page.dart index b027e313..d812ce6d 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_page.dart @@ -7,14 +7,14 @@ import '../../../../app_settings/app_colors.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; -class SeletGatewayListPage extends StatefulWidget { - const SeletGatewayListPage({Key? key}) : super(key: key); +class SelectGatewayListPage extends StatefulWidget { + const SelectGatewayListPage({Key? key}) : super(key: key); @override - State createState() => _SeletGatewayListPageState(); + State createState() => _SelectGatewayListPageState(); } -class _SeletGatewayListPageState extends State { +class _SelectGatewayListPageState extends State { @override Widget build(BuildContext context) { return Scaffold( @@ -26,7 +26,7 @@ class _SeletGatewayListPageState extends State { body: ListView.builder( itemCount: 10, itemBuilder: (c, index) { - return _seletGatewayListListItem( + return _selectGatewayListListItem( 'images/mine/icon_mine_gatewayListMainIcon.png', "G2 41c21c", "-34", () { @@ -37,7 +37,7 @@ class _SeletGatewayListPageState extends State { ); } - Widget _seletGatewayListListItem(String lockTypeIcon, String gateWayName, + Widget _selectGatewayListListItem(String lockTypeIcon, String gateWayName, String networkSignal, Function() action) { return GestureDetector( onTap: action, diff --git a/star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart b/star_lock/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart similarity index 69% rename from star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart rename to star_lock/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart index a2001929..c8b9a5dc 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart @@ -7,14 +7,14 @@ import '../../../../app_settings/app_colors.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; -class SeletGatewayTypePage extends StatefulWidget { - const SeletGatewayTypePage({Key? key}) : super(key: key); +class SelectGatewayTypePage extends StatefulWidget { + const SelectGatewayTypePage({Key? key}) : super(key: key); @override - State createState() => _SeletGatewayTypePageState(); + State createState() => _SelectGatewayTypePageState(); } -class _SeletGatewayTypePageState extends State { +class _SelectGatewayTypePageState extends State { @override Widget build(BuildContext context) { return Scaffold( @@ -25,24 +25,24 @@ class _SeletGatewayTypePageState extends State { backgroundColor: AppColors.mainColor), body: ListView( children: [ - _seletGatewayType( - 'images/mine/icon_mine_seletGatewayType_G2.png', "G2（Wi-Fi）", + _selectGatewayType( + 'images/mine/icon_mine_selectGatewayType_G2.png', "G2（Wi-Fi）", () { - Navigator.pushNamed(context, Routers.seletGatewayTypeNextTipPage); + Navigator.pushNamed(context, Routers.selectGatewayTypeNextTipPage); }), SizedBox( height: 2.h, ), - _seletGatewayType( - 'images/mine/icon_mine_seletGatewayType_G4.png', "G4（4G） ", + _selectGatewayType( + 'images/mine/icon_mine_selectGatewayType_G4.png', "G4（4G） ", () { - Navigator.pushNamed(context, Routers.seletGatewayTypeNextTipPage); + Navigator.pushNamed(context, Routers.selectGatewayTypeNextTipPage); }), ], )); } - Widget _seletGatewayType( + Widget _selectGatewayType( String iconStr, String gatewayType, Function() action) { return GestureDetector( onTap: action, diff --git a/star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart b/star_lock/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart similarity index 78% rename from star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart rename to star_lock/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart index 7a414682..20571a19 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart @@ -8,16 +8,16 @@ import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; -class SeletGatewayTypeNextTipPage extends StatefulWidget { - const SeletGatewayTypeNextTipPage({Key? key}) : super(key: key); +class SelectGatewayTypeNextTipPage extends StatefulWidget { + const SelectGatewayTypeNextTipPage({Key? key}) : super(key: key); @override - State createState() => - _SeletGatewayTypeNextTipPageState(); + State createState() => + _SelectGatewayTypeNextTipPageState(); } -class _SeletGatewayTypeNextTipPageState - extends State { +class _SelectGatewayTypeNextTipPageState + extends State { @override Widget build(BuildContext context) { return Scaffold( @@ -45,7 +45,7 @@ class _SeletGatewayTypeNextTipPageState TranslationLoader.lanKeys!.indicatorLight!.tr, style: TextStyle(fontSize: 20.sp), )), - Image.asset("images/mine/icon_mine_seletGatewayType_next.png", + Image.asset("images/mine/icon_mine_selectGatewayType_next.png", width: 220.w, height: 220.w), ], ), @@ -54,7 +54,7 @@ class _SeletGatewayTypeNextTipPageState padding: EdgeInsets.all(20.w), child: Center( child: Text( - TranslationLoader.lanKeys!.seletGatewayTypeNextTip!.tr, + TranslationLoader.lanKeys!.selectGatewayTypeNextTip!.tr, textAlign: TextAlign.center, style: TextStyle(fontSize: 18.sp), ))), @@ -64,7 +64,7 @@ class _SeletGatewayTypeNextTipPageState child: SubmitBtn( btnName: TranslationLoader.lanKeys!.next!.tr, onClick: () { - Navigator.pushNamed(context, Routers.seletGatewayPage); + Navigator.pushNamed(context, Routers.selectGatewayPage); }), ), ], diff --git a/star_lock/lib/mine/gateway/gatewayList/gatewayList_page.dart b/star_lock/lib/mine/gateway/gatewayList/gatewayList_page.dart index b34709f0..7721c875 100644 --- a/star_lock/lib/mine/gateway/gatewayList/gatewayList_page.dart +++ b/star_lock/lib/mine/gateway/gatewayList/gatewayList_page.dart @@ -26,7 +26,7 @@ class _GatewayListPageState extends State { actionsList: [ GestureDetector( onTap: () { - Navigator.pushNamed(context, Routers.seletGatewayTypePage); + Navigator.pushNamed(context, Routers.selectGatewayTypePage); }, child: Image.asset( 'images/icon_add_white.png', diff --git a/star_lock/lib/mine/message/messageList_page.dart b/star_lock/lib/mine/message/messageList_page.dart index 98135ee4..547ddbdb 100644 --- a/star_lock/lib/mine/message/messageList_page.dart +++ b/star_lock/lib/mine/message/messageList_page.dart @@ -30,7 +30,7 @@ class _MessageListPageState extends State { : ListView.builder( itemCount: 10, itemBuilder: (c, index) { - return _seletGatewayListListItem( + return _selectGatewayListListItem( 'images/controls_user.png', "您的钥匙已发送成功", "2023.6.21 11.15", () { // Navigator.pushNamed(context, Routers.gatewayConfigurationWifiPage); @@ -39,7 +39,7 @@ class _MessageListPageState extends State { ); } - Widget _seletGatewayListListItem(String lockTypeIcon, String gateWayName, + Widget _selectGatewayListListItem(String lockTypeIcon, String gateWayName, String networkSignal, Function() action) { return GestureDetector( onTap: action, diff --git a/star_lock/lib/mine/mine/safeVerify/safeVerify_state.dart b/star_lock/lib/mine/mine/safeVerify/safeVerify_state.dart index 1c41f3a4..18b5ed67 100644 --- a/star_lock/lib/mine/mine/safeVerify/safeVerify_state.dart +++ b/star_lock/lib/mine/mine/safeVerify/safeVerify_state.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:star_lock/login/login/entity/LoginData.dart'; -import 'package:star_lock/login/seletCountryRegion/common/index.dart'; +import 'package:star_lock/login/selectCountryRegion/common/index.dart'; import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/translations/trans_lib.dart'; diff --git a/star_lock/lib/mine/mine/starLockMine_page.dart b/star_lock/lib/mine/mine/starLockMine_page.dart index 01145873..0cdb41fe 100644 --- a/star_lock/lib/mine/mine/starLockMine_page.dart +++ b/star_lock/lib/mine/mine/starLockMine_page.dart @@ -120,7 +120,7 @@ class _StarLockMinePageState extends State with BaseWidget { mineItem('images/mine/icon_mine_main_addLock.png', TranslationLoader.lanKeys!.addDevice!.tr, () { Get.back(); - Get.toNamed(Routers.seletLockTypePage); + Get.toNamed(Routers.selectLockTypePage); }), // mineItem('images/mine/icon_mine_main_gateway.png', // TranslationLoader.lanKeys!.gateway!.tr, () { @@ -155,7 +155,7 @@ class _StarLockMinePageState extends State with BaseWidget { mineItem('images/mine/icon_mine_main_about.png', TranslationLoader.lanKeys!.about!.tr, () { Get.back(); - Get.toNamed(Routers.abountPage); + Get.toNamed(Routers.aboutPage); }), ], ), diff --git a/star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart b/star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart index 85d7a308..c2f75430 100644 --- a/star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart +++ b/star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:star_lock/login/login/entity/LoginData.dart'; -import 'package:star_lock/login/seletCountryRegion/common/index.dart'; +import 'package:star_lock/login/selectCountryRegion/common/index.dart'; import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/translations/trans_lib.dart'; diff --git a/star_lock/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart b/star_lock/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart index 5dc2103b..93bff920 100644 --- a/star_lock/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart +++ b/star_lock/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart @@ -47,7 +47,7 @@ class _MinePersonInfoEditIphonePageState )), GestureDetector( onTap: () { - Navigator.pushNamed(context, Routers.seletCountryRegionPage); + Navigator.pushNamed(context, Routers.selectCountryRegionPage); }, child: Container( height: 70.h, diff --git a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_logic.dart b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_logic.dart index ec728ff7..2eb818a2 100644 --- a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_logic.dart +++ b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_logic.dart @@ -101,13 +101,13 @@ class AddAuthorizedAdministratorLogic extends BaseGetXController { }, ), CupertinoDialogAction( - child: Text(TranslationLoader.lanKeys!.selet!.tr), + child: Text(TranslationLoader.lanKeys!.select!.tr), onPressed: () async { //选择国家代码 state.isCreateUser.value = true; Navigator.of(context).pop(); - var result = await Get.toNamed(Routers.seletCountryRegionPage); + var result = await Get.toNamed(Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; diff --git a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart index edd5b8fb..3ed8f486 100644 --- a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart +++ b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart @@ -134,7 +134,7 @@ class _AddAuthorizedAdministratorPageState extends State; countryCode = result['code']; diff --git a/star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart b/star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart index b447d482..0430c9e9 100644 --- a/star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart +++ b/star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart @@ -85,7 +85,7 @@ class _APPUnlockNeedMobileNetworkingLockPageState extends State Row( children: [ Image.asset( - state.isCheckAll.value ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.isCheckAll.value ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -156,8 +156,8 @@ class _APPUnlockNeedMobileNetworkingLockPageState extends State { ), Image.asset( isNameSelect == false - ? 'images/icon_round_unSelet.png' - : 'images/icon_round_selet.png', + ? 'images/icon_round_unSelect.png' + : 'images/icon_round_select.png', width: 30.sp, height: 30.sp, ), diff --git a/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart b/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart index 8dd83f30..f63fb1c9 100644 --- a/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart +++ b/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart @@ -117,8 +117,8 @@ class _GetNameListPageState extends State { )), Image.asset( isNameSelect == false - ? 'images/icon_round_unSelet.png' - : 'images/icon_round_selet.png', + ? 'images/icon_round_unSelect.png' + : 'images/icon_round_select.png', width: 30.sp, height: 30.sp, ), diff --git a/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart b/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart index da6dc709..df148714 100644 --- a/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart +++ b/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart @@ -13,7 +13,7 @@ class GroupEditLockLogic extends BaseGetXController { Future lockGroupAddLock(List lockId) async { var entity = await ApiRepository.to.lockGroupAddLock( lockIds: lockId, - groupId: state.seletGroupListItem.keyGroupId!); + groupId: state.selectGroupListItem.keyGroupId!); if (entity.errorCode!.codeIsSuccessful) { showToast("添加成功"); eventBus.fire(LockGroupEditGroupLockRefreshEvent()); @@ -33,4 +33,4 @@ class GroupEditLockLogic extends BaseGetXController { } } -} \ No newline at end of file +} diff --git a/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart b/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart index cc1bd86c..55c9d152 100644 --- a/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart +++ b/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart @@ -97,8 +97,8 @@ class _GroupEditLockPageState extends State { GestureDetector( child: Image.asset( itemData.isChecked - ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + ? 'images/icon_round_select.png' + : 'images/icon_round_unSelect.png', width: 35.w, height: 35.w, ), diff --git a/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_state.dart b/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_state.dart index 2e65cff8..dc2adaf3 100644 --- a/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_state.dart +++ b/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_state.dart @@ -5,17 +5,17 @@ import '../../../../main/lockDetail/electronicKey/massSendElectronicKey/massSend class GroupEditLockState { var lockList = []; var type = 0;// 0添加 1删除 - var seletGroupListItem = GroupListItem(); + var selectGroupListItem = GroupListItem(); var ungrouped = GroupListItem(); GroupEditLockState() { Map map = Get.arguments; type = map["type"]; - seletGroupListItem = map["groupListItem"]; + selectGroupListItem = map["groupListItem"]; ungrouped = map["ungrouped"]; if(type == 0){ lockList = ungrouped.lockList!; }else{ - lockList = seletGroupListItem.lockList!; + lockList = selectGroupListItem.lockList!; } for(int i = 0; i { onPressed: () { setState(() { for (var element in state.getewayListData.value) { - if(state.isSeletAll == true){ - state.isSeletAll = false; - element.selet = 0; + if(state.isSelectAll == true){ + state.isSelectAll = false; + element.select = 0; }else{ - state.isSeletAll = true; - element.selet = 1; + state.isSelectAll = true; + element.select = 1; } } }); @@ -80,10 +80,10 @@ class _SelectGetewayListPageState extends State { GetewayItemData getewayItemData = state.getewayListData.value[index]; return _electronicKeyItem(getewayItemData, () { setState(() { - if(getewayItemData.selet == 1){ - getewayItemData.selet = 0; + if(getewayItemData.select == 1){ + getewayItemData.select = 0; }else{ - getewayItemData.selet = 1; + getewayItemData.select = 1; } }); }); @@ -105,7 +105,7 @@ class _SelectGetewayListPageState extends State { ), GestureDetector( child: Image.asset( - (getewayItemData.selet == 1) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + (getewayItemData.select == 1) ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -140,7 +140,7 @@ class _SelectGetewayListPageState extends State { bool isCanNext = false; var idList = []; for (var element in state.getewayListData.value) { - if(element.selet == 1){ + if(element.select == 1){ isCanNext = true; idList.add(element.plugId); } diff --git a/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_state.dart b/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_state.dart index ca418a08..45a4ea5c 100644 --- a/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_state.dart +++ b/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_state.dart @@ -7,5 +7,5 @@ import 'selectGetewayList_entity.dart'; class SelectGetewayListState{ var getewayListData = [].obs; final TextEditingController searchController = TextEditingController(); - bool isSeletAll = false; -} \ No newline at end of file + bool isSelectAll = false; +} diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart b/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart index dc78de13..adc31a3e 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart @@ -174,7 +174,7 @@ class _RecipientInformationPageState extends State { ), action: () async { var result = await Navigator.pushNamed( - context, Routers.seletCountryRegionPage); + context, Routers.selectCountryRegionPage); if (result != null) { result as Map; state.countryCode.value = result['code']; diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_entity.dart b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_entity.dart index 03ed8ee4..0427b2ab 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_entity.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_entity.dart @@ -51,7 +51,7 @@ class TransferSmartLockListData { class TransferSmartLockItemData { int? lockId; - int? selet = 0; + int? select = 0; String? lockAlias; LockVersion? lockVersion; diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart index 1e2296a3..0ad823f9 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart @@ -34,17 +34,17 @@ class _TransferSmartLockPageState extends State { onPressed: () { setState(() { for (var element in state.transferSmartLockListData.value) { - if(state.isSeletAll == true){ - state.isSeletAll = false; - element.selet = 0; + if(state.isSelectAll == true){ + state.isSelectAll = false; + element.select = 0; }else{ - state.isSeletAll = true; - element.selet = 1; + state.isSelectAll = true; + element.select = 1; } } }); }, - child: Text(state.isSeletAll == true ? TranslationLoader.lanKeys!.checkAll!.tr : TranslationLoader.lanKeys!.cancel!.tr, style: TextStyle(color: Colors.white, fontSize: 24.sp))) + child: Text(state.isSelectAll == true ? TranslationLoader.lanKeys!.checkAll!.tr : TranslationLoader.lanKeys!.cancel!.tr, style: TextStyle(color: Colors.white, fontSize: 24.sp))) ], ), body: Column( @@ -128,10 +128,10 @@ class _TransferSmartLockPageState extends State { TransferSmartLockItemData transferSmartLockItemData = state.transferSmartLockListData.value[index]; return _electronicKeyItem(transferSmartLockItemData, () { setState(() { - if(transferSmartLockItemData.selet == 1){ - transferSmartLockItemData.selet = 0; + if(transferSmartLockItemData.select == 1){ + transferSmartLockItemData.select = 0; }else{ - transferSmartLockItemData.selet = 1; + transferSmartLockItemData.select = 1; } }); }); @@ -149,7 +149,7 @@ class _TransferSmartLockPageState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ SizedBox(width: 20.w), - Image.asset((transferSmartLockItemData.selet == 1) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w), + Image.asset((transferSmartLockItemData.select == 1) ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w), SizedBox(width: 16.w), Image.asset('images/icon_lockGroup_item.png', width: 50.h, height: 50.h, fit: BoxFit.fill), SizedBox(width: 10.w), @@ -171,7 +171,7 @@ class _TransferSmartLockPageState extends State { bool isCanNext = false; var idList = []; for (var element in state.transferSmartLockListData.value) { - if(element.selet == 1){ + if(element.select == 1){ isCanNext = true; idList.add(element.lockId); } diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_state.dart b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_state.dart index fb777983..bd6670d8 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_state.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_state.dart @@ -7,5 +7,5 @@ import 'transferSmartLock_entity.dart'; class TransferSmartLockState{ var transferSmartLockListData = [].obs; final TextEditingController searchController = TextEditingController(); - bool isSeletAll = false; -} \ No newline at end of file + bool isSelectAll = false; +} diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_page.dart index acd02cf3..ac7453a2 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_page.dart @@ -94,7 +94,7 @@ class _ValueAddedServicesBuyPageState extends State { fontSize: 24.sp, color: AppColors.blackColor))), SizedBox(width: 5.w), Image.asset( - 'images/icon_round_selet.png', + 'images/icon_round_select.png', width: 40.w, height: 40.w, ) diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart index aec6c818..1102058a 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart @@ -151,7 +151,7 @@ class _ValueAddedServicesAddEmailTemplatePageState rightTitle: TranslationLoader.lanKeys!.password!.tr, isHaveLine: false, action: () { - _showSeletTemplateType(); + _showSelectTemplateType(); }), ], ); @@ -306,7 +306,7 @@ class _ValueAddedServicesAddEmailTemplatePageState ); } - void _showSeletTemplateType() { + void _showSelectTemplateType() { var list = [ TranslationLoader.lanKeys!.electronicKey!.tr, TranslationLoader.lanKeys!.password!.tr diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart index 5deb473b..5a5c495b 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart @@ -125,7 +125,7 @@ class _ValueAddedServicesRealNamePageState padding: EdgeInsets.only(top: 20.h, bottom: 20.h, left: 30.w), child: Text( TranslationLoader - .lanKeys!.buyRealNameSeletYouWantBuyTip!.tr, + .lanKeys!.buyRealNameSelectYouWantBuyTip!.tr, style: TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600), )), @@ -142,7 +142,7 @@ class _ValueAddedServicesRealNamePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -160,7 +160,7 @@ class _ValueAddedServicesRealNamePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -178,7 +178,7 @@ class _ValueAddedServicesRealNamePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -196,7 +196,7 @@ class _ValueAddedServicesRealNamePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart index e91ec221..09b5c7b7 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart @@ -124,7 +124,7 @@ class _ValueAddedServicesAddSMSTemplatePageState rightTitle: TranslationLoader.lanKeys!.password!.tr, isHaveLine: false, action: () { - _showSeletTemplateType(); + _showSelectTemplateType(); }), ], ); @@ -250,7 +250,7 @@ class _ValueAddedServicesAddSMSTemplatePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 26.w, height: 26.w, ), @@ -466,7 +466,7 @@ class _ValueAddedServicesAddSMSTemplatePageState ); } - void _showSeletTemplateType() { + void _showSelectTemplateType() { var list = [ TranslationLoader.lanKeys!.electronicKey!.tr, TranslationLoader.lanKeys!.password!.tr diff --git a/star_lock/lib/nav/navPages.dart b/star_lock/lib/nav/navPages.dart index 23832bfa..2391fc87 100644 --- a/star_lock/lib/nav/navPages.dart +++ b/star_lock/lib/nav/navPages.dart @@ -60,8 +60,8 @@ class _NavPagesState extends State { // height: 56.w, // child: Image.asset( // _currentIndex == 0 - // ? 'images/tabbar/icon_tab_main_selet.png' - // : 'images/tabbar/icon_tab_main_unselet.png', + // ? 'images/tabbar/icon_tab_main_select.png' + // : 'images/tabbar/icon_tab_main_unselect.png', // fit: BoxFit.cover), // ), // label: '首页'), @@ -71,8 +71,8 @@ class _NavPagesState extends State { // height: 56.w, // child: Image.asset( // _currentIndex == 1 - // ? 'images/tabbar/icon_tab_my_selet.png' - // : 'images/tabbar/icon_tab_my_unselet.png', + // ? 'images/tabbar/icon_tab_my_select.png' + // : 'images/tabbar/icon_tab_my_unselect.png', // fit: BoxFit.cover), // ), // label: '我的'), diff --git a/star_lock/lib/network/api.dart b/star_lock/lib/network/api.dart index 1276b0d9..790a10ca 100644 --- a/star_lock/lib/network/api.dart +++ b/star_lock/lib/network/api.dart @@ -1,8 +1,8 @@ abstract class Api { - // static String baseAddress = "https://pre.lock.star-lock.cn"; //预发布环境 - static String baseAddress = "https://dev.lock.star-lock.cn"; //联调环境 + static String baseAddress = "https://pre.lock.star-lock.cn"; //预发布环境 + // static String baseAddress = "https://dev.lock.star-lock.cn"; //联调环境 // static String baseAddress = "http://192.168.1.15:8022"; //谢总本地 - // static String baseAddress = "https://ge.lock.star-lock.cn:8100"; //葛工开发环境地址 + // static String baseAddress = "https://ge.lock.star-lock.cn"; //葛工开发环境地址 final String baseUrl = "$baseAddress/api"; @@ -73,6 +73,7 @@ abstract class Api { '/attendanceCompany/isExistenceCompany'; // 开启考勤获取是否有公司 final String setCheckInCreateCompanyURL = '/attendanceCompany/add'; // 设置考勤时创建公司 + final String deleteCompanyURL = '/vacation/delete'; // 删除公司 final String getAttendanceRecordListByDateURL = '/attendanceRecord/listByDate'; // 获取考勤列表-早到榜日榜 @@ -89,7 +90,7 @@ abstract class Api { final String getStaffListURL = '/staff/list'; // 获取员工列表 final String addStaffURL = '/staff/add'; // 添加员工 final String editStaffURL = '/staff/update'; // 编辑员工 - final String addStaffSeletKeyURL = '/staff/attendanceList'; // 考勤设置添加员工-选择钥匙 + final String addStaffSelectKeyURL = '/staff/attendanceList'; // 考勤设置添加员工-选择钥匙 final String addHolidaysURL = '/vacation/add'; // 添加假期 final String holidaysListURL = '/vacation/list'; // 假期列表 final String holidaysDeleteURL = '/vacation/delete'; // 假期删除 diff --git a/star_lock/lib/network/api_provider.dart b/star_lock/lib/network/api_provider.dart index 5877e0a9..27c243c4 100644 --- a/star_lock/lib/network/api_provider.dart +++ b/star_lock/lib/network/api_provider.dart @@ -735,6 +735,14 @@ class ApiProvider extends BaseProvider { 'workStartTime': workStartTime, })); + // 删除公司 + Future deletCompanyData(int companyId) => post( + deleteCompanyURL.toUrl, + jsonEncode({ + 'companyId': companyId, + }), + isUnShowLoading: true); + // 获取开锁提醒 Future setLockPickingReminderData( int lockId, int unlockReminderPush) => @@ -796,8 +804,8 @@ class ApiProvider extends BaseProvider { })); // 添加员工选择钥匙 - Future addStaffSeletKeyData(String companyId, String type) => post( - addStaffSeletKeyURL.toUrl, + Future addStaffSelectKeyData(String companyId, String type) => post( + addStaffSelectKeyURL.toUrl, jsonEncode({ 'companyId': companyId, 'type': type, diff --git a/star_lock/lib/network/api_repository.dart b/star_lock/lib/network/api_repository.dart index bc9eba53..c5c5ba2a 100644 --- a/star_lock/lib/network/api_repository.dart +++ b/star_lock/lib/network/api_repository.dart @@ -1,11 +1,11 @@ import 'package:get/get.dart'; -import 'package:star_lock/login/seletCountryRegion/common/countryRegionEntity.dart'; +import 'package:star_lock/login/selectCountryRegion/common/countryRegionEntity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserListEntity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart'; import 'package:star_lock/main/lockDetail/face/faceList/faceListData_entity.dart'; -import 'package:star_lock/main/lockDetail/lcokSet/basicInformation/basicInformation/KeyDetailEntity.dart'; +import 'package:star_lock/main/lockDetail/lockSet/basicInformation/basicInformation/KeyDetailEntity.dart'; import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart'; import 'package:star_lock/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKeyEntity.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_entity.dart'; @@ -29,14 +29,14 @@ import '../main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/c import '../main/lockDetail/checkingIn/checkingInList/checkingInListDay_entity.dart'; import '../main/lockDetail/checkingIn/checkingInList/checkingInListMonth_entity.dart'; import '../main/lockDetail/checkingIn/checkingInSet/checkingInSet_entity.dart'; -import '../main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSeletKey_entity.dart'; +import '../main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSelectKey_entity.dart'; import '../main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_entity.dart'; import '../main/lockDetail/fingerprint/addFingerprint/addFingerprint_entity.dart'; import '../main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart'; -import '../main/lockDetail/lcokSet/configuringWifi/configuringWifiEntity.dart'; -import '../main/lockDetail/lcokSet/lockSet/checkingInInfoData_entity.dart'; -import '../main/lockDetail/lcokSet/lockSet/lockSetInfo_entity.dart'; -import '../main/lockDetail/lcokSet/lockTime/getServerDatetime_entity.dart'; +import '../main/lockDetail/lockSet/configuringWifi/configuringWifiEntity.dart'; +import '../main/lockDetail/lockSet/lockSet/checkingInInfoData_entity.dart'; +import '../main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; +import '../main/lockDetail/lockSet/lockTime/getServerDatetime_entity.dart'; import '../main/lockDetail/lockDetail/lockNetToken_entity.dart'; import '../main/lockDetail/lockOperatingRecord/lockOperatingRecordGetLastRecordTime_entity.dart'; import '../main/lockMian/entity/lockListInfo_entity.dart'; @@ -908,6 +908,13 @@ class ApiRepository { return LoginEntity.fromJson(res.body); } + // 删除公司 + Future deletCompanyData( + {required int companyId}) async { + final res = await apiProvider.deletCompanyData(companyId); + return CheckingInInfoDataEntity.fromJson(res.body); + } + // 设置锁开锁提醒 Future setLockPickingReminderData({ required int lockId, @@ -1020,12 +1027,12 @@ class ApiRepository { } // 添加员工选择钥匙 - Future addStaffSeletKeyData({ + Future addStaffSelectKeyData({ required String companyId, required String type, }) async { - final res = await apiProvider.addStaffSeletKeyData(companyId, type); - return CheckingInAddStaffSeletKeyEntity.fromJson(res.body); + final res = await apiProvider.addStaffSelectKeyData(companyId, type); + return CheckingInAddStaffSelectKeyEntity.fromJson(res.body); } // 添加假期 diff --git a/star_lock/lib/tools/ExpandedListView.dart b/star_lock/lib/tools/ExpandedListView.dart index 0c4247e4..67ad5ae0 100644 --- a/star_lock/lib/tools/ExpandedListView.dart +++ b/star_lock/lib/tools/ExpandedListView.dart @@ -64,8 +64,8 @@ class _ExpandedListTileState extends State { ), Image.asset( _isCheck - ? "images/icon_round_selet.png" - : "images/icon_round_unSelet.png", + ? "images/icon_round_select.png" + : "images/icon_round_unSelect.png", width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/tools/eventBusEventManage.dart b/star_lock/lib/tools/eventBusEventManage.dart index 05c36ea0..cf2b2826 100644 --- a/star_lock/lib/tools/eventBusEventManage.dart +++ b/star_lock/lib/tools/eventBusEventManage.dart @@ -1,6 +1,6 @@ import 'package:event_bus/event_bus.dart'; -import '../main/lockDetail/lcokSet/lockSet/lockSetInfo_entity.dart'; +import '../main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; /// 创建EventBus EventBus eventBus = EventBus(); diff --git a/star_lock/lib/tools/seletImgTool.dart b/star_lock/lib/tools/seletImgTool.dart index b39ca539..81434158 100644 --- a/star_lock/lib/tools/seletImgTool.dart +++ b/star_lock/lib/tools/seletImgTool.dart @@ -7,7 +7,7 @@ import 'package:image_picker/image_picker.dart'; typedef BlockImgCallback = void Function(dynamic imgStr); -class SeletImageTool { +class SelectImageTool { // 实例化ImagePicker final ImagePicker _picker = ImagePicker(); ImageProvider? _imageProvider; @@ -53,4 +53,4 @@ class SeletImageTool { } } } -} \ No newline at end of file +} diff --git a/star_lock/lib/tools/showCalendar.dart b/star_lock/lib/tools/showCalendar.dart index f457b809..09e6c815 100644 --- a/star_lock/lib/tools/showCalendar.dart +++ b/star_lock/lib/tools/showCalendar.dart @@ -3,13 +3,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -typedef SeletDateCallback(DateTime dateTime); +typedef SelectDateCallback(DateTime dateTime); class ShowCalendar extends StatelessWidget { - SeletDateCallback? seletAction; + SelectDateCallback? selectAction; DatePickerMode? datePickerMode; - ShowCalendar({Key? key, this.seletAction, this.datePickerMode}) : super(key: key); + ShowCalendar({Key? key, this.selectAction, this.datePickerMode}) : super(key: key); @override Widget build(BuildContext context) { @@ -37,7 +37,7 @@ class ShowCalendar extends StatelessWidget { lastDate: DateTime(2100, 1, 1), // 结束日期 initialCalendarMode: mode, // 日期选择样式 // 选中日期改变回调函数 - onDateChanged:seletAction!, + onDateChanged:selectAction!, // 月份改变回调函数 onDisplayedMonthChanged: (dateTime){ print("onDisplayedMonthChanged $dateTime"); diff --git a/star_lock/lib/tools/showSeletDateTime.dart b/star_lock/lib/tools/showSeletDateTime.dart index 9e734ec5..6110936a 100644 --- a/star_lock/lib/tools/showSeletDateTime.dart +++ b/star_lock/lib/tools/showSeletDateTime.dart @@ -7,7 +7,7 @@ import '../translations/trans_lib.dart'; typedef DateValueCallback(DateTime dateTime, List selectedIndex); -class ShowSeletDateTime { +class ShowSelectDateTime { void showDatePicker(BuildContext context, String maxT, String minT, String nowDate, String formatStr, DateValueCallback onConfirm,) { // String MIN_DATETIME = '1900-01-01 00:00'; diff --git a/star_lock/lib/tools/xs_aliyunPush.dart b/star_lock/lib/tools/xs_aliyunPush.dart index c2675a61..11ff6e0b 100644 --- a/star_lock/lib/tools/xs_aliyunPush.dart +++ b/star_lock/lib/tools/xs_aliyunPush.dart @@ -11,6 +11,7 @@ class XSAliyunPushProvider { _aliyunPush = aliyunPush; if (Platform.isAndroid) { _aliyunPush.createAndroidChannel('1', '测试通道A', 3, '测试创建通知通道'); + _aliyunPush.setAndroidLogLevel(kAliyunPushLogLevelError); } _addPushCallback(); } diff --git a/star_lock/lib/translations/lanKeyEntity.dart b/star_lock/lib/translations/lanKeyEntity.dart index 41076492..8646be21 100644 --- a/star_lock/lib/translations/lanKeyEntity.dart +++ b/star_lock/lib/translations/lanKeyEntity.dart @@ -49,7 +49,7 @@ class LanKeyEntity { this.sendGroupKey, this.lock, this.pleaseAdd, - this.pleaseSelet, + this.pleaseSelect, this.remoteUnlockingAllowed, this.pleaseEnter, this.getPassword, @@ -135,7 +135,7 @@ class LanKeyEntity { this.allDay, this.save, this.normallyOpenModeTip, - this.pleaseSeletLockVolume, + this.pleaseSelectLockVolume, this.lockSoundTip, this.low, this.lower, @@ -276,7 +276,7 @@ class LanKeyEntity { this.addGateway, this.turnThePowerBackOn, this.indicatorLight, - this.seletGatewayTypeNextTip, + this.selectGatewayTypeNextTip, this.selectGateway, this.gatewayConfigurationWifiTip, this.wifiPassward, @@ -317,7 +317,7 @@ class LanKeyEntity { this.email, this.mobileNumber, this.countryAndRegion, - this.selet, + this.select, this.businessCooperation, this.officialWebsite, this.computerWebVersion, @@ -337,7 +337,7 @@ class LanKeyEntity { this.customMailTemplate, this.record, this.buyRealNameTip, - this.buyRealNameSeletYouWantBuyTip, + this.buyRealNameSelectYouWantBuyTip, this.forTheFirstTime, this.onceDay, this.weekOnce, @@ -400,9 +400,9 @@ class LanKeyEntity { this.whetherTheEmployeeHasPassword, this.whetherTheEmployeeHasCard, this.whetherTheEmployeeHasFingerprint, - this.seletPassword, - this.seletCard, - this.seletFingerprint, + this.selectPassword, + this.selectCard, + this.selectFingerprint, this.getKey, this.getCard, this.getFingerprint, @@ -509,7 +509,7 @@ class LanKeyEntity { sendGroupKey = json['sendGroupKey']; lock = json['lock']; pleaseAdd = json['pleaseAdd']; - pleaseSelet = json['pleaseSelet']; + pleaseSelect = json['pleaseSelect']; remoteUnlockingAllowed = json['remoteUnlockingAllowed']; pleaseEnter = json['pleaseEnter']; getPassword = json['getPassword']; @@ -553,7 +553,7 @@ class LanKeyEntity { allDay = json['allDay']; save = json['save']; normallyOpenModeTip = json['normallyOpenModeTip']; - pleaseSeletLockVolume = json['pleaseSeletLockVolume']; + pleaseSelectLockVolume = json['pleaseSelectLockVolume']; lockSoundTip = json['lockSoundTip']; low = json['low']; lower = json['lower']; @@ -746,7 +746,7 @@ class LanKeyEntity { addGateway = json['addGateway']; turnThePowerBackOn = json['turnThePowerBackOn']; indicatorLight = json['indicatorLight']; - seletGatewayTypeNextTip = json['seletGatewayTypeNextTip']; + selectGatewayTypeNextTip = json['selectGatewayTypeNextTip']; selectGateway = json['selectGateway']; gatewayConfigurationWifiTip = json['gatewayConfigurationWifiTip']; wifiPassward = json['wifiPassward']; @@ -793,7 +793,7 @@ class LanKeyEntity { email = json['email']; mobileNumber = json['mobileNumber']; countryAndRegion = json['countryAndRegion']; - selet = json['selet']; + select = json['select']; businessCooperation = json['businessCooperation']; officialWebsite = json['officialWebsite']; @@ -817,7 +817,7 @@ class LanKeyEntity { record = json['record']; buyRealNameTip = json['buyRealNameTip']; - buyRealNameSeletYouWantBuyTip = json['buyRealNameSeletYouWantBuyTip']; + buyRealNameSelectYouWantBuyTip = json['buyRealNameSelectYouWantBuyTip']; forTheFirstTime = json['forTheFirstTime']; onceDay = json['onceDay']; weekOnce = json['weekOnce']; @@ -887,9 +887,9 @@ class LanKeyEntity { whetherTheEmployeeHasPassword = json['whetherTheEmployeeHasPassword']; whetherTheEmployeeHasCard = json['whetherTheEmployeeHasCard']; whetherTheEmployeeHasFingerprint = json['whetherTheEmployeeHasFingerprint']; - seletPassword = json['seletPassword']; - seletCard = json['seletCard']; - seletFingerprint = json['seletFingerprint']; + selectPassword = json['selectPassword']; + selectCard = json['selectCard']; + selectFingerprint = json['selectFingerprint']; getKey = json['getKey']; getCard = json['getCard']; getFingerprint = json['getFingerprint']; @@ -1000,7 +1000,7 @@ class LanKeyEntity { String? sendGroupKey; String? lock; String? pleaseAdd; - String? pleaseSelet; + String? pleaseSelect; String? remoteUnlockingAllowed; String? pleaseEnter; String? getPassword; @@ -1044,7 +1044,7 @@ class LanKeyEntity { String? allDay; String? save; String? normallyOpenModeTip; - String? pleaseSeletLockVolume; + String? pleaseSelectLockVolume; String? lockSoundTip; String? low; String? lower; @@ -1232,7 +1232,7 @@ class LanKeyEntity { String? addGateway; String? turnThePowerBackOn; String? indicatorLight; - String? seletGatewayTypeNextTip; + String? selectGatewayTypeNextTip; String? selectGateway; String? gatewayConfigurationWifiTip; String? wifiPassward; @@ -1275,7 +1275,7 @@ class LanKeyEntity { String? email; String? mobileNumber; String? countryAndRegion; - String? selet; + String? select; String? businessCooperation; String? officialWebsite; @@ -1299,7 +1299,7 @@ class LanKeyEntity { String? record; String? buyRealNameTip; - String? buyRealNameSeletYouWantBuyTip; + String? buyRealNameSelectYouWantBuyTip; String? forTheFirstTime; String? onceDay; String? weekOnce; @@ -1366,9 +1366,9 @@ class LanKeyEntity { String? whetherTheEmployeeHasPassword; String? whetherTheEmployeeHasCard; String? whetherTheEmployeeHasFingerprint; - String? seletPassword; - String? seletCard; - String? seletFingerprint; + String? selectPassword; + String? selectCard; + String? selectFingerprint; String? getKey; String? getCard; String? getFingerprint; @@ -1480,7 +1480,7 @@ class LanKeyEntity { map['sendGroupKey'] = sendGroupKey; map['lock'] = lock; map['pleaseAdd'] = pleaseAdd; - map['pleaseSelet'] = pleaseSelet; + map['pleaseSelect'] = pleaseSelect; map['remoteUnlockingAllowed'] = remoteUnlockingAllowed; map['pleaseEnter'] = pleaseEnter; map['getPassword'] = getPassword; @@ -1525,7 +1525,7 @@ class LanKeyEntity { map['allDay'] = allDay; map['save'] = save; map['normallyOpenModeTip'] = normallyOpenModeTip; - map['pleaseSeletLockVolume'] = pleaseSeletLockVolume; + map['pleaseSelectLockVolume'] = pleaseSelectLockVolume; map['lockSoundTip'] = lockSoundTip; map['low'] = low; map['lower'] = lower; @@ -1716,7 +1716,7 @@ class LanKeyEntity { map['addGateway'] = addGateway; map['turnThePowerBackOn'] = turnThePowerBackOn; map['indicatorLight'] = indicatorLight; - map['seletGatewayTypeNextTip'] = seletGatewayTypeNextTip; + map['selectGatewayTypeNextTip'] = selectGatewayTypeNextTip; map['selectGateway'] = selectGateway; map['gatewayConfigurationWifiTip'] = gatewayConfigurationWifiTip; map['wifiPassward'] = wifiPassward; @@ -1761,7 +1761,7 @@ class LanKeyEntity { map['email'] = email; map['mobileNumber'] = mobileNumber; map['countryAndRegion'] = countryAndRegion; - map['selet'] = selet; + map['select'] = select; map['businessCooperation'] = businessCooperation; map['officialWebsite'] = officialWebsite; @@ -1785,7 +1785,7 @@ class LanKeyEntity { map['record'] = record; map['buyRealNameTip'] = buyRealNameTip; - map['buyRealNameSeletYouWantBuyTip'] = buyRealNameSeletYouWantBuyTip; + map['buyRealNameSelectYouWantBuyTip'] = buyRealNameSelectYouWantBuyTip; map['forTheFirstTime'] = forTheFirstTime; map['onceDay'] = onceDay; map['weekOnce'] = weekOnce; @@ -1855,9 +1855,9 @@ class LanKeyEntity { map['whetherTheEmployeeHasPassword'] = whetherTheEmployeeHasPassword; map['whetherTheEmployeeHasCard'] = whetherTheEmployeeHasCard; map['whetherTheEmployeeHasFingerprint'] = whetherTheEmployeeHasFingerprint; - map['seletPassword'] = seletPassword; - map['seletCard'] = seletCard; - map['seletFingerprint'] = seletFingerprint; + map['selectPassword'] = selectPassword; + map['selectCard'] = selectCard; + map['selectFingerprint'] = selectFingerprint; map['getKey'] = getKey; map['getCard'] = getCard; map['getFingerprint'] = getFingerprint;