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/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/lib/appRouters.dart b/star_lock/lib/appRouters.dart index 1cbaaacb..ca1894fb 100644 --- a/star_lock/lib/appRouters.dart +++ b/star_lock/lib/appRouters.dart @@ -40,7 +40,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'; @@ -100,7 +100,7 @@ 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/seletWirelessKeyboard/seletWirelessKeyboard_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'; @@ -136,11 +136,11 @@ 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'; @@ -183,7 +183,7 @@ abstract class Routers { static const initial = '/'; // 加载页 static const starLockMain = '/StarLockMain'; // 首页 static const starLockMinePage = '/StarLockMinePage'; // 我的 - static const seletLockTypePage = '/SelectLockTypePage'; // 选择锁类型 + static const selectLockTypePage = '/SelectLockTypePage'; // 选择锁类型 static const LockMallPage = '/LockMallPage'; // 商城页面 static const addLockPage = '/AddLockPage'; // 选择锁类型 static const nearbyLockPage = '/NearbyLockPage'; // 附近的锁 @@ -238,7 +238,7 @@ abstract class Routers { static const addWirelessKeyboardPage = '/AddWirelessKeyboardPage'; // 添加蓝牙键盘 static const addWirelessKeyboardScreenNotLightOnPage = '/AddWirelessKeyboardScreenNotLightOnPage'; // 添加蓝牙键盘屏幕不亮时提示 - static const seletWirelessKeyboardPage = + static const selectWirelessKeyboardPage = '/SelectWirelessKeyboardPage'; // 选择蓝牙键盘 static const doorMagneticPage = '/DoorMagneticPage'; // 门磁列表 static const addDoorMagneticPage = '/AddDoorMagneticPage'; // 添加门磁 @@ -296,10 +296,10 @@ abstract class Routers { static const gatewayDetailPage = '/GatewayDetailPage'; // 我的-网关详情 static const gatewayConnectionLockPage = '/GatewayConnectionLockPage'; // 我的-网关网关链接的锁 - static const seletGatewayTypePage = '/SelectGatewayTypePage'; // 我的-选择网关类型 - static const seletGatewayTypeNextTipPage = + static const selectGatewayTypePage = '/SelectGatewayTypePage'; // 我的-选择网关类型 + static const selectGatewayTypeNextTipPage = '/SelectGatewayTypeNextTipPage'; // 我的-选择网关类型下一步 - static const seletGatewayPage = '/SelectGatewayPage'; // 我的-选择网关 + static const selectGatewayPage = '/SelectGatewayPage'; // 我的-选择网关 static const gatewayConfigurationWifiPage = '/GatewayConfigurationWifiPage'; // 我的-网关配置wifi @@ -350,7 +350,7 @@ abstract class Routers { static const starLockRegisterPage = '/StarLockRegisterPage'; // 注册 static const starLockForgetPasswordPage = '/StarLockForgetPasswordPage'; // 忘记密码 - static const seletCountryRegionPage = '/SelectCountryRegionPage'; // 选择国家和地区 + static const selectCountryRegionPage = '/SelectCountryRegionPage'; // 选择国家和地区 static const safetyVerificationPage = '/SafetyVerificationPage'; // 安全验证 static const keyOperationRecordPage = '/keyOperationRecordPage'; //钥匙详情-操作记录 @@ -435,7 +435,7 @@ abstract class AppRouters { page: () => const StarLockMinePage(), ), GetPage( - name: Routers.seletLockTypePage, + name: Routers.selectLockTypePage, page: () => const SelectLockTypePage(), ), GetPage( @@ -551,7 +551,7 @@ abstract class AppRouters { page: () => const StarLockForgetPasswordPage(), ), GetPage( - name: Routers.seletCountryRegionPage, + name: Routers.selectCountryRegionPage, page: () => const SelectCountryRegionPage(), ), GetPage( @@ -591,7 +591,7 @@ abstract class AppRouters { page: () => const AddWirelessKeyboardScreenNotLightOnPage(), ), GetPage( - name: Routers.seletWirelessKeyboardPage, + name: Routers.selectWirelessKeyboardPage, page: () => const SelectWirelessKeyboardPage(), ), GetPage( @@ -759,15 +759,15 @@ abstract class AppRouters { page: () => const GatewayConnectionLockListPage(), ), GetPage( - name: Routers.seletGatewayTypePage, + name: Routers.selectGatewayTypePage, page: () => const SelectGatewayTypePage(), ), GetPage( - name: Routers.seletGatewayTypeNextTipPage, + name: Routers.selectGatewayTypeNextTipPage, page: () => const SelectGatewayTypeNextTipPage(), ), GetPage( - name: Routers.seletGatewayPage, + name: Routers.selectGatewayPage, page: () => const SelectGatewayListPage(), ), GetPage( diff --git a/star_lock/lib/login/login/starLock_login_page.dart b/star_lock/lib/login/login/starLock_login_page.dart index 01569f7c..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_unSelect.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 96f00b9b..f0026f1b 100644 --- a/star_lock/lib/login/register/starLock_register_page.dart +++ b/star_lock/lib/login/register/starLock_register_page.dart @@ -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 94% rename from star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart rename to star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart index 5b0aa532..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'; @@ -72,7 +72,7 @@ class _SelectCountryRegionPageState 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 baaaaa87..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']; 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 f7093db9..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(); 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/checkingInList_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart index 9f3a965f..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("演示模式"); } }, @@ -104,7 +104,7 @@ class _CheckingInListPageState extends State { logic.loadDataByType(); }); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, @@ -141,7 +141,7 @@ class _CheckingInListPageState extends State { logic.loadDataByType(); }); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, @@ -171,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]); @@ -182,7 +182,7 @@ class _CheckingInListPageState extends State { }); }); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, @@ -343,7 +343,7 @@ class _CheckingInListPageState extends State { if(isDemoMode == false){ showListType(); }else{ - // Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } }, 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 058e60d0..749ce6d6 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart @@ -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_unSelect.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_unSelect.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,), ], ), ) @@ -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_unSelect.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/checkingInAddStaff_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart index eab2e49a..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 @@ -7,7 +7,7 @@ import '../../../../../tools/eventBusEventManage.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", @@ -81,7 +81,7 @@ class CheckingInAddStaffLogic extends BaseGetXController{ 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", 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 f0dd9d41..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,7 +44,7 @@ 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: () { @@ -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,7 +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( @@ -148,7 +148,7 @@ class _CheckingInAddStaffPageState extends State { color: Colors.white, fontSize: 22.sp)), onPressed: () async { switch (int.parse( - state.seletPrintingMethodType.value)) { + state.selectPrintingMethodType.value)) { case 2: // 获取密码 logic.getKeyboardPwdRequest(); @@ -206,7 +206,7 @@ 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: () { @@ -296,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}"); }); }); } @@ -316,7 +316,7 @@ class _CheckingInAddStaffPageState extends State { children: [ Image.asset( appUnHaveAccount - ? 'images/icon_round_selet.png' + ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 26.w, height: 26.w, @@ -337,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; @@ -356,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; @@ -375,7 +375,7 @@ class _CheckingInAddStaffPageState extends State { 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 3232f61d..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 @@ -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,25 +37,25 @@ 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; } 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 31fe9026..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']; 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 75f6b599..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,7 +201,7 @@ class _LockUserListPageState extends State { }, child: Image.asset( itemData.isCheck! - ? 'images/icon_round_selet.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 a0d4a2bb..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,7 +66,7 @@ class massSendLockGroupCell extends StatelessWidget { )), Image.asset( itemData.isChecked - ? "images/icon_round_selet.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 6a16b593..1c247a99 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,7 +176,7 @@ 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; @@ -184,7 +184,7 @@ class _AddFaceTypePageState extends State { Get.toNamed(Routers.addFaceTipPage); } 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 be012428..9f30fa5b 100644 --- a/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart +++ b/star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart @@ -44,7 +44,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/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart index 3378e53b..baef6122 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/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/addFingerprintSelectType/addFingerprintType_state.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_state.dart index 18e3573f..eaf5039c 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/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/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/lockSet/lockSoundSet/lockSoundSet_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_page.dart index 957d6b3e..b27e61a8 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_page.dart @@ -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_unSelect.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_unSelect.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_unSelect.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_unSelect.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_unSelect.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/lockSet/lockUser/lockUser_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_page.dart index 86bf8882..ab4af23a 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_page.dart @@ -156,7 +156,7 @@ class _LockUserPageState extends State { ), Obx(() => Image.asset( state.isCheck.value == true - ? 'images/icon_round_selet.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/lockSet/markedHouseState/markedHouseState_page.dart b/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_page.dart index bcbc7f4c..f34d4cce 100644 --- a/star_lock/lib/main/lockDetail/lockSet/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_unSelect.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_unSelect.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/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart index 77d33232..feda7712 100644 --- a/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart @@ -158,7 +158,7 @@ class _CoerceFingerprintListPageState extends State { ), Obx(() => Image.asset( state.isCheck.value == true - ? 'images/icon_round_selet.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/lockSet/normallyOpenMode/normallyOpenMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart index 22971a8e..6c938d82 100644 --- a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart @@ -253,7 +253,7 @@ class _NormallyOpenModePageState extends State with RouteA ), Image.asset( state.isAllDay.value == 1 - ? 'images/icon_round_selet.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/lockSet/notificationMode/notificationMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart index 24969c72..4275c33c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.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/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart index 1a702446..11c5a8fe 100644 --- a/star_lock/lib/main/lockDetail/lockSet/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/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart index 5efce422..22b46edc 100644 --- a/star_lock/lib/main/lockDetail/lockSet/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/lockSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/selectWirelessKeyboard/selectWirelessKeyboard_page.dart similarity index 96% rename from star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart rename to star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/selectWirelessKeyboard/selectWirelessKeyboard_page.dart index 476dbeae..5a6833be 100644 --- a/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/selectWirelessKeyboard/selectWirelessKeyboard_page.dart @@ -23,7 +23,7 @@ class _SelectWirelessKeyboardPageState 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/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 a2f4a345..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: [ @@ -115,7 +115,7 @@ class _EditVideoLogPageState extends State { onTap: (){ }, - child: Image(width: 40.w, height: 40.w, image: state.isSelectAll.value ? const AssetImage("images/icon_round_selet.png") : const AssetImage("images/icon_round_unSelect.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 270020a6..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 selectVideoLog = 0.obs; var isSelectAll = false.obs; } 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/addLock/addLockSelectCountry/addLockSelectCountry_page.dart b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart index cc7e599b..b7112ab4 100644 --- a/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart +++ b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart @@ -8,7 +8,7 @@ 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'; @@ -27,7 +27,7 @@ class _AddLockSelectCountryPageState extends State { final state = Get.find().state; List countriesList = []; - int seletindex = 10000; + int selectindex = 10000; @override void initState() { @@ -99,12 +99,12 @@ class _AddLockSelectCountryPageState 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_unSelect.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 _AddLockSelectCountryPageState 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/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/seletLockType/seletLockType_page.dart b/star_lock/lib/mine/addLock/selectLockType/selectLockType_page.dart similarity index 100% rename from star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart rename to star_lock/lib/mine/addLock/selectLockType/selectLockType_page.dart 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 96% 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 d04ae881..d812ce6d 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_page.dart @@ -26,7 +26,7 @@ class _SelectGatewayListPageState 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 _SelectGatewayListPageState 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 81% 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 19285235..c8b9a5dc 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart @@ -25,24 +25,24 @@ class _SelectGatewayTypePageState 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 91% 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 7518d3b5..20571a19 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart @@ -45,7 +45,7 @@ class _SelectGatewayTypeNextTipPageState 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 _SelectGatewayTypeNextTipPageState 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 _SelectGatewayTypeNextTipPageState 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 3ee00177..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, () { 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 c5ee01be..3ed8f486 100644 --- a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart +++ b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart @@ -274,7 +274,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 dbf0e303..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_unSelect.png', + state.isCheckAll.value ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -156,7 +156,7 @@ class _APPUnlockNeedMobileNetworkingLockPageState extends State { Image.asset( isNameSelect == false ? 'images/icon_round_unSelect.png' - : 'images/icon_round_selet.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 d5078fa1..f63fb1c9 100644 --- a/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart +++ b/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart @@ -118,7 +118,7 @@ class _GetNameListPageState extends State { Image.asset( isNameSelect == false ? 'images/icon_round_unSelect.png' - : 'images/icon_round_selet.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 cac0f902..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,7 +97,7 @@ class _GroupEditLockPageState extends State { GestureDetector( child: Image.asset( itemData.isChecked - ? 'images/icon_round_selet.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 { for (var element in state.getewayListData.value) { if(state.isSelectAll == true){ state.isSelectAll = false; - element.selet = 0; + element.select = 0; }else{ state.isSelectAll = true; - element.selet = 1; + 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_unSelect.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/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 fc94902f..0ad823f9 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart @@ -36,10 +36,10 @@ class _TransferSmartLockPageState extends State { for (var element in state.transferSmartLockListData.value) { if(state.isSelectAll == true){ state.isSelectAll = false; - element.selet = 0; + element.select = 0; }else{ state.isSelectAll = true; - element.selet = 1; + element.select = 1; } } }); @@ -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_unSelect.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/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/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_repository.dart b/star_lock/lib/network/api_repository.dart index 3ca85b51..1708c3ac 100644 --- a/star_lock/lib/network/api_repository.dart +++ b/star_lock/lib/network/api_repository.dart @@ -1,5 +1,5 @@ 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'; diff --git a/star_lock/lib/tools/ExpandedListView.dart b/star_lock/lib/tools/ExpandedListView.dart index d735df2c..67ad5ae0 100644 --- a/star_lock/lib/tools/ExpandedListView.dart +++ b/star_lock/lib/tools/ExpandedListView.dart @@ -64,7 +64,7 @@ class _ExpandedListTileState extends State { ), Image.asset( _isCheck - ? "images/icon_round_selet.png" + ? "images/icon_round_select.png" : "images/icon_round_unSelect.png", width: 30.w, height: 30.w, diff --git a/star_lock/lib/tools/showCalendar.dart b/star_lock/lib/tools/showCalendar.dart index 2ac0b7aa..09e6c815 100644 --- a/star_lock/lib/tools/showCalendar.dart +++ b/star_lock/lib/tools/showCalendar.dart @@ -6,10 +6,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; typedef SelectDateCallback(DateTime dateTime); class ShowCalendar extends StatelessWidget { - SelectDateCallback? 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/translations/lanKeyEntity.dart b/star_lock/lib/translations/lanKeyEntity.dart index e9f307d7..8646be21 100644 --- a/star_lock/lib/translations/lanKeyEntity.dart +++ b/star_lock/lib/translations/lanKeyEntity.dart @@ -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, @@ -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, @@ -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']; @@ -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']; @@ -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; @@ -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; @@ -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; @@ -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;