sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复错别字 selet2

Browse Source
This commit is contained in:
葛佳祥 2024-01-23 17:48:06 +08:00
parent 66730d2c42
commit d57361a626
105 changed files with 287 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
star_lock/images/icon_round_selet.png → star_lock/images/icon_round_select.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
star_lock/images/icon_round_unSelet.png → star_lock/images/icon_round_unSelect.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
star_lock/images/icon_round_white_unSelet.png → star_lock/images/icon_round_white_unSelect.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

16
star_lock/images/lan/lan_en.json
View File

@ -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",

16
star_lock/images/lan/lan_keys.json
View File

@ -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",

16
star_lock/images/lan/lan_zh.json
View File

@ -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":"获取指纹",

0
star_lock/images/mine/icon_mine_seletGatewayType_G2.png → star_lock/images/mine/icon_mine_selectGatewayType_G2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
star_lock/images/mine/icon_mine_seletGatewayType_G4.png → star_lock/images/mine/icon_mine_selectGatewayType_G4.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
star_lock/images/mine/icon_mine_seletGatewayType_next.png → star_lock/images/mine/icon_mine_selectGatewayType_next.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
star_lock/images/tabbar/icon_tab_main_selet.png → star_lock/images/tabbar/icon_tab_main_select.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 471 KiB

After

Width:  |  Height:  |  Size: 471 KiB

0
star_lock/images/tabbar/icon_tab_main_unselet.png → star_lock/images/tabbar/icon_tab_main_unselect.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 350 KiB

After

Width:  |  Height:  |  Size: 350 KiB

0
star_lock/images/tabbar/icon_tab_my_selet.png → star_lock/images/tabbar/icon_tab_my_select.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
star_lock/images/tabbar/icon_tab_my_unselet.png → star_lock/images/tabbar/icon_tab_my_unselect.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

36
star_lock/lib/appRouters.dart
View File

@ -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(

2
star_lock/lib/login/login/starLock_login_page.dart
View File

@ -90,7 +90,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
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(

2
star_lock/lib/login/register/starLock_register_page.dart
View File

@ -142,7 +142,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
GestureDetector(
onTap: () async {
var result = await Navigator.pushNamed(
context, Routers.seletCountryRegionPage);
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
logic.state.countryCode.value = result['code'];

0
star_lock/lib/login/seletCountryRegion/common/countryRegionEntity.dart → star_lock/lib/login/selectCountryRegion/common/countryRegionEntity.dart
View File

0
star_lock/lib/login/seletCountryRegion/common/index.dart → star_lock/lib/login/selectCountryRegion/common/index.dart
View File

2
star_lock/lib/login/seletCountryRegion/common/utils.dart → star_lock/lib/login/selectCountryRegion/common/utils.dart
View File

@ -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'}) {

4
star_lock/lib/login/seletCountryRegion/seletCountryRegion_page.dart → star_lock/lib/login/selectCountryRegion/selectCountryRegion_page.dart
View File

@ -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<SelectCountryRegionPage> {
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,
),

4
star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart
View File

@ -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<String, dynamic>;
state.countryCode.value = result['code'];

2
star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
View File

@ -101,7 +101,7 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage> {
),
action: () async {
var result = await Navigator.pushNamed(
context, Routers.seletCountryRegionPage);
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
state.countryCode.value = result['code'];

2
star_lock/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart
View File

@ -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<String, dynamic>;
countryCode = result['code'];

12
star_lock/lib/main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_tabbar.dart
View File

@ -26,9 +26,9 @@ class _AddCardManageTabbarState extends State<AddCardManageTabbar> with SingleTi
late TabController _tabController;
final List<ItemView> _itemTabs = <ItemView>[
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<AddCardManageTabbar> 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<AddCardManageTabbar> 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;
}

8
star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart
View File

@ -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{
}
}
}

12
star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart
View File

@ -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<AddCardPage> {
@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<AddCardPage> {
}
Widget indexChangeWidget() {
switch (int.parse(widget.seletType)) {
switch (int.parse(widget.selectType)) {
case 0:
{
// 永久
@ -193,7 +193,7 @@ class _AddCardPageState extends State<AddCardPage> {
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<AddCardPage> {
logic.checkCardNameDuplicated(state.nameController.text);
} else {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
}),

4
star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart
View File

@ -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"];
}
}
}

2
star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart
View File

@ -50,7 +50,7 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
if (isDemoMode == false) {
showDeletAlertDialog(context);
} else {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},

6
star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInAddHolidays/checkingInAddHolidays_page.dart
View File

@ -51,7 +51,7 @@ class _CheckingInAddHolidaysPageState extends State<CheckingInAddHolidaysPage> {
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<CheckingInAddHolidaysPage> {
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<CheckingInAddHolidaysPage> {
builder: (context) {
return ShowCalendar(
datePickerMode: DatePickerMode.day,
seletAction: (dateTime) {
selectAction: (dateTime) {
String makeUpWorkDate = formatDate(dateTime, [yyyy,'-',mm,'-',dd]);
state.makeUpWorkDate.value = makeUpWorkDate;
Get.back();

4
star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_logic.dart
View File

@ -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{
}
}
}

4
star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_page.dart
View File

@ -205,7 +205,7 @@ class _CheckingInSetHolidaysPageState extends State<CheckingInSetHolidaysPage> {
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<CheckingInSetHolidaysPage> {
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}");
},

4
star_lock/lib/main/lockDetail/checkingIn/checkingInHolidays/checkingInSetHolidays/checkingInSetHolidays_state.dart
View File

@ -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 = <HolidaysMonthListData>[].obs;
CheckingInSetHolidaysState() {
@ -15,4 +15,4 @@ class CheckingInSetHolidaysState{
companyId.value = map["companyId"];
}
}
}

12
star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart
View File

@ -44,7 +44,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
"getKeyInfosData": state.getKeyInfosData.value,
});
}else{
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},
@ -104,7 +104,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
logic.loadDataByType();
});
}else{
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},
@ -141,7 +141,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
logic.loadDataByType();
});
}else{
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},
@ -171,7 +171,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
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<CheckingInListPage> {
});
});
}else{
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},
@ -343,7 +343,7 @@ class _CheckingInListPageState extends State<CheckingInListPage> {
if(isDemoMode == false){
showListType();
}else{
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},

6
star_lock/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart
View File

@ -138,7 +138,7 @@ class _CheckingInSetWorkdaySetState extends State<CheckingInSetWorkdaySet> {
},
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<CheckingInSetWorkdaySet> {
},
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<CheckingInSetWorkdaySet> {
},
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,),
],
)))
);

16
star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_logic.dart
View File

@ -7,7 +7,7 @@ import '../../../../../tools/eventBusEventManage.dart';
import 'checkingInAddStaffSelectKey_entity.dart';
import 'checkingInAddStaff_state.dart';
typedef KeyClickCallback = void Function(List<CheckingInAddStaffKeyEntity> seletKeyList);
typedef KeyClickCallback = void Function(List<CheckingInAddStaffKeyEntity> 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",

28
star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart
View File

@ -44,7 +44,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
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<CheckingInAddStaffPage> {
// 当选择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<CheckingInAddStaffPage> {
),
action: () async {
var result = await Navigator.pushNamed(
context, Routers.seletCountryRegionPage);
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
state.countryCode.value = result['code'];
@ -125,7 +125,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
)),
// 当选择密码、卡、指纹时显示
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<CheckingInAddStaffPage> {
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<CheckingInAddStaffPage> {
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<CheckingInAddStaffPage> {
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<CheckingInAddStaffPage> {
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<CheckingInAddStaffPage> {
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<CheckingInAddStaffPage> {
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<CheckingInAddStaffPage> {
String addStaffSelectKeyType() {
String title = "";
switch (int.parse(state.seletPrintingMethodType.value)) {
switch (int.parse(state.selectPrintingMethodType.value)) {
case 1:
title = TranslationLoader.lanKeys!.getKey!.tr;
break;

18
star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart
View File

@ -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 = <CheckingInAddStaffKeyEntity>[].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;
}

2
star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
View File

@ -47,7 +47,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> {
var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
} else {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},

2
star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey_page.dart
View File

@ -248,7 +248,7 @@ class _MassSendElectronicKeyPageState extends State<MassSendElectronicKeyPage> {
),
action: () async {
var result = await Navigator.pushNamed(
context, Routers.seletCountryRegionPage);
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
countryCode = result['code'];

2
star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_page.dart
View File

@ -201,7 +201,7 @@ class _LockUserListPageState extends State<LockUserListPage> {
},
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,

2
star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupCell.dart
View File

@ -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,

8
star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart
View File

@ -123,15 +123,15 @@ class _MassSendLockGroupListPageState extends State<MassSendLockGroupListPage> {
// 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);
}

2
star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart
View File

@ -80,7 +80,7 @@ class _MassSendReceiverPageState extends State<MassSendReceiverPage> {
),
action: () async {
var result = await Navigator.pushNamed(
context, Routers.seletCountryRegionPage);
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
countryCode = result['code'];

4
star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart
View File

@ -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<String, dynamic>;
state.countryCode.value = result['code'];

2
star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart
View File

@ -139,7 +139,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
),
action: () async {
var result = await Navigator.pushNamed(
context, Routers.seletCountryRegionPage);
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
state.countryCode.value = result['code'];

12
star_lock/lib/main/lockDetail/face/addFaceType/addFaceTypeManage/addFaceTypeManage_tabbar.dart
View File

@ -21,9 +21,9 @@ class _AddFaceTypeManageTabbarState extends State<AddFaceTypeManageTabbar> with
late TabController _tabController;
final List<ItemView> _itemTabs = <ItemView>[
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<AddFaceTypeManageTabbar> 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<AddFaceTypeManageTabbar> 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;
}

10
star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart
View File

@ -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<AddFaceTypePage> createState() => _AddFaceTypePageState();
@ -32,7 +32,7 @@ class _AddFaceTypePageState extends State<AddFaceTypePage> {
}
Widget indexChangeWidget() {
switch (int.parse(widget.seletType)) {
switch (int.parse(widget.selectType)) {
case 0:
{
// 永久
@ -176,7 +176,7 @@ class _AddFaceTypePageState extends State<AddFaceTypePage> {
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<AddFaceTypePage> {
Get.toNamed(Routers.addFaceTipPage);
} else {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
}),

2
star_lock/lib/main/lockDetail/face/faceList/faceList_page.dart
View File

@ -44,7 +44,7 @@ class _FaceListState extends State<FaceList> {
if (isDemoMode == false) {
showDeletAlertDialog(context);
} else {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},

14
star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintManage/addFingerprintTypeManage_tabbar.dart
View File

@ -25,9 +25,9 @@ class _AddFingerprintTypeManageTabbarState extends State<AddFingerprintTypeManag
late TabController _tabController;
final List<ItemView> _itemTabs = <ItemView>[
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<AddFingerprintTypeManag
controller: _tabController,
children: _itemTabs
.map((ItemView item) => AddFingerprintTypePage(
seletType: item.seletType,
selectType: item.selectType,
lockId: widget.lockId,
fromType: widget.fromType,
fromTypeTwoStaffName:widget.fromTypeTwoStaffName
@ -109,8 +109,8 @@ class _AddFingerprintTypeManageTabbarState extends State<AddFingerprintTypeManag
}
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;
}

8
star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_logic.dart
View File

@ -13,11 +13,11 @@ class AddFingerprintTypeLogic 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("请选择开始时间");
@ -41,7 +41,7 @@ class AddFingerprintTypeLogic 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;
@ -98,4 +98,4 @@ class AddFingerprintTypeLogic extends BaseGetXController{
}
}
}
}

12
star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart
View File

@ -15,14 +15,14 @@ import '../../../../translations/trans_lib.dart';
import 'addFingerprintType_logic.dart';
class AddFingerprintTypePage extends StatefulWidget {
final String seletType; // 永久限时循环下标
final String selectType; // 永久限时循环下标
final int lockId;
final int fromType; // // 1从添加钥匙列表进入 2从考勤添加员工入口进入
final String fromTypeTwoStaffName; // 从添加员工进入 传入员工名字
const AddFingerprintTypePage(
{Key? key,
required this.seletType,
required this.selectType,
required this.lockId,
required this.fromType,
required this.fromTypeTwoStaffName})
@ -38,7 +38,7 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
@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<AddFingerprintTypePage> {
}
Widget indexChangeWidget() {
switch (int.parse(widget.seletType)) {
switch (int.parse(widget.selectType)) {
case 0:
{
// 永久
@ -193,14 +193,14 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
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("演示模式");
}
}),

4
star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_state.dart
View File

@ -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"];
}
}
}

2
star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart
View File

@ -50,7 +50,7 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
if (isDemoMode == false) {
showDeletAlertDialog(context);
} else {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},

2
star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart
View File

@ -59,7 +59,7 @@ class _LockOperatingRecordPageState extends State<LockOperatingRecordPage> {
_openModalBottomSheet();
}else{
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},

10
star_lock/lib/main/lockDetail/lockSet/lockSoundSet/lockSoundSet_page.dart
View File

@ -87,7 +87,7 @@ class _LockSoundSetPageState extends State<LockSoundSetPage> 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<LockSoundSetPage> 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<LockSoundSetPage> 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<LockSoundSetPage> 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<LockSoundSetPage> 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,
),

2
star_lock/lib/main/lockDetail/lockSet/lockUser/lockUser_page.dart
View File

@ -156,7 +156,7 @@ class _LockUserPageState extends State<LockUserPage> {
),
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,

4
star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_page.dart
View File

@ -44,7 +44,7 @@ class _MarkedHouseStatePageState extends State<MarkedHouseStatePage> {
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<MarkedHouseStatePage> {
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,
),

2
star_lock/lib/main/lockDetail/lockSet/msgNotification/coerceOpenDoor/coerceFingerprintList/coerceFingerprintList_page.dart
View File

@ -158,7 +158,7 @@ class _CoerceFingerprintListPageState extends State<CoerceFingerprintListPage> {
),
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,

2
star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart
View File

@ -253,7 +253,7 @@ class _NormallyOpenModePageState extends State<NormallyOpenModePage> 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,

2
star_lock/lib/main/lockDetail/lockSet/notificationMode/notificationMode_page.dart
View File

@ -262,7 +262,7 @@ class _NotificationModePageState extends State<NotificationModePage> {
),
),
onTap: () async {
var result = await Get.toNamed(Routers.seletCountryRegionPage);
var result = await Get.toNamed(Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
state.countryCode.value = result['code'];

2
star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart
View File

@ -72,7 +72,7 @@ class _AddWirelessKeyboardPageState extends State<AddWirelessKeyboardPage> {
btnName: TranslationLoader.lanKeys!.next!.tr,
onClick: () {
Navigator.pushNamed(
context, Routers.seletWirelessKeyboardPage);
context, Routers.selectWirelessKeyboardPage);
}),
),
SizedBox(

2
star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart
View File

@ -85,7 +85,7 @@ class _AddWirelessKeyboardScreenNotLightOnPageState
btnName: TranslationLoader.lanKeys!.next!.tr,
onClick: () {
Navigator.pushNamed(
context, Routers.seletWirelessKeyboardPage);
context, Routers.selectWirelessKeyboardPage);
}),
),
],

2
star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/seletWirelessKeyboard/seletWirelessKeyboard_page.dart → star_lock/lib/main/lockDetail/lockSet/wirelessKeyboard/selectWirelessKeyboard/selectWirelessKeyboard_page.dart
View File

@ -23,7 +23,7 @@ class _SelectWirelessKeyboardPageState extends State<SelectWirelessKeyboardPage>
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

2
star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart
View File

@ -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';

12
star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControlManage/addRemoteControlManage_tabbar.dart
View File

@ -22,9 +22,9 @@ class _AddRemoteControlManageTabbarState extends State<AddRemoteControlManageTab
late TabController _tabController;
final List<ItemView> _itemTabs = <ItemView>[
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<AddRemoteControlManageTab
child: TabBarView(
controller: _tabController,
children: _itemTabs
.map((ItemView item) => AddRemoteControlPage(seletType: item.seletType,))
.map((ItemView item) => AddRemoteControlPage(selectType: item.selectType,))
.toList(),
),
);
@ -92,9 +92,9 @@ class _AddRemoteControlManageTabbarState extends State<AddRemoteControlManageTab
}
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;
}

10
star_lock/lib/main/lockDetail/remoteControl/addRemoteControl/addRemoteControl_page.dart
View File

@ -15,9 +15,9 @@ import '../../../../translations/trans_lib.dart';
import 'addRemoteControl_logic.dart';
class AddRemoteControlPage extends StatefulWidget {
final String seletType;
final String selectType;
const AddRemoteControlPage({Key? key, required this.seletType})
const AddRemoteControlPage({Key? key, required this.selectType})
: super(key: key);
@override
@ -34,7 +34,7 @@ class _AddRemoteControlPageState extends State<AddRemoteControlPage> {
}
Widget indexChangeWidget() {
switch (int.parse(widget.seletType)) {
switch (int.parse(widget.selectType)) {
case 0:
{
// 永久
@ -178,7 +178,7 @@ class _AddRemoteControlPageState extends State<AddRemoteControlPage> {
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<AddRemoteControlPage> {
logic.showToast("请确保在设备附近");
// logic.addFingerprintsData();
} else {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
}),

2
star_lock/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart
View File

@ -45,7 +45,7 @@ class _RemoteControlListPageState extends State<RemoteControlListPage> {
if (isDemoMode == false) {
showDeletAlertDialog(context);
} else {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}
},

4
star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_page.dart
View File

@ -23,7 +23,7 @@ class _EditVideoLogPageState extends State<EditVideoLogPage> {
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<EditVideoLogPage> {
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"))
)
),
)

2
star_lock/lib/main/lockDetail/videoLog/editVideoLog/editVideoLog_state.dart
View File

@ -4,7 +4,7 @@ import 'package:get/get.dart';
class EditVideoLogState{
var seletVideoLog = 0.obs;
var selectVideoLog = 0.obs;
var isSelectAll = false.obs;
}

2
star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart
View File

@ -375,7 +375,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
}
void gotoLogin() {
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
logic.showToast("演示模式");
}

2
star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart
View File

@ -344,7 +344,7 @@ class _DemoModeLockSetPageState extends State<DemoModeLockSetPage> {
}
void gotoAddLock(){
// Get.toNamed(Routers.seletLockTypePage);
// Get.toNamed(Routers.selectLockTypePage);
EasyLoading.showToast("演示模式",duration: 2000.milliseconds);
}

2
star_lock/lib/main/lockMian/lockMain/lockMain_page.dart
View File

@ -146,7 +146,7 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
onTap: () {
//实现回调函数
Navigator.pushNamed(
context, Routers.seletLockTypePage,
context, Routers.selectLockTypePage,
// arguments: {
// "url": ConstConfig.privacAgreementUrl,
// "title": '隐私政策'

12
star_lock/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart
View File

@ -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<AddLockSelectCountryPage> {
final state = Get.find<AddLockSelectCountryLogic>().state;
List<CountryRegionModel> countriesList = [];
int seletindex = 10000;
int selectindex = 10000;
@override
void initState() {
@ -99,12 +99,12 @@ class _AddLockSelectCountryPageState extends State<AddLockSelectCountryPage> {
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<AddLockSelectCountryPage> {
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,

2
star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart
View File

@ -55,7 +55,7 @@ class _NearbyLockPageState extends State<NearbyLockPage> 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);

4
star_lock/lib/mine/addLock/nearbyLock/nearbyLock_state.dart
View File

@ -8,7 +8,7 @@ class NearbyLockState {
RxList<DiscoveredDevice> devices = <DiscoveredDevice>[].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 = [];
}
}

0
star_lock/lib/mine/addLock/seletLockType/seletLockType_page.dart → star_lock/lib/mine/addLock/selectLockType/selectLockType_page.dart
View File

2
star_lock/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart
View File

@ -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(

4
star_lock/lib/mine/gateway/addGateway/seletGateway/seletGatewayList_page.dart → star_lock/lib/mine/gateway/addGateway/selectGateway/selectGatewayList_page.dart
View File

@ -26,7 +26,7 @@ class _SelectGatewayListPageState extends State<SelectGatewayListPage> {
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<SelectGatewayListPage> {
);
}
Widget _seletGatewayListListItem(String lockTypeIcon, String gateWayName,
Widget _selectGatewayListListItem(String lockTypeIcon, String gateWayName,
String networkSignal, Function() action) {
return GestureDetector(
onTap: action,

14
star_lock/lib/mine/gateway/addGateway/seletGatewayType/seletGatewayType_page.dart → star_lock/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart
View File

@ -25,24 +25,24 @@ class _SelectGatewayTypePageState extends State<SelectGatewayTypePage> {
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,

6
star_lock/lib/mine/gateway/addGateway/seletGatewayTypeNextTip/seletGatewayTypeNextTip_page.dart → star_lock/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart
View File

@ -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);
}),
),
],

2
star_lock/lib/mine/gateway/gatewayList/gatewayList_page.dart
View File

@ -26,7 +26,7 @@ class _GatewayListPageState extends State<GatewayListPage> {
actionsList: [
GestureDetector(
onTap: () {
Navigator.pushNamed(context, Routers.seletGatewayTypePage);
Navigator.pushNamed(context, Routers.selectGatewayTypePage);
},
child: Image.asset(
'images/icon_add_white.png',

4
star_lock/lib/mine/message/messageList_page.dart
View File

@ -30,7 +30,7 @@ class _MessageListPageState extends State<MessageListPage> {
: 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<MessageListPage> {
);
}
Widget _seletGatewayListListItem(String lockTypeIcon, String gateWayName,
Widget _selectGatewayListListItem(String lockTypeIcon, String gateWayName,
String networkSignal, Function() action) {
return GestureDetector(
onTap: action,

2
star_lock/lib/mine/mine/safeVerify/safeVerify_state.dart
View File

@ -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';

2
star_lock/lib/mine/mine/starLockMine_page.dart
View File

@ -120,7 +120,7 @@ class _StarLockMinePageState extends State<StarLockMinePage> 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, () {

2
star_lock/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart
View File

@ -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';

2
star_lock/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart
View File

@ -47,7 +47,7 @@ class _MinePersonInfoEditIphonePageState
)),
GestureDetector(
onTap: () {
Navigator.pushNamed(context, Routers.seletCountryRegionPage);
Navigator.pushNamed(context, Routers.selectCountryRegionPage);
},
child: Container(
height: 70.h,

4
star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_logic.dart
View File

@ -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<String, dynamic>;
state.countryCode.value = result['code'];

2
star_lock/lib/mine/mineSet/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart
View File

@ -274,7 +274,7 @@ class _AddAuthorizedAdministratorPageState extends State<AddAuthorizedAdministra
),
action: () async {
var result = await Navigator.pushNamed(
context, Routers.seletCountryRegionPage);
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
countryCode = result['code'];

4
star_lock/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart
View File

@ -85,7 +85,7 @@ class _APPUnlockNeedMobileNetworkingLockPageState extends State<APPUnlockNeedMob
child: Obx(() => 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<APPUnlockNeedMob
),
Image.asset(
itemData.isCheck == true
? 'images/icon_round_selet.png'
? 'images/icon_round_select.png'
: 'images/icon_round_unSelect.png',
width: 30.w,
height: 30.w,

2
star_lock/lib/mine/mineSet/authorityManagement/getDeviceList_page.dart
View File

@ -101,7 +101,7 @@ class _GetDeviceListPageState extends State<GetDeviceListPage> {
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,
),

2
star_lock/lib/mine/mineSet/authorityManagement/getNameList_page.dart
View File

@ -118,7 +118,7 @@ class _GetNameListPageState extends State<GetNameListPage> {
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,
),

4
star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart
View File

@ -13,7 +13,7 @@ class GroupEditLockLogic extends BaseGetXController {
Future<void> 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 {
}
}
}
}

2
star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart
View File

@ -97,7 +97,7 @@ class _GroupEditLockPageState extends State<GroupEditLockPage> {
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,

6
star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_state.dart
View File

@ -5,17 +5,17 @@ import '../../../../main/lockDetail/electronicKey/massSendElectronicKey/massSend
class GroupEditLockState {
var lockList = <LockListItem>[];
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<lockList.length; i++){

4
star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_entity.dart
View File

@ -71,7 +71,7 @@ class GetewayItemData {
String? networkMac;
int? isOnline;
String? plugVersion;
int? selet = 0;
int? select = 0;
GetewayItemData(
{this.serialNumber,
this.plugId,
@ -108,4 +108,4 @@ class GetewayItemData {
data['plugVersion'] = plugVersion;
return data;
}
}
}

14
star_lock/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart
View File

@ -36,10 +36,10 @@ class _SelectGetewayListPageState extends State<SelectGetewayListPage> {
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<SelectGetewayListPage> {
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<SelectGetewayListPage> {
),
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<SelectGetewayListPage> {
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);
}

2
star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart
View File

@ -174,7 +174,7 @@ class _RecipientInformationPageState extends State<RecipientInformationPage> {
),
action: () async {
var result = await Navigator.pushNamed(
context, Routers.seletCountryRegionPage);
context, Routers.selectCountryRegionPage);
if (result != null) {
result as Map<String, dynamic>;
state.countryCode.value = result['code'];

2
star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_entity.dart
View File

@ -51,7 +51,7 @@ class TransferSmartLockListData {
class TransferSmartLockItemData {
int? lockId;
int? selet = 0;
int? select = 0;
String? lockAlias;
LockVersion? lockVersion;

14
star_lock/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart
View File

@ -36,10 +36,10 @@ class _TransferSmartLockPageState extends State<TransferSmartLockPage> {
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<TransferSmartLockPage> {
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<TransferSmartLockPage> {
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<TransferSmartLockPage> {
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);
}

2
star_lock/lib/mine/valueAddedServices/valueAddedServicesBuy/valueAddedServicesBuy_page.dart
View File

@ -94,7 +94,7 @@ class _ValueAddedServicesBuyPageState extends State<ValueAddedServicesBuyPage> {
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,
)

Some files were not shown because too many files have changed in this diff Show More