diff --git a/star_lock/lib/appRouters.dart b/star_lock/lib/appRouters.dart index 6567547a..469de771 100644 --- a/star_lock/lib/appRouters.dart +++ b/star_lock/lib/appRouters.dart @@ -63,7 +63,7 @@ import 'main/lockDetail/face/addFace/addFace_page.dart'; import 'main/lockDetail/face/addFaceType/addFaceTypeManage/addFaceTypeManage_page.dart'; import 'main/lockDetail/face/faceList/faceList_page.dart'; import 'main/lockDetail/fingerprint/addFingerprint/addFingerprint_page.dart'; -import 'main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_page.dart'; +import 'main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_page.dart'; import 'main/lockDetail/fingerprint/addFingerprintTip/addFingerprintTip_page.dart'; import 'main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart'; import 'main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart'; @@ -71,7 +71,7 @@ import 'main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart'; import 'main/lockDetail/lcokSet/basicInformation/adminOpenLockPassword/adminOpenLockPassword_page.dart'; import 'main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart'; import 'main/lockDetail/lcokSet/basicInformation/editLockName/editLockName_page.dart'; -import 'main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart'; +import 'main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart'; import 'main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart'; import 'main/lockDetail/lcokSet/burglarAlarm/burglarAlarm_page.dart'; import 'main/lockDetail/lcokSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart'; @@ -131,7 +131,7 @@ import 'main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dar import 'main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart'; import 'main/lockDetail/passwordKey/passwordKeyManage/passwordKeyManage_page.dart'; import 'main/lockMian/lockMain/lockMain_page.dart'; -import 'mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart'; +import 'mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart'; import 'mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart'; import 'mine/addLock/lockAddress/lockAddress/lockAddress_page.dart'; import 'mine/addLock/nearbyLock/nearbyLock_page.dart'; @@ -183,7 +183,7 @@ abstract class Routers { static const initial = '/'; // 加载页 static const starLockMain = '/StarLockMain'; // 首页 static const starLockMinePage = '/StarLockMinePage'; // 我的 - static const seletLockTypePage = '/SeletLockTypePage'; // 选择锁类型 + static const seletLockTypePage = '/SelectLockTypePage'; // 选择锁类型 static const LockMallPage = '/LockMallPage'; // 商城页面 static const addLockPage = '/AddLockPage'; // 选择锁类型 static const nearbyLockPage = '/NearbyLockPage'; // 附近的锁 @@ -230,7 +230,7 @@ abstract class Routers { static const uploadElectricQuantityPage = '/UploadElectricQuantityPage'; // 更新锁电量 static const editLockNamePage = '/EditLockNamePage'; // 修改锁名字 - static const lockSeletGroupingPage = '/LockSeletGroupingPage'; // 锁选择分组 + static const lockSelectGroupingPage = '/LockSelectGroupingPage'; // 锁选择分组 static const groupEditLockPage = '/GroupEditLockPage'; // 编辑锁分组里面的锁 static const adminOpenLockPasswordPage = '/AdminOpenLockPasswordPage'; // 管理员开锁密码 @@ -239,7 +239,7 @@ abstract class Routers { static const addWirelessKeyboardScreenNotLightOnPage = '/AddWirelessKeyboardScreenNotLightOnPage'; // 添加蓝牙键盘屏幕不亮时提示 static const seletWirelessKeyboardPage = - '/SeletWirelessKeyboardPage'; // 选择蓝牙键盘 + '/SelectWirelessKeyboardPage'; // 选择蓝牙键盘 static const doorMagneticPage = '/DoorMagneticPage'; // 门磁列表 static const addDoorMagneticPage = '/AddDoorMagneticPage'; // 添加门磁 static const nearbyDoorMagneticPage = '/NearbyDoorMagneticPage'; // 附近的门磁 @@ -296,10 +296,10 @@ abstract class Routers { static const gatewayDetailPage = '/GatewayDetailPage'; // 我的-网关详情 static const gatewayConnectionLockPage = '/GatewayConnectionLockPage'; // 我的-网关网关链接的锁 - static const seletGatewayTypePage = '/SeletGatewayTypePage'; // 我的-选择网关类型 + static const seletGatewayTypePage = '/SelectGatewayTypePage'; // 我的-选择网关类型 static const seletGatewayTypeNextTipPage = - '/SeletGatewayTypeNextTipPage'; // 我的-选择网关类型下一步 - static const seletGatewayPage = '/SeletGatewayPage'; // 我的-选择网关 + '/SelectGatewayTypeNextTipPage'; // 我的-选择网关类型下一步 + static const seletGatewayPage = '/SelectGatewayPage'; // 我的-选择网关 static const gatewayConfigurationWifiPage = '/GatewayConfigurationWifiPage'; // 我的-网关配置wifi @@ -350,7 +350,7 @@ abstract class Routers { static const starLockRegisterPage = '/StarLockRegisterPage'; // 注册 static const starLockForgetPasswordPage = '/StarLockForgetPasswordPage'; // 忘记密码 - static const seletCountryRegionPage = '/SeletCountryRegionPage'; // 选择国家和地区 + static const seletCountryRegionPage = '/SelectCountryRegionPage'; // 选择国家和地区 static const safetyVerificationPage = '/SafetyVerificationPage'; // 安全验证 static const keyOperationRecordPage = '/keyOperationRecordPage'; //钥匙详情-操作记录 @@ -372,7 +372,7 @@ abstract class Routers { static const webviewShowPage = '/webviewShowPage'; //网页 static const demoModeLockDetailPage = '/DemoModeLockDetailPage'; // 演示模式锁详情页 static const demoModeLockSetPage = '/DemoModeLockSetPage'; // 演示模式锁设置页 - static const addLockSeletCountryPage = '/AddLockSeletCountryPage'; // 演示模式锁设置页 + static const addLockSelectCountryPage = '/AddLockSelectCountryPage'; // 演示模式锁设置页 static const faceUnlockPage = '/faceUnlockPage'; //面容开锁设置 static const motorPowerPage = '/motorPowerPage'; //电机功率设置 static const openDoorDirectionPage = '/openDoorDirectionPage'; //开门方向设置 @@ -436,7 +436,7 @@ abstract class AppRouters { ), GetPage( name: Routers.seletLockTypePage, - page: () => const SeletLockTypePage(), + page: () => const SelectLockTypePage(), ), GetPage( name: Routers.LockMallPage, @@ -552,7 +552,7 @@ abstract class AppRouters { ), GetPage( name: Routers.seletCountryRegionPage, - page: () => const SeletCountryRegionPage(), + page: () => const SelectCountryRegionPage(), ), GetPage( name: Routers.lockSetPage, @@ -571,8 +571,8 @@ abstract class AppRouters { page: () => const EditLockNamePage(), ), GetPage( - name: Routers.lockSeletGroupingPage, - page: () => const LockSeletGroupingPage(), + name: Routers.lockSelectGroupingPage, + page: () => const LockSelectGroupingPage(), ), GetPage( name: Routers.adminOpenLockPasswordPage, @@ -592,7 +592,7 @@ abstract class AppRouters { ), GetPage( name: Routers.seletWirelessKeyboardPage, - page: () => const SeletWirelessKeyboardPage(), + page: () => const SelectWirelessKeyboardPage(), ), GetPage( name: Routers.doorMagneticPage, @@ -760,15 +760,15 @@ abstract class AppRouters { ), GetPage( name: Routers.seletGatewayTypePage, - page: () => const SeletGatewayTypePage(), + page: () => const SelectGatewayTypePage(), ), GetPage( name: Routers.seletGatewayTypeNextTipPage, - page: () => const SeletGatewayTypeNextTipPage(), + page: () => const SelectGatewayTypeNextTipPage(), ), GetPage( name: Routers.seletGatewayPage, - page: () => const SeletGatewayListPage(), + page: () => const SelectGatewayListPage(), ), GetPage( name: Routers.gatewayConfigurationWifiPage, @@ -924,8 +924,8 @@ abstract class AppRouters { name: Routers.demoModeLockDetailPage, page: () => const DemoModeLockDetailPage()), GetPage( - name: Routers.addLockSeletCountryPage, - page: () => const AddLockSeletCountryPage()), + name: Routers.addLockSelectCountryPage, + page: () => const AddLockSelectCountryPage()), GetPage(name: Routers.faceUnlockPage, page: () => const FaceUnlockPage()), GetPage(name: Routers.motorPowerPage, page: () => const MotorPowerPage()), GetPage( diff --git a/star_lock/lib/login/login/starLock_login_page.dart b/star_lock/lib/login/login/starLock_login_page.dart index 0d222bde..01569f7c 100644 --- a/star_lock/lib/login/login/starLock_login_page.dart +++ b/star_lock/lib/login/login/starLock_login_page.dart @@ -90,7 +90,7 @@ class _StarLockLoginPageState extends State { state.agree.value = !state.agree.value; logic.changeAgreeState(); }, - child: Image.asset(state.agree.value ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,) + child: Image.asset(state.agree.value ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,) )), SizedBox(width: 15.w,), Flexible( diff --git a/star_lock/lib/login/register/starLock_register_page.dart b/star_lock/lib/login/register/starLock_register_page.dart index f0a87275..96f00b9b 100644 --- a/star_lock/lib/login/register/starLock_register_page.dart +++ b/star_lock/lib/login/register/starLock_register_page.dart @@ -41,7 +41,7 @@ class _StarLockRegisterPageState extends State { body: ListView( padding: EdgeInsets.only(top: 40.h, left: 40.w, right: 40.w), children: [ - topSeletCountryAndRegionWidget(), + topSelectCountryAndRegionWidget(), middleTFWidget(), Obx(() { return SubmitBtn( @@ -65,7 +65,7 @@ class _StarLockRegisterPageState extends State { )); } - Widget topSeletCountryAndRegionWidget() { + Widget topSelectCountryAndRegionWidget() { return Column( children: [ SizedBox(height: 50.h), diff --git a/star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart b/star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart index 23398d7c..5b0aa532 100644 --- a/star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart +++ b/star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart @@ -11,14 +11,14 @@ import '../../tools/titleAppBar.dart'; import '../../translations/trans_lib.dart'; import 'common/index.dart'; -class SeletCountryRegionPage extends StatefulWidget { - const SeletCountryRegionPage({Key? key}) : super(key: key); +class SelectCountryRegionPage extends StatefulWidget { + const SelectCountryRegionPage({Key? key}) : super(key: key); @override - State createState() => _SeletCountryRegionPageState(); + State createState() => _SelectCountryRegionPageState(); } -class _SeletCountryRegionPageState extends State { +class _SelectCountryRegionPageState extends State { List countriesList = []; @override diff --git a/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart b/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart index 6025bac1..baaaaa87 100644 --- a/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart +++ b/star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart @@ -203,7 +203,7 @@ class _VolumeAuthorizationLockPageState CommonItem( leftTitel: TranslationLoader.lanKeys!.lock!.tr, rightTitle: _lockIdList.isEmpty - ? TranslationLoader.lanKeys!.pleaseSelet!.tr + ? TranslationLoader.lanKeys!.pleaseSelect!.tr : _lockIdList.length.toString(), isHaveDirection: true, action: () { diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart index e88f95e0..f7093db9 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 @@ -147,7 +147,7 @@ class _CheckingInAddHolidaysPageState extends State { child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 40.w, height: 40.w, ), diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart index cdac3263..058e60d0 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart @@ -33,8 +33,8 @@ class _CheckingInSetWorkdaySetState extends State { body: ListView( children: [ topBtnWidget(), - Obx(() => Visibility(visible: state.isCustom.value, child: bottomCustomSeletBtn())), - Obx(() => Visibility(visible: !state.isCustom.value, child: bottomOddOrEvenDaysOffSeletBtn())), + Obx(() => Visibility(visible: state.isCustom.value, child: bottomCustomSelectBtn())), + Obx(() => Visibility(visible: !state.isCustom.value, child: bottomOddOrEvenDaysOffSelectBtn())), SizedBox(height: 50.h,), Container( margin: EdgeInsets.only(left: 20.w, right: 20.w), @@ -113,7 +113,7 @@ class _CheckingInSetWorkdaySetState extends State { ); } - Widget bottomOddOrEvenDaysOffSeletBtn() { + Widget bottomOddOrEvenDaysOffSelectBtn() { return Container( padding: EdgeInsets.only(left: 10.w, right: 10.w), child: Column( @@ -138,7 +138,7 @@ class _CheckingInSetWorkdaySetState extends State { }, child: Row( children: [ - Image.asset(state.isSingledayWeekend.value == 0 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,), + Image.asset(state.isSingledayWeekend.value == 0 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,), ], ), ) @@ -158,7 +158,7 @@ class _CheckingInSetWorkdaySetState extends State { }, child: Row( children: [ - Image.asset(state.isSingledayWeekend.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,), + Image.asset(state.isSingledayWeekend.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,), ], ), ) @@ -168,7 +168,7 @@ class _CheckingInSetWorkdaySetState extends State { ); } - Widget bottomCustomSeletBtn() { + Widget bottomCustomSelectBtn() { return Container( padding: EdgeInsets.only(left: 10.w, right: 10.w), height: 420.h, @@ -224,7 +224,7 @@ class _CheckingInSetWorkdaySetState extends State { }, child: Obx(() => Row( children: [ - Image.asset(state.weekDays.value.contains(index) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,), + Image.asset(state.weekDays.value.contains(index) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,), ], ))) ); diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSeletKey_entity.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSelectKey_entity.dart similarity index 89% rename from star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSeletKey_entity.dart rename to star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSelectKey_entity.dart index 5c1e4e40..f153f5f5 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSeletKey_entity.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSelectKey_entity.dart @@ -1,14 +1,14 @@ -class CheckingInAddStaffSeletKeyEntity { +class CheckingInAddStaffSelectKeyEntity { int? errorCode; String? description; String? errorMsg; List? data; - CheckingInAddStaffSeletKeyEntity( + CheckingInAddStaffSelectKeyEntity( {this.errorCode, this.description, this.errorMsg, this.data}); - CheckingInAddStaffSeletKeyEntity.fromJson(Map json) { + CheckingInAddStaffSelectKeyEntity.fromJson(Map json) { errorCode = json['errorCode']; description = json['description']; errorMsg = json['errorMsg']; @@ -49,4 +49,4 @@ class CheckingInAddStaffKeyEntity { data['staffName'] = staffName; return data; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart index 7af0effb..eab2e49a 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../../network/api_repository.dart'; import '../../../../../tools/eventBusEventManage.dart'; -import 'checkingInAddStaffSeletKey_entity.dart'; +import 'checkingInAddStaffSelectKey_entity.dart'; import 'checkingInAddStaff_state.dart'; typedef KeyClickCallback = void Function(List seletKeyList); @@ -78,8 +78,8 @@ class CheckingInAddStaffLogic extends BaseGetXController{ } // 考勤设置添加员工-选择钥匙 1为APP，2为密码，3为卡，4为指纹，返回数据中，attendanceWay分别为用户名、密码、卡号、指纹号 - void addStaffSeletKey(KeyClickCallback kyClickCallback) async{ - var entity = await ApiRepository.to.addStaffSeletKeyData( + void addStaffSelectKey(KeyClickCallback kyClickCallback) async{ + var entity = await ApiRepository.to.addStaffSelectKeyData( companyId: state.companyId.value, type:state.seletPrintingMethodType.value, ); @@ -212,4 +212,4 @@ class CheckingInAddStaffLogic extends BaseGetXController{ _getNumberEvent!.cancel(); } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart index a7b4cdf4..f0dd9d41 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 @@ -49,7 +49,7 @@ class _CheckingInAddStaffPageState extends State { isHaveDirection: true, action: () { var list = ["APP", "密码", "卡", "指纹"]; - _showSeletClockInType(list, "1"); + _showSelectClockInType(list, "1"); })), SizedBox( height: 10.h, @@ -143,7 +143,7 @@ class _CheckingInAddStaffPageState extends State { style: ElevatedButton.styleFrom( backgroundColor: AppColors.mainColor, ), - child: Text(addStaffSeletKeyType(), + child: Text(addStaffSelectKeyType(), style: TextStyle( color: Colors.white, fontSize: 22.sp)), onPressed: () async { @@ -210,12 +210,12 @@ class _CheckingInAddStaffPageState extends State { isHaveLine: false, isHaveDirection: true, action: () { - logic.addStaffSeletKey((v) { + logic.addStaffSelectKey((v) { var list = []; for (var element in v) { list.add(element.attendanceWay); } - _showSeletClockInType(list, "2"); + _showSelectClockInType(list, "2"); }); }), )), @@ -279,7 +279,7 @@ class _CheckingInAddStaffPageState extends State { } // type 1 打卡方式 2选择钥匙 - void _showSeletClockInType(List list, String type) { + void _showSelectClockInType(List list, String type) { ShowBottomSheetTool().showSingleRowPicker( //上下文 context, @@ -317,7 +317,7 @@ class _CheckingInAddStaffPageState extends State { Image.asset( appUnHaveAccount ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + : 'images/icon_round_unSelect.png', width: 26.w, height: 26.w, ), @@ -373,7 +373,7 @@ class _CheckingInAddStaffPageState extends State { return title; } - String addStaffSeletKeyType() { + String addStaffSelectKeyType() { String title = ""; switch (int.parse(state.seletPrintingMethodType.value)) { case 1: diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart index d342c1ae..3232f61d 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import '../../../../lockMian/entity/lockListInfo_entity.dart'; import '../checkingInSetStaffList/checkingInStaffList_entity.dart'; -import 'checkingInAddStaffSeletKey_entity.dart'; +import 'checkingInAddStaffSelectKey_entity.dart'; class CheckingInAddStaffState{ final getKeyInfosData = LockListInfoItemEntity().obs; @@ -62,4 +62,4 @@ class CheckingInAddStaffState{ } } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart index f7a68770..31fe9026 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart @@ -260,7 +260,7 @@ class _MassSendElectronicKeyPageState extends State { CommonItem( leftTitel: TranslationLoader.lanKeys!.lock!.tr, rightTitle: _lockIdList.isEmpty - ? TranslationLoader.lanKeys!.pleaseSelet!.tr + ? TranslationLoader.lanKeys!.pleaseSelect!.tr : _lockIdList.length.toString(), isHaveDirection: true, action: () { diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_page.dart index 46738132..75f6b599 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 @@ -202,7 +202,7 @@ class _LockUserListPageState extends State { child: Image.asset( itemData.isCheck! ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, )), diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart index b3240f85..a0d4a2bb 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart @@ -67,7 +67,7 @@ class massSendLockGroupCell extends StatelessWidget { Image.asset( itemData.isChecked ? "images/icon_round_selet.png" - : "images/icon_round_unSelet.png", + : "images/icon_round_unSelect.png", width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_page.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_page.dart rename to star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_page.dart diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart similarity index 100% rename from star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart rename to star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_logic.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_logic.dart similarity index 100% rename from star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_logic.dart rename to star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_logic.dart diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_page.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart similarity index 100% rename from star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_page.dart rename to star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart diff --git a/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_state.dart b/star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_state.dart similarity index 100% rename from star_lock/lib/main/lockDetail/fingerprint/addFingerprintSeletType/addFingerprintType_state.dart rename to star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_state.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart index 51de02dc..e7dd398c 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart @@ -97,7 +97,7 @@ class _BasicInformationPageState extends State { isHaveLine: true, isHaveDirection: true, action: () async { - Get.toNamed(Routers.lockSeletGroupingPage, arguments: { + Get.toNamed(Routers.lockSelectGroupingPage, arguments: { 'lockSetInfoData': state.lockSetInfoData.value })! .then((val) { diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockGroupList_entity.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockGroupList_entity.dart similarity index 100% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockGroupList_entity.dart rename to star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockGroupList_entity.dart diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_logic.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_logic.dart similarity index 92% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_logic.dart rename to star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_logic.dart index 6d9401f7..3921368b 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_logic.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_logic.dart @@ -3,10 +3,10 @@ import '../../../../../network/api_repository.dart'; import '../../../../../tools/baseGetXController.dart'; import '../../../../../tools/eventBusEventManage.dart'; import '../../../electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart'; -import 'lockSeletGrouping_state.dart'; +import 'lockSelectGrouping_state.dart'; -class LockSeletGroupingLogic extends BaseGetXController { - final LockSeletGroupingState state = LockSeletGroupingState(); +class LockSelectGroupingLogic extends BaseGetXController { + final LockSelectGroupingState state = LockSelectGroupingState(); //创建锁分组请求 Future addLockGroupRequest() async { @@ -64,4 +64,4 @@ class LockSeletGroupingLogic extends BaseGetXController { // TODO: implement onClose } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart similarity index 88% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart rename to star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart index a0480e27..667779de 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart @@ -10,18 +10,18 @@ import '../../../../../tools/noData.dart'; import '../../../../../tools/submitBtn.dart'; import '../../../../../tools/titleAppBar.dart'; import '../../../../../translations/trans_lib.dart'; -import 'lockSeletGrouping_logic.dart'; +import 'lockSelectGrouping_logic.dart'; -class LockSeletGroupingPage extends StatefulWidget { - const LockSeletGroupingPage({Key? key}) : super(key: key); +class LockSelectGroupingPage extends StatefulWidget { + const LockSelectGroupingPage({Key? key}) : super(key: key); @override - State createState() => _LockSeletGroupingPageState(); + State createState() => _LockSelectGroupingPageState(); } -class _LockSeletGroupingPageState extends State { - final logic = Get.put(LockSeletGroupingLogic()); - final state = Get.find().state; +class _LockSelectGroupingPageState extends State { + final logic = Get.put(LockSelectGroupingLogic()); + final state = Get.find().state; @override Widget build(BuildContext context) { diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_state.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_state.dart similarity index 90% rename from star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_state.dart rename to star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_state.dart index 479a01cd..d7554f96 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSeletGrouping/lockSeletGrouping_state.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/lockSelectGrouping/lockSelectGrouping_state.dart @@ -6,16 +6,16 @@ import 'package:get/get.dart'; import '../../../electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart'; import '../../lockSet/lockSetInfo_entity.dart'; -class LockSeletGroupingState { +class LockSelectGroupingState { var lockSetInfoData = LockSetInfoData().obs; var lockBasicInfo = LockBasicInfo().obs; var groupList = [].obs; final TextEditingController changeNameController = TextEditingController(); - LockSeletGroupingState() { + LockSelectGroupingState() { var map = Get.arguments; lockSetInfoData.value = map["lockSetInfoData"]; lockBasicInfo.value = lockSetInfoData.value.lockBasicInfo!; } -} \ No newline at end of file +} diff --git a/star_lock/lib/main/lockDetail/lcokSet/importOtherLockData/ImportOtherLockData_page.dart b/star_lock/lib/main/lockDetail/lcokSet/importOtherLockData/ImportOtherLockData_page.dart index 5b4f6329..faead0db 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/importOtherLockData/ImportOtherLockData_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/importOtherLockData/ImportOtherLockData_page.dart @@ -105,7 +105,7 @@ class _ImportOtherLockDataPageState extends State { return ListView.separated( itemCount: 2, itemBuilder: (c, index) { - return _electronicKeyItem('images/icon_round_unSelet.png', "张三", + return _electronicKeyItem('images/icon_round_unSelect.png', "张三", "2023.6.21 11.15", "2023.6.21 11.15", index,() { // Navigator.pushNamed(context, Routers.electronicKeyDetailPage); }); diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_page.dart b/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_page.dart index 718fc307..957d6b3e 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/lockSoundSet/lockSoundSet_page.dart @@ -70,7 +70,7 @@ class _LockSoundSetPageState extends State with RouteAware { children: [ CommonItem( leftTitel: TranslationLoader - .lanKeys!.pleaseSeletLockVolume!.tr, + .lanKeys!.pleaseSelectLockVolume!.tr, rightTitle: "", isHaveLine: true), CommonItem( @@ -87,7 +87,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -108,7 +108,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 2 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 2 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -129,7 +129,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 3 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 3 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -150,7 +150,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 4 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 4 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -171,7 +171,7 @@ class _LockSoundSetPageState extends State with RouteAware { child: Row( children: [ Image.asset( - state.lockSoundLevel.value == 5 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.lockSoundLevel.value == 5 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_page.dart b/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_page.dart index d41f1087..20adf3bc 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/lockUser/lockUser_page.dart @@ -157,7 +157,7 @@ class _LockUserPageState extends State { Obx(() => Image.asset( state.isCheck.value == true ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, )), diff --git a/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_page.dart b/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_page.dart index 10224bf2..bcbc7f4c 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/markedHouseState/markedHouseState_page.dart @@ -44,7 +44,7 @@ class _MarkedHouseStatePageState extends State { child: Row( children: [ Image.asset( - state.roomStatus.value == 0 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.roomStatus.value == 0 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -65,7 +65,7 @@ class _MarkedHouseStatePageState extends State { child: Row( children: [ Image.asset( - state.roomStatus.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.roomStatus.value == 1 ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart b/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart index 1e7ad2e2..97ae337c 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart @@ -159,7 +159,7 @@ class _CoerceFingerprintListPageState extends State { Obx(() => Image.asset( state.isCheck.value == true ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, )), diff --git a/star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_page.dart b/star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_page.dart index 9fd3bed0..22971a8e 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/normallyOpenMode/normallyOpenMode_page.dart @@ -254,7 +254,7 @@ class _NormallyOpenModePageState extends State with RouteA Image.asset( state.isAllDay.value == 1 ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart b/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart index e283a5c4..476dbeae 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart @@ -7,15 +7,15 @@ import '../../../../../app_settings/app_colors.dart'; import '../../../../../tools/titleAppBar.dart'; import '../../../../../translations/trans_lib.dart'; -class SeletWirelessKeyboardPage extends StatefulWidget { - const SeletWirelessKeyboardPage({Key? key}) : super(key: key); +class SelectWirelessKeyboardPage extends StatefulWidget { + const SelectWirelessKeyboardPage({Key? key}) : super(key: key); @override - State createState() => - _SeletWirelessKeyboardPageState(); + State createState() => + _SelectWirelessKeyboardPageState(); } -class _SeletWirelessKeyboardPageState extends State { +class _SelectWirelessKeyboardPageState extends State { List dataList = []; @override Widget build(BuildContext context) { diff --git a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart index 3fb69069..a2f4a345 100644 --- a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart +++ b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart @@ -33,7 +33,7 @@ class _EditVideoLogPageState extends State { style: TextStyle(color: Colors.white, fontSize: 24.sp), ), onPressed: () async { - state.isSeletAll.value = !state.isSeletAll.value; + state.isSelectAll.value = !state.isSelectAll.value; }, ), ], @@ -115,7 +115,7 @@ class _EditVideoLogPageState extends State { onTap: (){ }, - child: Image(width: 40.w, height: 40.w, image: state.isSeletAll.value ? const AssetImage("images/icon_round_selet.png") : const AssetImage("images/icon_round_unSelet.png")) + child: Image(width: 40.w, height: 40.w, image: state.isSelectAll.value ? const AssetImage("images/icon_round_selet.png") : const AssetImage("images/icon_round_unSelect.png")) ) ), ) diff --git a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart index a5f8f4f5..270020a6 100644 --- a/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart +++ b/star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart @@ -5,6 +5,6 @@ import 'package:get/get.dart'; class EditVideoLogState{ var seletVideoLog = 0.obs; - var isSeletAll = false.obs; + var isSelectAll = false.obs; -} \ No newline at end of file +} diff --git a/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_logic.dart b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_logic.dart new file mode 100644 index 00000000..ffc9f8b6 --- /dev/null +++ b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_logic.dart @@ -0,0 +1,8 @@ + +import '../../../tools/baseGetXController.dart'; +import 'addLockSelectCountry_state.dart'; + +class AddLockSelectCountryLogic extends BaseGetXController { + AddLockSelectCountryState state = AddLockSelectCountryState(); + +} diff --git a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart similarity index 92% rename from star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart rename to star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart index 9fabbe5f..cc7e599b 100644 --- a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_page.dart +++ b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart @@ -13,18 +13,18 @@ import '../../../network/api_repository.dart'; import '../../../tools/commonItem.dart'; import '../../../tools/titleAppBar.dart'; import '../../../translations/trans_lib.dart'; -import 'addLockSeletCountry_logic.dart'; +import 'addLockSelectCountry_logic.dart'; -class AddLockSeletCountryPage extends StatefulWidget { - const AddLockSeletCountryPage({Key? key}) : super(key: key); +class AddLockSelectCountryPage extends StatefulWidget { + const AddLockSelectCountryPage({Key? key}) : super(key: key); @override - State createState() => _AddLockSeletCountryPageState(); + State createState() => _AddLockSelectCountryPageState(); } -class _AddLockSeletCountryPageState extends State { - final logic = Get.put(AddLockSeletCountryLogic()); - final state = Get.find().state; +class _AddLockSelectCountryPageState extends State { + final logic = Get.put(AddLockSelectCountryLogic()); + final state = Get.find().state; List countriesList = []; int seletindex = 10000; @@ -104,7 +104,7 @@ class _AddLockSeletCountryPageState extends State { }, rightWidget: Row( children: [ - Image.asset((seletindex == index) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w,), + Image.asset((seletindex == index) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,), ], ) ); diff --git a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_state.dart b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_state.dart similarity index 87% rename from star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_state.dart rename to star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_state.dart index e04acc2d..92f0bd30 100644 --- a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_state.dart +++ b/star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_state.dart @@ -1,14 +1,14 @@ import 'package:get/get.dart'; -class AddLockSeletCountryState{ +class AddLockSelectCountryState{ var pwdTimestamp= 0.obs; var lockInfo = {}; var featureValue = ''; var featureSettingValue = ''; var featureSettingParams = []; - AddLockSeletCountryState() { + AddLockSelectCountryState() { Map map = Get.arguments; pwdTimestamp.value = map["pwdTimestamp"]; lockInfo = map["lockInfo"]; diff --git a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_logic.dart b/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_logic.dart deleted file mode 100644 index 1a85f750..00000000 --- a/star_lock/lib/mine/addLock/addLockSeletCountry/addLockSeletCountry_logic.dart +++ /dev/null @@ -1,8 +0,0 @@ - -import '../../../tools/baseGetXController.dart'; -import 'addLockSeletCountry_state.dart'; - -class AddLockSeletCountryLogic extends BaseGetXController { - AddLockSeletCountryState state = AddLockSeletCountryState(); - -} \ No newline at end of file diff --git a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart index f63ec119..b385a5b0 100644 --- a/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart +++ b/star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart @@ -245,7 +245,7 @@ class _LockAddressGaoDePageState extends State with RouteA style: TextStyle(color: Colors.black, fontSize: 24.sp), ), onPressed: () { - Get.toNamed(Routers.addLockSeletCountryPage, arguments: { + Get.toNamed(Routers.addLockSelectCountryPage, arguments: { "addressInfo": {}, "pwdTimestamp": state.pwdTimestamp.value, "lockInfo": state.lockInfo, diff --git a/star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart b/star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart index 5375ae7a..1c7f2bf9 100644 --- a/star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart +++ b/star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart @@ -11,14 +11,14 @@ import '../../../baseWidget.dart'; import '../../../tools/titleAppBar.dart'; import '../../../translations/trans_lib.dart'; -class SeletLockTypePage extends StatefulWidget { - const SeletLockTypePage({Key? key}) : super(key: key); +class SelectLockTypePage extends StatefulWidget { + const SelectLockTypePage({Key? key}) : super(key: key); @override - State createState() => _SeletLockTypePageState(); + State createState() => _SelectLockTypePageState(); } -class _SeletLockTypePageState extends State with BaseWidget { +class _SelectLockTypePageState extends State with BaseWidget { @override Widget build(BuildContext context) { return Scaffold( diff --git a/star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart b/star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart index b027e313..d04ae881 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart @@ -7,14 +7,14 @@ import '../../../../app_settings/app_colors.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; -class SeletGatewayListPage extends StatefulWidget { - const SeletGatewayListPage({Key? key}) : super(key: key); +class SelectGatewayListPage extends StatefulWidget { + const SelectGatewayListPage({Key? key}) : super(key: key); @override - State createState() => _SeletGatewayListPageState(); + State createState() => _SelectGatewayListPageState(); } -class _SeletGatewayListPageState extends State { +class _SelectGatewayListPageState extends State { @override Widget build(BuildContext context) { return Scaffold( diff --git a/star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart b/star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart index a2001929..19285235 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart @@ -7,14 +7,14 @@ import '../../../../app_settings/app_colors.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; -class SeletGatewayTypePage extends StatefulWidget { - const SeletGatewayTypePage({Key? key}) : super(key: key); +class SelectGatewayTypePage extends StatefulWidget { + const SelectGatewayTypePage({Key? key}) : super(key: key); @override - State createState() => _SeletGatewayTypePageState(); + State createState() => _SelectGatewayTypePageState(); } -class _SeletGatewayTypePageState extends State { +class _SelectGatewayTypePageState extends State { @override Widget build(BuildContext context) { return Scaffold( diff --git a/star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart b/star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart index 7a414682..7518d3b5 100644 --- a/star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart +++ b/star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart @@ -8,16 +8,16 @@ import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; -class SeletGatewayTypeNextTipPage extends StatefulWidget { - const SeletGatewayTypeNextTipPage({Key? key}) : super(key: key); +class SelectGatewayTypeNextTipPage extends StatefulWidget { + const SelectGatewayTypeNextTipPage({Key? key}) : super(key: key); @override - State createState() => - _SeletGatewayTypeNextTipPageState(); + State createState() => + _SelectGatewayTypeNextTipPageState(); } -class _SeletGatewayTypeNextTipPageState - extends State { +class _SelectGatewayTypeNextTipPageState + extends State { @override Widget build(BuildContext context) { return Scaffold( diff --git a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart index edd5b8fb..c5ee01be 100644 --- a/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart +++ b/star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart @@ -134,7 +134,7 @@ class _AddAuthorizedAdministratorPageState extends State Row( children: [ Image.asset( - state.isCheckAll.value ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + state.isCheckAll.value ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -157,7 +157,7 @@ class _APPUnlockNeedMobileNetworkingLockPageState extends State { ), Image.asset( isNameSelect == false - ? 'images/icon_round_unSelet.png' + ? 'images/icon_round_unSelect.png' : 'images/icon_round_selet.png', width: 30.sp, height: 30.sp, diff --git a/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart b/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart index 8dd83f30..d5078fa1 100644 --- a/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart +++ b/star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart @@ -117,7 +117,7 @@ class _GetNameListPageState extends State { )), Image.asset( isNameSelect == false - ? 'images/icon_round_unSelet.png' + ? 'images/icon_round_unSelect.png' : 'images/icon_round_selet.png', width: 30.sp, height: 30.sp, diff --git a/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart b/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart index cc1bd86c..cac0f902 100644 --- a/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart +++ b/star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart @@ -98,7 +98,7 @@ class _GroupEditLockPageState extends State { child: Image.asset( itemData.isChecked ? 'images/icon_round_selet.png' - : 'images/icon_round_unSelet.png', + : 'images/icon_round_unSelect.png', width: 35.w, height: 35.w, ), diff --git a/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart b/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart index d59b9f82..3d8fa6ec 100644 --- a/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart +++ b/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart @@ -34,11 +34,11 @@ class _SelectGetewayListPageState extends State { onPressed: () { setState(() { for (var element in state.getewayListData.value) { - if(state.isSeletAll == true){ - state.isSeletAll = false; + if(state.isSelectAll == true){ + state.isSelectAll = false; element.selet = 0; }else{ - state.isSeletAll = true; + state.isSelectAll = true; element.selet = 1; } } @@ -105,7 +105,7 @@ class _SelectGetewayListPageState extends State { ), GestureDetector( child: Image.asset( - (getewayItemData.selet == 1) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', + (getewayItemData.selet == 1) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_state.dart b/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_state.dart index ca418a08..45a4ea5c 100644 --- a/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_state.dart +++ b/star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_state.dart @@ -7,5 +7,5 @@ import 'selectGetewayList_entity.dart'; class SelectGetewayListState{ var getewayListData = [].obs; final TextEditingController searchController = TextEditingController(); - bool isSeletAll = false; -} \ No newline at end of file + bool isSelectAll = false; +} diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart index 1e2296a3..fc94902f 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart @@ -34,17 +34,17 @@ class _TransferSmartLockPageState extends State { onPressed: () { setState(() { for (var element in state.transferSmartLockListData.value) { - if(state.isSeletAll == true){ - state.isSeletAll = false; + if(state.isSelectAll == true){ + state.isSelectAll = false; element.selet = 0; }else{ - state.isSeletAll = true; + state.isSelectAll = true; element.selet = 1; } } }); }, - child: Text(state.isSeletAll == true ? TranslationLoader.lanKeys!.checkAll!.tr : TranslationLoader.lanKeys!.cancel!.tr, style: TextStyle(color: Colors.white, fontSize: 24.sp))) + child: Text(state.isSelectAll == true ? TranslationLoader.lanKeys!.checkAll!.tr : TranslationLoader.lanKeys!.cancel!.tr, style: TextStyle(color: Colors.white, fontSize: 24.sp))) ], ), body: Column( @@ -149,7 +149,7 @@ class _TransferSmartLockPageState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ SizedBox(width: 20.w), - Image.asset((transferSmartLockItemData.selet == 1) ? 'images/icon_round_selet.png' : 'images/icon_round_unSelet.png', width: 30.w, height: 30.w), + Image.asset((transferSmartLockItemData.selet == 1) ? 'images/icon_round_selet.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), diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_state.dart b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_state.dart index fb777983..bd6670d8 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_state.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_state.dart @@ -7,5 +7,5 @@ import 'transferSmartLock_entity.dart'; class TransferSmartLockState{ var transferSmartLockListData = [].obs; final TextEditingController searchController = TextEditingController(); - bool isSeletAll = false; -} \ No newline at end of file + bool isSelectAll = false; +} diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart index aec6c818..1102058a 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesEmailTemplate/valueAddedServicesAddEmailTemplate/valueAddedServicesAddEmailTemplate_page.dart @@ -151,7 +151,7 @@ class _ValueAddedServicesAddEmailTemplatePageState rightTitle: TranslationLoader.lanKeys!.password!.tr, isHaveLine: false, action: () { - _showSeletTemplateType(); + _showSelectTemplateType(); }), ], ); @@ -306,7 +306,7 @@ class _ValueAddedServicesAddEmailTemplatePageState ); } - void _showSeletTemplateType() { + void _showSelectTemplateType() { var list = [ TranslationLoader.lanKeys!.electronicKey!.tr, TranslationLoader.lanKeys!.password!.tr diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart index 5deb473b..5a5c495b 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart @@ -125,7 +125,7 @@ class _ValueAddedServicesRealNamePageState padding: EdgeInsets.only(top: 20.h, bottom: 20.h, left: 30.w), child: Text( TranslationLoader - .lanKeys!.buyRealNameSeletYouWantBuyTip!.tr, + .lanKeys!.buyRealNameSelectYouWantBuyTip!.tr, style: TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600), )), @@ -142,7 +142,7 @@ class _ValueAddedServicesRealNamePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -160,7 +160,7 @@ class _ValueAddedServicesRealNamePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -178,7 +178,7 @@ class _ValueAddedServicesRealNamePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), @@ -196,7 +196,7 @@ class _ValueAddedServicesRealNamePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart index e91ec221..09b5c7b7 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart @@ -124,7 +124,7 @@ class _ValueAddedServicesAddSMSTemplatePageState rightTitle: TranslationLoader.lanKeys!.password!.tr, isHaveLine: false, action: () { - _showSeletTemplateType(); + _showSelectTemplateType(); }), ], ); @@ -250,7 +250,7 @@ class _ValueAddedServicesAddSMSTemplatePageState child: Row( children: [ Image.asset( - 'images/icon_round_unSelet.png', + 'images/icon_round_unSelect.png', width: 26.w, height: 26.w, ), @@ -466,7 +466,7 @@ class _ValueAddedServicesAddSMSTemplatePageState ); } - void _showSeletTemplateType() { + void _showSelectTemplateType() { var list = [ TranslationLoader.lanKeys!.electronicKey!.tr, TranslationLoader.lanKeys!.password!.tr diff --git a/star_lock/lib/network/api.dart b/star_lock/lib/network/api.dart index 8387c18e..f1d52ef7 100644 --- a/star_lock/lib/network/api.dart +++ b/star_lock/lib/network/api.dart @@ -88,7 +88,7 @@ abstract class Api { final String getStaffListURL = '/staff/list'; // 获取员工列表 final String addStaffURL = '/staff/add'; // 添加员工 final String editStaffURL = '/staff/update'; // 编辑员工 - final String addStaffSeletKeyURL = '/staff/attendanceList'; // 考勤设置添加员工-选择钥匙 + final String addStaffSelectKeyURL = '/staff/attendanceList'; // 考勤设置添加员工-选择钥匙 final String addHolidaysURL = '/vacation/add'; // 添加假期 final String holidaysListURL = '/vacation/list'; // 假期列表 final String holidaysDeleteURL = '/vacation/delete'; // 假期删除 diff --git a/star_lock/lib/network/api_provider.dart b/star_lock/lib/network/api_provider.dart index 6ec68b45..449a75e6 100644 --- a/star_lock/lib/network/api_provider.dart +++ b/star_lock/lib/network/api_provider.dart @@ -807,8 +807,8 @@ class ApiProvider extends BaseProvider { })); // 添加员工选择钥匙 - Future addStaffSeletKeyData(String companyId, String type) => post( - addStaffSeletKeyURL.toUrl, + Future addStaffSelectKeyData(String companyId, String type) => post( + addStaffSelectKeyURL.toUrl, jsonEncode({ 'companyId': companyId, 'type': type, diff --git a/star_lock/lib/network/api_repository.dart b/star_lock/lib/network/api_repository.dart index f13b04c6..92981db2 100644 --- a/star_lock/lib/network/api_repository.dart +++ b/star_lock/lib/network/api_repository.dart @@ -28,7 +28,7 @@ import '../main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/c import '../main/lockDetail/checkingIn/checkingInList/checkingInListDay_entity.dart'; import '../main/lockDetail/checkingIn/checkingInList/checkingInListMonth_entity.dart'; import '../main/lockDetail/checkingIn/checkingInSet/checkingInSet_entity.dart'; -import '../main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSeletKey_entity.dart'; +import '../main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaffSelectKey_entity.dart'; import '../main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_entity.dart'; import '../main/lockDetail/fingerprint/addFingerprint/addFingerprint_entity.dart'; import '../main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart'; @@ -1041,12 +1041,12 @@ class ApiRepository { } // 添加员工选择钥匙 - Future addStaffSeletKeyData({ + Future addStaffSelectKeyData({ required String companyId, required String type, }) async { - final res = await apiProvider.addStaffSeletKeyData(companyId, type); - return CheckingInAddStaffSeletKeyEntity.fromJson(res.body); + final res = await apiProvider.addStaffSelectKeyData(companyId, type); + return CheckingInAddStaffSelectKeyEntity.fromJson(res.body); } // 添加假期 diff --git a/star_lock/lib/tools/ExpandedListView.dart b/star_lock/lib/tools/ExpandedListView.dart index 0c4247e4..d735df2c 100644 --- a/star_lock/lib/tools/ExpandedListView.dart +++ b/star_lock/lib/tools/ExpandedListView.dart @@ -65,7 +65,7 @@ class _ExpandedListTileState extends State { Image.asset( _isCheck ? "images/icon_round_selet.png" - : "images/icon_round_unSelet.png", + : "images/icon_round_unSelect.png", width: 30.w, height: 30.w, ), diff --git a/star_lock/lib/tools/seletImgTool.dart b/star_lock/lib/tools/seletImgTool.dart index b39ca539..81434158 100644 --- a/star_lock/lib/tools/seletImgTool.dart +++ b/star_lock/lib/tools/seletImgTool.dart @@ -7,7 +7,7 @@ import 'package:image_picker/image_picker.dart'; typedef BlockImgCallback = void Function(dynamic imgStr); -class SeletImageTool { +class SelectImageTool { // 实例化ImagePicker final ImagePicker _picker = ImagePicker(); ImageProvider? _imageProvider; @@ -53,4 +53,4 @@ class SeletImageTool { } } } -} \ No newline at end of file +} diff --git a/star_lock/lib/tools/showCalendar.dart b/star_lock/lib/tools/showCalendar.dart index f457b809..2ac0b7aa 100644 --- a/star_lock/lib/tools/showCalendar.dart +++ b/star_lock/lib/tools/showCalendar.dart @@ -3,10 +3,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -typedef SeletDateCallback(DateTime dateTime); +typedef SelectDateCallback(DateTime dateTime); class ShowCalendar extends StatelessWidget { - SeletDateCallback? seletAction; + SelectDateCallback? seletAction; DatePickerMode? datePickerMode; ShowCalendar({Key? key, this.seletAction, this.datePickerMode}) : super(key: key); diff --git a/star_lock/lib/tools/showSeletDateTime.dart b/star_lock/lib/tools/showSeletDateTime.dart index 9e734ec5..6110936a 100644 --- a/star_lock/lib/tools/showSeletDateTime.dart +++ b/star_lock/lib/tools/showSeletDateTime.dart @@ -7,7 +7,7 @@ import '../translations/trans_lib.dart'; typedef DateValueCallback(DateTime dateTime, List selectedIndex); -class ShowSeletDateTime { +class ShowSelectDateTime { void showDatePicker(BuildContext context, String maxT, String minT, String nowDate, String formatStr, DateValueCallback onConfirm,) { // String MIN_DATETIME = '1900-01-01 00:00'; diff --git a/star_lock/lib/translations/lanKeyEntity.dart b/star_lock/lib/translations/lanKeyEntity.dart index 41076492..e9f307d7 100644 --- a/star_lock/lib/translations/lanKeyEntity.dart +++ b/star_lock/lib/translations/lanKeyEntity.dart @@ -49,7 +49,7 @@ class LanKeyEntity { this.sendGroupKey, this.lock, this.pleaseAdd, - this.pleaseSelet, + this.pleaseSelect, this.remoteUnlockingAllowed, this.pleaseEnter, this.getPassword, @@ -135,7 +135,7 @@ class LanKeyEntity { this.allDay, this.save, this.normallyOpenModeTip, - this.pleaseSeletLockVolume, + this.pleaseSelectLockVolume, this.lockSoundTip, this.low, this.lower, @@ -337,7 +337,7 @@ class LanKeyEntity { this.customMailTemplate, this.record, this.buyRealNameTip, - this.buyRealNameSeletYouWantBuyTip, + this.buyRealNameSelectYouWantBuyTip, this.forTheFirstTime, this.onceDay, this.weekOnce, @@ -509,7 +509,7 @@ class LanKeyEntity { sendGroupKey = json['sendGroupKey']; lock = json['lock']; pleaseAdd = json['pleaseAdd']; - pleaseSelet = json['pleaseSelet']; + pleaseSelect = json['pleaseSelect']; remoteUnlockingAllowed = json['remoteUnlockingAllowed']; pleaseEnter = json['pleaseEnter']; getPassword = json['getPassword']; @@ -553,7 +553,7 @@ class LanKeyEntity { allDay = json['allDay']; save = json['save']; normallyOpenModeTip = json['normallyOpenModeTip']; - pleaseSeletLockVolume = json['pleaseSeletLockVolume']; + pleaseSelectLockVolume = json['pleaseSelectLockVolume']; lockSoundTip = json['lockSoundTip']; low = json['low']; lower = json['lower']; @@ -817,7 +817,7 @@ class LanKeyEntity { record = json['record']; buyRealNameTip = json['buyRealNameTip']; - buyRealNameSeletYouWantBuyTip = json['buyRealNameSeletYouWantBuyTip']; + buyRealNameSelectYouWantBuyTip = json['buyRealNameSelectYouWantBuyTip']; forTheFirstTime = json['forTheFirstTime']; onceDay = json['onceDay']; weekOnce = json['weekOnce']; @@ -1000,7 +1000,7 @@ class LanKeyEntity { String? sendGroupKey; String? lock; String? pleaseAdd; - String? pleaseSelet; + String? pleaseSelect; String? remoteUnlockingAllowed; String? pleaseEnter; String? getPassword; @@ -1044,7 +1044,7 @@ class LanKeyEntity { String? allDay; String? save; String? normallyOpenModeTip; - String? pleaseSeletLockVolume; + String? pleaseSelectLockVolume; String? lockSoundTip; String? low; String? lower; @@ -1299,7 +1299,7 @@ class LanKeyEntity { String? record; String? buyRealNameTip; - String? buyRealNameSeletYouWantBuyTip; + String? buyRealNameSelectYouWantBuyTip; String? forTheFirstTime; String? onceDay; String? weekOnce; @@ -1480,7 +1480,7 @@ class LanKeyEntity { map['sendGroupKey'] = sendGroupKey; map['lock'] = lock; map['pleaseAdd'] = pleaseAdd; - map['pleaseSelet'] = pleaseSelet; + map['pleaseSelect'] = pleaseSelect; map['remoteUnlockingAllowed'] = remoteUnlockingAllowed; map['pleaseEnter'] = pleaseEnter; map['getPassword'] = getPassword; @@ -1525,7 +1525,7 @@ class LanKeyEntity { map['allDay'] = allDay; map['save'] = save; map['normallyOpenModeTip'] = normallyOpenModeTip; - map['pleaseSeletLockVolume'] = pleaseSeletLockVolume; + map['pleaseSelectLockVolume'] = pleaseSelectLockVolume; map['lockSoundTip'] = lockSoundTip; map['low'] = low; map['lower'] = lower; @@ -1785,7 +1785,7 @@ class LanKeyEntity { map['record'] = record; map['buyRealNameTip'] = buyRealNameTip; - map['buyRealNameSeletYouWantBuyTip'] = buyRealNameSeletYouWantBuyTip; + map['buyRealNameSelectYouWantBuyTip'] = buyRealNameSelectYouWantBuyTip; map['forTheFirstTime'] = forTheFirstTime; map['onceDay'] = onceDay; map['weekOnce'] = weekOnce; diff --git a/star_lock/macos/Flutter/GeneratedPluginRegistrant.swift b/star_lock/macos/Flutter/GeneratedPluginRegistrant.swift index 84d8c391..c5353af6 100644 --- a/star_lock/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/star_lock/macos/Flutter/GeneratedPluginRegistrant.swift @@ -19,6 +19,7 @@ import path_provider_foundation import shared_preferences_foundation import sqflite import url_launcher_macos +import video_player_avfoundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AjCaptchaFlutterPlugin.register(with: registry.registrar(forPlugin: "AjCaptchaFlutterPlugin")) @@ -35,4 +36,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) + FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin")) }