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

1、修改循环 23:00～24:00 不能开锁问题。2、修改TAPD问题

Browse Source
This commit is contained in:
魏少阳 2024-06-03 13:50:07 +08:00
parent ad91e4d17a
commit 7aa487038c
44 changed files with 644 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/lan/lan_en.json
View File

@ -680,7 +680,7 @@
"密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。": "After the password is generated, please use it once for activation before 23:59 on the same day, otherwise it will be invalid after 0 o'clock. After the password is activated, it can be used unlimited times within the validity period.", "密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。": "After the password is generated, please use it once for activation before 23:59 on the same day, otherwise it will be invalid after 0 o'clock. After the password is activated, it can be used unlimited times within the validity period.",
"密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。": "After the password is generated, please use it before 23:59 on the same day, otherwise it will be invalid after 0 o'clock. The clear code is used to clear all the passwords generated before 0 o'clock today.", "密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。": "After the password is generated, please use it before 23:59 on the same day, otherwise it will be invalid after 0 o'clock. The clear code is used to clear all the passwords generated before 0 o'clock today.",
"密码生成后，请在当日23：59前使用，否则过0点后失效。": "After the password is generated, please use it before 23:59 on the same day, otherwise it will be invalid after 0 o'clock.", "密码生成后，请在当日23：59前使用，否则过0点后失效。": "After the password is generated, please use it before 23:59 on the same day, otherwise it will be invalid after 0 o'clock.",
"清空密码底部提示": "The password is valid until 24 o 'clock on the day of emptying\n Empty Content 1: All passwords generated before 0:00 of the day (Passwords generated after 0:00 of the day are not affected by clearing passwords and can continue to be used) \nEmpty content 2: Clear passwords Clear all custom passwords (used and unused) immediately after use \nTo completely clear all passwords, use the Reset All Passwords feature", "清空密码底部提示": "The password is valid until 23:59 on the day of emptying\n Empty Content 1: All passwords generated before 0:00 of the day (Passwords generated after 0:00 of the day are not affected by clearing passwords and can continue to be used) \nEmpty content 2: Clear passwords Clear all custom passwords (used and unused) immediately after use \nTo completely clear all passwords, use the Reset All Passwords feature",
"相机": "camera", "相机": "camera",
"相册": "photos", "相册": "photos",
"读写": "storage", "读写": "storage",

2
images/lan/lan_zh.json
View File

@ -683,7 +683,7 @@
"密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。": "密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。", "密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。": "密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。",
"密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。": "密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。", "密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。": "密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。",
"密码生成后，请在当日23：59前使用，否则过0点后失效。": "密码生成后，请在当日23：59前使用，否则过0点后失效。", "密码生成后，请在当日23：59前使用，否则过0点后失效。": "密码生成后，请在当日23：59前使用，否则过0点后失效。",
"清空密码底部提示": "清空密码当日24点前有效\n清空内容1：当日0点前生成的所有密码（当日0点后生成的密码，不受清空密码影响，可继续使用）\n清空内容2：清空密码使用后，立即清除所有自定义密码（含使用过和未使用过的）\n如需彻底清除所有密码，请使用重置所有密码功能", "清空密码底部提示": "清空密码当日23:59前有效\n清空内容1：当日0点前生成的所有密码（当日0点后生成的密码，不受清空密码影响，可继续使用）\n清空内容2：清空密码使用后，立即清除所有自定义密码（含使用过和未使用过的）\n如需彻底清除所有密码，请使用重置所有密码功能",
"密码不一致哦": "密码不一致哦", "密码不一致哦": "密码不一致哦",
"相机": "相机", "相机": "相机",
"相册": "相册", "相册": "相册",

27
lib/login/register/starLock_register_logic.dart
View File

@ -1,8 +1,11 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/app_settings/app_settings.dart';
import 'package:star_lock/login/login/entity/LoginEntity.dart';
import 'package:star_lock/login/register/entity/SendValidationCodeEntity.dart';
import '../../network/api_repository.dart'; import '../../network/api_repository.dart';
import '../../tools/baseGetXController.dart'; import '../../tools/baseGetXController.dart';
@ -13,7 +16,7 @@ class StarLockRegisterLogic extends BaseGetXController {
late Timer _timer; late Timer _timer;
void _startTimer() { void _startTimer() {
_timer = Timer.periodic(1.seconds, (timer) { _timer = Timer.periodic(1.seconds, (Timer timer) {
if (state.currentSecond > 1) { if (state.currentSecond > 1) {
state.currentSecond--; state.currentSecond--;
} else { } else {
@ -29,33 +32,33 @@ class StarLockRegisterLogic extends BaseGetXController {
// _timer = null; // _timer = null;
} }
void register() async { Future<void> register() async {
AppLog.log("state.pwd.value:${state.pwd.value} state.surePwd.value:${state.surePwd.value}"); // AppLog.log("state.pwd.value:${state.pwd.value} state.surePwd.value:${state.surePwd.value}");
if(state.pwd.value != state.surePwd.value){ if(state.pwd.value != state.surePwd.value){
showToast("密码不一致哦".tr); showToast('密码不一致哦'.tr);
return; return;
} }
var entity = await ApiRepository.to.register( final LoginEntity entity = await ApiRepository.to.register(
receiverType: state.isIphoneType.value == true ? 1 : 2, receiverType: state.isIphoneType.value == true ? 1 : 2,
countryCode: int.parse(state.countryCode.value), countryCode: int.parse(state.countryCode.value),
account: state.phoneOrEmailStr.value, account: state.phoneOrEmailStr.value,
password: state.pwd.value, password: state.pwd.value,
verificationCode: state.verificationCode.value); verificationCode: state.verificationCode.value);
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
showToast("注册成功".tr); showToast('注册成功'.tr);
Get.back(result:{ Get.back(result:<String, String>{
"phoneOrEmailStr":state.phoneOrEmailStr.value, 'phoneOrEmailStr':state.phoneOrEmailStr.value,
"pwd":state.pwd.value 'pwd':state.pwd.value
}); });
} }
} }
void sendValidationCode() async { Future<void> sendValidationCode() async {
var entity = await ApiRepository.to.sendValidationCodeUnLogin( final SendValidationCodeEntity entity = await ApiRepository.to.sendValidationCodeUnLogin(
// state.countryCode.value, // state.countryCode.value,
countryCode: state.countryCode.value.toString(), countryCode: state.countryCode.value.toString(),
account: state.phoneOrEmailStr.value, account: state.phoneOrEmailStr.value,
channel: state.isIphoneType.value ? "1" : "2", channel: state.isIphoneType.value ? '1' : '2',
codeType: '1', codeType: '1',
xWidth: state.xWidth.value.toString()); xWidth: state.xWidth.value.toString());
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {

70
lib/login/register/starLock_register_page.dart
View File

@ -1,14 +1,16 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/app_settings/app_settings.dart';
import 'package:star_lock/login/register/starLock_register_state.dart';
import '../../appRouters.dart'; import '../../appRouters.dart';
import '../../app_settings/app_colors.dart'; import '../../app_settings/app_colors.dart';
import '../../common/XSConstantMacro/XSConstantMacro.dart'; import '../../common/XSConstantMacro/XSConstantMacro.dart';
import '../../tools/tf_loginInput.dart';
import '../../tools/submitBtn.dart'; import '../../tools/submitBtn.dart';
import '../../tools/tf_loginInput.dart';
import '../../tools/titleAppBar.dart'; import '../../tools/titleAppBar.dart';
import '../../translations/trans_lib.dart'; import '../../translations/trans_lib.dart';
import 'starLock_register_logic.dart'; import 'starLock_register_logic.dart';
@ -21,8 +23,8 @@ class StarLockRegisterPage extends StatefulWidget {
} }
class _StarLockRegisterPageState extends State<StarLockRegisterPage> { class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
final logic = Get.put(StarLockRegisterLogic()); final StarLockRegisterLogic logic = Get.put(StarLockRegisterLogic());
final state = Get.find<StarLockRegisterLogic>().state; final StarLockRegisterState state = Get.find<StarLockRegisterLogic>().state;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -35,7 +37,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
backgroundColor: AppColors.mainColor), backgroundColor: AppColors.mainColor),
body: ListView( body: ListView(
padding: EdgeInsets.only(top: 40.h, left: 40.w, right: 40.w), padding: EdgeInsets.only(top: 40.h, left: 40.w, right: 40.w),
children: [ children: <Widget>[
topSelectCountryAndRegionWidget(), topSelectCountryAndRegionWidget(),
middleTFWidget(), middleTFWidget(),
Obx(() { Obx(() {
@ -67,11 +69,11 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
Widget topSelectCountryAndRegionWidget() { Widget topSelectCountryAndRegionWidget() {
return Column( return Column(
children: [ children: <Widget>[
SizedBox(height: 50.h), SizedBox(height: 50.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: <Widget>[
Container( Container(
width: 340.w, width: 340.w,
height: 60.h, height: 60.h,
@ -81,7 +83,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
border: border:
Border.all(width: 1.0, color: AppColors.greyLineColor)), Border.all(width: 1.0, color: AppColors.greyLineColor)),
child: Row( child: Row(
children: [ children: <Widget>[
GestureDetector( GestureDetector(
onTap: () { onTap: () {
state.isIphoneType.value = true; state.isIphoneType.value = true;
@ -141,19 +143,19 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
SizedBox(height: 60.h), SizedBox(height: 60.h),
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
var result = await Get.toNamed(Routers.selectCountryRegionPage); final result = await Get.toNamed(Routers.selectCountryRegionPage);
if (result != null) { if (result != null) {
result as Map<String, dynamic>; result as Map<String, dynamic>;
state.countryCode.value = result['code']; state.countryCode.value = result['code'];
state.countryName.value = result['countryName']; state.countryName.value = result['countryName'];
} }
AppLog.log( AppLog.log(
"路由返回值: $result, countryCode:${logic.state.countryCode}"); '路由返回值: $result, countryCode:${logic.state.countryCode}');
}, },
child: Obx(() => SizedBox( child: Obx(() => SizedBox(
height: 70.h, height: 70.h,
child: Row( child: Row(
children: [ children: <Widget>[
SizedBox(width: 5.w), SizedBox(width: 5.w),
Expanded( Expanded(
child: Text( child: Text(
@ -163,7 +165,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
SizedBox(width: 20.w), SizedBox(width: 20.w),
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: <Widget>[
Text( Text(
state.isIphoneType.value state.isIphoneType.value
? '${state.countryName.value} +${state.countryCode.value}' ? '${state.countryName.value} +${state.countryCode.value}'
@ -194,7 +196,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
Widget middleTFWidget() { Widget middleTFWidget() {
return Column( return Column(
children: [ children: <Widget>[
Obx(() => LoginInput( Obx(() => LoginInput(
controller: state.phoneOrEmailController, controller: state.phoneOrEmailController,
onchangeAction: (v) { onchangeAction: (v) {
@ -207,7 +209,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
child: Image.asset( child: Image.asset(
state.isIphoneType.value state.isIphoneType.value
? 'images/icon_login_account.png' ? 'images/icon_login_account.png'
: "images/icon_login_email.png", : 'images/icon_login_email.png',
width: 30.w, width: 30.w,
height: 30.w, height: 30.w,
), ),
@ -215,7 +217,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
hintText: hintText:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${state.isIphoneType.value ? "手机号".tr : TranslationLoader.lanKeys!.email!.tr}", "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${state.isIphoneType.value ? "手机号".tr : TranslationLoader.lanKeys!.email!.tr}",
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: [ inputFormatters: <TextInputFormatter>[
// FilteringTextInputFormatter.allow(RegExp('[0-9]')), // FilteringTextInputFormatter.allow(RegExp('[0-9]')),
LengthLimitingTextInputFormatter(30), LengthLimitingTextInputFormatter(30),
])), ])),
@ -236,8 +238,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
), ),
), ),
hintText: hintText:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}',
inputFormatters: [ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
SizedBox(height: 15.w), SizedBox(height: 15.w),
@ -263,13 +265,13 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
), ),
), ),
hintText: hintText:
"${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}", '${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}',
inputFormatters: [ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
SizedBox(height: 10.w), SizedBox(height: 10.w),
Row( Row(
children: [ children: <Widget>[
Expanded( Expanded(
child: LoginInput( child: LoginInput(
controller: state.codeController, controller: state.codeController,
@ -284,8 +286,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
), ),
), ),
hintText: hintText:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}", '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}',
inputFormatters: [ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
), ),
@ -297,14 +299,14 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
state.phoneOrEmailStrIsOK.value && state.canResend.value state.phoneOrEmailStrIsOK.value && state.canResend.value
? () async { ? () async {
// Navigator.pushNamed(context, Routers.safetyVerificationPage, arguments: {"countryCode":"+86", "account":state.phoneOrEmailStr.value}); // Navigator.pushNamed(context, Routers.safetyVerificationPage, arguments: {"countryCode":"+86", "account":state.phoneOrEmailStr.value});
var result = await Navigator.pushNamed( final Object? result = await Navigator.pushNamed(
context, Routers.safetyVerificationPage, context, Routers.safetyVerificationPage,
arguments: { arguments: <String, Object>{
"countryCode": state.countryCode, 'countryCode': state.countryCode,
"account": state.phoneOrEmailStr.value 'account': state.phoneOrEmailStr.value
}); });
state.xWidth.value = state.xWidth.value =
(result as Map<String, dynamic>)['xWidth']; (result! as Map<String, dynamic>)['xWidth'];
logic.sendValidationCode(); logic.sendValidationCode();
} }
: null, : null,
@ -337,7 +339,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
Widget _buildBottomAgreement() { Widget _buildBottomAgreement() {
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: <Widget>[
Obx(() => GestureDetector( Obx(() => GestureDetector(
onTap: () { onTap: () {
state.agree.value = !state.agree.value; state.agree.value = !state.agree.value;
@ -358,7 +360,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
text: TextSpan( text: TextSpan(
text: TranslationLoader.lanKeys!.readAndAgree!.tr, text: TranslationLoader.lanKeys!.readAndAgree!.tr,
style: TextStyle(color: const Color(0xff333333), fontSize: 20.sp), style: TextStyle(color: const Color(0xff333333), fontSize: 20.sp),
children: [ children: <InlineSpan>[
WidgetSpan( WidgetSpan(
alignment: PlaceholderAlignment.middle, alignment: PlaceholderAlignment.middle,
child: GestureDetector( child: GestureDetector(
@ -367,9 +369,9 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
style: TextStyle( style: TextStyle(
color: AppColors.mainColor, fontSize: 20.sp)), color: AppColors.mainColor, fontSize: 20.sp)),
onTap: () { onTap: () {
Get.toNamed(Routers.webviewShowPage, arguments: { Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
"url": XSConstantMacro.userAgreementURL, 'url': XSConstantMacro.userAgreementURL,
"title": '用户协议'.tr 'title': '用户协议'.tr
}); });
}, },
)), )),
@ -381,9 +383,9 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
style: TextStyle( style: TextStyle(
color: AppColors.mainColor, fontSize: 20.sp)), color: AppColors.mainColor, fontSize: 20.sp)),
onTap: () { onTap: () {
Get.toNamed(Routers.webviewShowPage, arguments: { Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
"url": XSConstantMacro.privacyPolicyURL, 'url': XSConstantMacro.privacyPolicyURL,
"title": '隐私政策'.tr 'title': '隐私政策'.tr
}); });
}, },
)), )),

38
lib/login/register/starLock_register_state.dart
View File

@ -5,37 +5,37 @@ import 'package:get/get.dart';
import '../../translations/trans_lib.dart'; import '../../translations/trans_lib.dart';
class StarLockRegisterState { class StarLockRegisterState {
StarLockRegisterState() {
resetResend();
}
final TextEditingController phoneOrEmailController = TextEditingController(); final TextEditingController phoneOrEmailController = TextEditingController();
final TextEditingController pwdController = TextEditingController(); final TextEditingController pwdController = TextEditingController();
final TextEditingController sureController = TextEditingController(); final TextEditingController sureController = TextEditingController();
final TextEditingController codeController = TextEditingController(); final TextEditingController codeController = TextEditingController();
var countryCode = "86".obs; RxString countryCode = '86'.obs;
var countryName = '中国'.tr.obs; RxString countryName = '中国'.tr.obs;
var phoneOrEmailStr = ''.obs; RxString phoneOrEmailStr = ''.obs;
var phoneOrEmailStrIsOK = false.obs; RxBool phoneOrEmailStrIsOK = false.obs;
var pwd = ''.obs; RxString pwd = ''.obs;
var surePwd = ''.obs; RxString surePwd = ''.obs;
var verificationCode = ''.obs; RxString verificationCode = ''.obs;
var xWidth = ''.obs; // 滑动验证码滑动位置 RxString xWidth = ''.obs; // 滑动验证码滑动位置
var isIphoneType = true.obs; RxBool isIphoneType = true.obs;
var canSub = false.obs; RxBool canSub = false.obs;
var agree = false.obs; RxBool agree = false.obs;
bool get isEmail => RegexUtil.isEmail(phoneOrEmailStr.value); bool get isEmail => RegexUtil.isEmail(phoneOrEmailStr.value);
bool get isIphone => RegexUtil.isMobileSimple(phoneOrEmailStr.value); bool get isIphone => RegexUtil.isMobileSimple(phoneOrEmailStr.value);
bool get pwdIsOK => pwd.value.isNotEmpty && surePwd.value.isNotEmpty; bool get pwdIsOK => pwd.value.isNotEmpty && surePwd.value.isNotEmpty;
bool get codeIsOK => verificationCode.value.isNotEmpty; bool get codeIsOK => verificationCode.value.isNotEmpty;
var canResend = false.obs; RxBool canResend = false.obs;
var btnText = ''.obs; RxString btnText = ''.obs;
var totalSeconds = 120; int totalSeconds = 120;
var currentSecond = 120; int currentSecond = 120;
StarLockRegisterState() {
resetResend();
}
void resetResend() { void resetResend() {
canResend.value = totalSeconds == currentSecond; canResend.value = totalSeconds == currentSecond;

22
lib/login/selectCountryRegion/common/countryRegionEntity.dart
View File

@ -3,10 +3,6 @@ import 'dart:convert';
import 'package:azlistview/azlistview.dart'; import 'package:azlistview/azlistview.dart';
class CountryRegionEntity { class CountryRegionEntity {
int? errorCode;
String? description;
String? errorMsg;
List<CountryRegionModel>? dataList;
CountryRegionEntity( CountryRegionEntity(
{this.errorCode, this.description, this.errorMsg, this.dataList}); {this.errorCode, this.description, this.errorMsg, this.dataList});
@ -22,6 +18,10 @@ class CountryRegionEntity {
}); });
} }
} }
int? errorCode;
String? description;
String? errorMsg;
List<CountryRegionModel>? dataList;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{}; final Map<String, dynamic> data = <String, dynamic>{};
@ -36,13 +36,6 @@ class CountryRegionEntity {
} }
class CountryRegionModel extends ISuspensionBean { class CountryRegionModel extends ISuspensionBean {
int? countryId;
String? name;
String? code;
String? flag;
String? abbreviation;
String? group;
String? tagIndex;
CountryRegionModel( CountryRegionModel(
{this.countryId, {this.countryId,
@ -61,6 +54,13 @@ class CountryRegionModel extends ISuspensionBean {
abbreviation = json['abbreviation']; abbreviation = json['abbreviation'];
group = json['group']; group = json['group'];
} }
int? countryId;
String? name;
String? code;
String? flag;
String? abbreviation;
String? group;
String? tagIndex;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{}; final Map<String, dynamic> data = <String, dynamic>{};

5
lib/login/selectCountryRegion/common/index.dart
View File

@ -1,7 +1,6 @@
export 'utils.dart';
export 'dart:convert'; export 'dart:convert';
export 'package:common_utils/common_utils.dart'; export 'package:common_utils/common_utils.dart';
export 'package:lpinyin/lpinyin.dart'; export 'package:lpinyin/lpinyin.dart';
export 'utils.dart';

2
lib/login/selectCountryRegion/common/utils.dart
View File

@ -48,7 +48,7 @@ class Utils {
height: 80.h, height: 80.h,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: <Widget>[
SizedBox( SizedBox(
width: 20.w, width: 20.w,
), ),

48
lib/login/selectCountryRegion/selectCountryRegion_page.dart
View File

@ -21,8 +21,8 @@ class SelectCountryRegionPage extends StatefulWidget {
} }
class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> { class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> {
List<CountryRegionModel> countriesList = []; List<CountryRegionModel> countriesList = <CountryRegionModel>[];
List<CountryRegionModel> topCountriesList = []; List<CountryRegionModel> topCountriesList = <CountryRegionModel>[];
TextEditingController searchController = TextEditingController(); TextEditingController searchController = TextEditingController();
@override @override
@ -30,19 +30,17 @@ class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> {
super.initState(); super.initState();
SuspensionUtil.setShowSuspensionStatus(countriesList.cast<ISuspensionBean>()); SuspensionUtil.setShowSuspensionStatus(countriesList.cast<ISuspensionBean>());
Future.delayed(const Duration(milliseconds: 20), () { Future.delayed(const Duration(milliseconds: 20), getCountriesListRequest);
getCountriesListRequest();
});
} }
//请求国家/地区json文件 //请求国家/地区json文件
Future<void> getCountriesListRequest() async { Future<void> getCountriesListRequest() async {
CountryRegionEntity entity = await ApiRepository.to.getCountryRegion('1'); final CountryRegionEntity entity = await ApiRepository.to.getCountryRegion('1');
countriesList.clear(); countriesList.clear();
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
countriesList.addAll(entity.dataList!); countriesList.addAll(entity.dataList!);
for(CountryRegionModel model in countriesList){ for(final CountryRegionModel model in countriesList){
if(model.name! == "中国"){ if(model.name! == '中国'){
topCountriesList.add(model); topCountriesList.add(model);
break; break;
} }
@ -56,10 +54,12 @@ class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> {
} }
void _handleList(List<CountryRegionModel> list) { void _handleList(List<CountryRegionModel> list) {
if (list.isEmpty) return; if (list.isEmpty) {
return;
}
for (int i = 0, length = list.length; i < length; i++) { for (int i = 0, length = list.length; i < length; i++) {
CountryRegionModel countryModel = list[i]; final CountryRegionModel countryModel = list[i];
String tag = countryModel.group!; final String tag = countryModel.group!;
if (RegExp('[A-Z]').hasMatch(tag)) { if (RegExp('[A-Z]').hasMatch(tag)) {
list[i].tagIndex = tag; list[i].tagIndex = tag;
} else { } else {
@ -85,12 +85,12 @@ class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> {
backgroundColor: const Color(0xFFFFFFFF), backgroundColor: const Color(0xFFFFFFFF),
appBar: TitleAppBar( appBar: TitleAppBar(
barTitle: barTitle:
"${TranslationLoader.lanKeys!.select!.tr} ${TranslationLoader.lanKeys!.countryAndRegion!.tr}", '${TranslationLoader.lanKeys!.select!.tr} ${TranslationLoader.lanKeys!.countryAndRegion!.tr}',
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
), ),
body: Column( body: Column(
children: [ children: <Widget>[
KeySearchWidget( KeySearchWidget(
editingController: searchController, editingController: searchController,
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
@ -98,9 +98,9 @@ class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> {
if(searchController.text.isEmpty){ if(searchController.text.isEmpty){
getCountriesListRequest(); getCountriesListRequest();
}else{ }else{
var searchList = <CountryRegionModel>[]; final List<CountryRegionModel> searchList = <CountryRegionModel>[];
for (int i = 0, length = countriesList.length; i < length; i++) { for (int i = 0, length = countriesList.length; i < length; i++) {
CountryRegionModel countryModel = countriesList[i]; final CountryRegionModel countryModel = countriesList[i];
if(countryModel.name!.contains(searchController.text) || countryModel.code!.contains(searchController.text)){ if(countryModel.name!.contains(searchController.text) || countryModel.code!.contains(searchController.text)){
searchList.add(countryModel); searchList.add(countryModel);
} }
@ -116,25 +116,25 @@ class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> {
visible: searchController.text.isEmpty, visible: searchController.text.isEmpty,
child: Utils.getSusItem(context, '★') child: Utils.getSusItem(context, '★')
), ),
countriesList.isNotEmpty ? Visibility( if (countriesList.isNotEmpty) Visibility(
visible: searchController.text.isEmpty, visible: searchController.text.isEmpty,
child: Utils.getListItem(context, topCountriesList[0], () { child: Utils.getListItem(context, topCountriesList[0], () {
CountryRegionModel model = topCountriesList[0]; final CountryRegionModel model = topCountriesList[0];
Map<String, dynamic> resultMap = {}; final Map<String, dynamic> resultMap = {};
resultMap['code'] = model.code ?? ''; resultMap['code'] = model.code ?? '';
resultMap['countryId'] = model.countryId.toString() ?? ''; resultMap['countryId'] = model.countryId.toString() ?? '';
resultMap['countryName'] = model.name ?? '' ; resultMap['countryName'] = model.name ?? '' ;
Navigator.pop(context, resultMap); Navigator.pop(context, resultMap);
}) })
): Container(), ) else Container(),
Expanded( Expanded(
child: AzListView( child: AzListView(
data: countriesList, data: countriesList,
itemCount: countriesList.length, itemCount: countriesList.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
CountryRegionModel model = countriesList[index]; final CountryRegionModel model = countriesList[index];
return Utils.getListItem(context, model, () { return Utils.getListItem(context, model, () {
Map<String, dynamic> resultMap = {}; final Map<String, dynamic> resultMap = {};
resultMap['code'] = model.code; resultMap['code'] = model.code;
resultMap['countryId'] = model.countryId.toString(); resultMap['countryId'] = model.countryId.toString();
resultMap['countryName'] = model.name; resultMap['countryName'] = model.name;
@ -144,11 +144,11 @@ class _SelectCountryRegionPageState extends State<SelectCountryRegionPage> {
}, },
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
susItemBuilder: (BuildContext context, int index) { susItemBuilder: (BuildContext context, int index) {
CountryRegionModel model = countriesList[index]; final CountryRegionModel model = countriesList[index];
String tag = model.getSuspensionTag(); final String tag = model.getSuspensionTag();
return Utils.getSusItem(context, tag); return Utils.getSusItem(context, tag);
}, },
indexBarData: const ['★', ...kIndexBarData], indexBarData: const <String>['★', ...kIndexBarData],
), ),
), ),
], ],

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

@ -396,7 +396,7 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage>
maxLines: 1, maxLines: 1,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'), FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(30), LengthLimitingTextInputFormatter(50),
], ],
style: TextStyle( style: TextStyle(
fontSize: 22.sp, color: AppColors.darkGrayTextColor), fontSize: 22.sp, color: AppColors.darkGrayTextColor),

15
lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_logic.dart
View File

@ -1,3 +1,4 @@
import 'dart:async'; import 'dart:async';
import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_state.dart'; import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_state.dart';
@ -13,7 +14,7 @@ class AuthorizedAdminListLogic extends BaseGetXController {
//请求电子钥匙列表 //请求电子钥匙列表
Future<ElectronicKeyListEntity> mockNetworkDataRequest() async { Future<ElectronicKeyListEntity> mockNetworkDataRequest() async {
ElectronicKeyListEntity entity = await ApiRepository.to.electronicKeyList( final ElectronicKeyListEntity entity = await ApiRepository.to.electronicKeyList(
endDate: '0', endDate: '0',
keyId: CommonDataManage().currentKeyInfo.keyId.toString(), keyId: CommonDataManage().currentKeyInfo.keyId.toString(),
keyStatus: '', keyStatus: '',
@ -39,10 +40,10 @@ class AuthorizedAdminListLogic extends BaseGetXController {
//删除电子钥匙名称请求 //删除电子钥匙名称请求
Future<void> deleteKeyRequest(String keyId, int includeUnderlings) async { Future<void> deleteKeyRequest(String keyId, int includeUnderlings) async {
ElectronicKeyListEntity entity = await ApiRepository.to.deleteElectronicKey( final ElectronicKeyListEntity entity = await ApiRepository.to.deleteElectronicKey(
keyId: keyId, includeUnderlings: includeUnderlings); keyId: keyId, includeUnderlings: includeUnderlings);
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
showToast("删除成功"); showToast('删除成功');
pageNo = 1; pageNo = 1;
mockNetworkDataRequest(); mockNetworkDataRequest();
} }
@ -61,20 +62,12 @@ class AuthorizedAdminListLogic extends BaseGetXController {
@override @override
void onReady() { void onReady() {
// TODO: implement onReady
super.onReady(); super.onReady();
_getAuthorizedAdminPageRefreshUIAction(); _getAuthorizedAdminPageRefreshUIAction();
} }
@override
void onInit() {
// TODO: implement onInit
super.onInit();
}
@override @override
void onClose() { void onClose() {
// TODO: implement onClose
super.onClose(); super.onClose();
_getAuthorizedAdminPageRefreshUIEvent?.cancel(); _getAuthorizedAdminPageRefreshUIEvent?.cancel();
} }

16
lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart
View File

@ -1,3 +1,4 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:flutter_slidable/flutter_slidable.dart';
@ -12,6 +13,7 @@ import 'package:star_lock/tools/storage.dart';
import '../../../../appRouters.dart'; import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
import '../../../../tools/EasyRefreshTool.dart'; import '../../../../tools/EasyRefreshTool.dart';
import '../../../../tools/customNetworkImage.dart';
import '../../../../tools/showTipView.dart'; import '../../../../tools/showTipView.dart';
import '../../../../tools/submitBtn.dart'; import '../../../../tools/submitBtn.dart';
import '../../../../tools/titleAppBar.dart'; import '../../../../tools/titleAppBar.dart';
@ -139,7 +141,7 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
], ],
), ),
child: _electronicKeyItem( child: _electronicKeyItem(
'images/controls_user.png', indexEntity.headUrl!,
indexEntity.keyName!, indexEntity.keyName!,
useDateStr, useDateStr,
keyStatus, keyStatus,
@ -195,10 +197,18 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox(width: 30.w), SizedBox(width: 30.w),
Image.asset( SizedBox(
avatarURL,
width: 60.w, width: 60.w,
height: 60.w, height: 60.w,
child: ClipRRect(
borderRadius: BorderRadius.circular(30.w),
child: CustomNetworkImage(
url: avatarURL,
defaultUrl: 'images/controls_user.png',
width: 105.w,
height: 105.h,
),
),
), ),
SizedBox(width: 20.w), SizedBox(width: 20.w),
Expanded( Expanded(

4
lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_state.dart
View File

@ -7,8 +7,8 @@ class AuthorizedAdminListState {
// final keyInfo = LockListInfoItemEntity().obs; // final keyInfo = LockListInfoItemEntity().obs;
// final lockMainEntity = LockMainEntity().obs; // final lockMainEntity = LockMainEntity().obs;
final itemDataList = <ElectronicKeyListItem>[].obs; final RxList<ElectronicKeyListItem> itemDataList = <ElectronicKeyListItem>[].obs;
final searchStr = ''.obs; final RxString searchStr = ''.obs;
// AuthorizedAdminListState() { // AuthorizedAdminListState() {
// Map map = Get.arguments; // Map map = Get.arguments;

18
lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_logic.dart
View File

@ -1,12 +1,9 @@
import 'dart:ffi';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdmin/notice_template_entity.dart';
import 'package:star_lock/main/lockDetail/lockSet/basicInformation/basicInformation/KeyDetailEntity.dart'; import 'package:star_lock/main/lockDetail/lockSet/basicInformation/basicInformation/KeyDetailEntity.dart';
import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/network/api_repository.dart';
import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/baseGetXController.dart';
import 'package:star_lock/tools/commonDataManage.dart';
import 'volumeAuthorizationLock_state.dart'; import 'volumeAuthorizationLock_state.dart';
@ -15,6 +12,16 @@ class VolumeAuthorizationLockLogic extends BaseGetXController {
//发送批量授权管理员 //发送批量授权管理员
Future<void> addAuthorizedAdminRequest() async { Future<void> addAuthorizedAdminRequest() async {
if (state.keyNameController.text.isEmpty) {
showToast('请输入接收者姓名');
return;
}
if (state.lockIdList.isEmpty) {
showToast('请选择锁'.tr);
return;
}
String getFailureDateTime = '0'; String getFailureDateTime = '0';
String getEffectiveDateTime = '0'; String getEffectiveDateTime = '0';
if (state.selectWidgetType.value == '1') { if (state.selectWidgetType.value == '1') {
@ -23,11 +30,6 @@ class VolumeAuthorizationLockLogic extends BaseGetXController {
getEffectiveDateTime = getEffectiveDateTime =
state.effectiveDateTime.value.millisecondsSinceEpoch.toString(); state.effectiveDateTime.value.millisecondsSinceEpoch.toString();
} }
if (state.lockIdList.isEmpty) {
showToast('请选择锁'.tr);
return;
}
final KeyDetailEntity entity = await ApiRepository.to.addAuthorizedAdmin( final KeyDetailEntity entity = await ApiRepository.to.addAuthorizedAdmin(
createUser: state.isCreateUser.value ? '1' : '0', createUser: state.isCreateUser.value ? '1' : '0',
endDate: getFailureDateTime, endDate: getFailureDateTime,

6
lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_state.dart
View File

@ -4,10 +4,8 @@ import 'package:get/get.dart';
class VolumeAuthorizationLockState { class VolumeAuthorizationLockState {
final FlutterContactPicker contactPicker = FlutterContactPicker(); final FlutterContactPicker contactPicker = FlutterContactPicker();
final TextEditingController emailOrPhoneController = final TextEditingController emailOrPhoneController = TextEditingController(); //邮箱/手机号输入框
TextEditingController(); //邮箱/手机号输入框 final TextEditingController keyNameController = TextEditingController(); //钥匙名输入框
final TextEditingController keyNameController =
TextEditingController(); //钥匙名输入框
late Contact contact; late Contact contact;
RxList<int> lockIdList = <int>[].obs; RxList<int> lockIdList = <int>[].obs;
RxBool isSendSuccess = false.obs; RxBool isSendSuccess = false.obs;

2
lib/main/lockDetail/card/addCardType/addCardType_page.dart
View File

@ -323,7 +323,7 @@ class _AddCardPageState extends State<AddCardPage>
maxLines: 1, maxLines: 1,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'), FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(18), LengthLimitingTextInputFormatter(50),
], ],
style: TextStyle( style: TextStyle(
fontSize: 22.sp, color: AppColors.darkGrayTextColor), fontSize: 22.sp, color: AppColors.darkGrayTextColor),

6
lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -62,7 +63,10 @@ class _CardDetailPageState extends State<CardDetailPage> with RouteAware {
Get.back(); Get.back();
state.typeName.value = state.changeNameController.text; state.typeName.value = state.changeNameController.text;
logic.editICCardData(); logic.editICCardData();
}); }, inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(50),
]);
})), })),
Obx(() => Visibility( Obx(() => Visibility(
visible: state.keyType.value == 4 || visible: state.keyType.value == 4 ||

28
lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_logic.dart
View File

@ -15,7 +15,7 @@ class ElectronicKeyListLogic extends BaseGetXController {
//请求电子钥匙列表 //请求电子钥匙列表
Future<ElectronicKeyListEntity> mockNetworkDataRequest() async { Future<ElectronicKeyListEntity> mockNetworkDataRequest() async {
ElectronicKeyListEntity entity = await ApiRepository.to.electronicKeyList( final ElectronicKeyListEntity entity = await ApiRepository.to.electronicKeyList(
endDate: '0', endDate: '0',
keyId: CommonDataManage().currentKeyInfo.keyId.toString(), keyId: CommonDataManage().currentKeyInfo.keyId.toString(),
keyStatus: '', keyStatus: '',
@ -27,11 +27,11 @@ class ElectronicKeyListLogic extends BaseGetXController {
searchStr: state.searchController.text); searchStr: state.searchController.text);
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
if (pageNo == 1) { if (pageNo == 1) {
state.itemDataList.value = entity.data!.itemList!; state.itemDataList.value = entity.data!.itemList;
pageNo++; pageNo++;
} else { } else {
if (entity.data!.itemList!.isNotEmpty) { if (entity.data!.itemList.isNotEmpty) {
state.itemDataList.value.addAll(entity.data!.itemList!); state.itemDataList.value.addAll(entity.data!.itemList);
pageNo++; pageNo++;
} }
} }
@ -41,10 +41,10 @@ class ElectronicKeyListLogic extends BaseGetXController {
//电子钥匙重置请求 //电子钥匙重置请求
Future<void> resetElectronicKeyListRequest() async { Future<void> resetElectronicKeyListRequest() async {
ElectronicKeyListEntity entity = await ApiRepository.to final ElectronicKeyListEntity entity = await ApiRepository.to
.resetElectronicKey(CommonDataManage().currentKeyInfo.lockId.toString(), '0'); .resetElectronicKey(CommonDataManage().currentKeyInfo.lockId.toString(), '0');
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
showToast("重置成功".tr, something: (){ showToast('重置成功'.tr, something: (){
pageNo = 1; pageNo = 1;
mockNetworkDataRequest(); mockNetworkDataRequest();
}); });
@ -53,20 +53,20 @@ class ElectronicKeyListLogic extends BaseGetXController {
//删除电子钥匙名称请求 //删除电子钥匙名称请求
Future<void> deleteKeyRequest(String keyId, int includeUnderlings) async { Future<void> deleteKeyRequest(String keyId, int includeUnderlings) async {
ElectronicKeyListEntity entity = final ElectronicKeyListEntity entity =
await ApiRepository.to.deleteElectronicKey( await ApiRepository.to.deleteElectronicKey(
keyId:keyId, keyId:keyId,
includeUnderlings:includeUnderlings includeUnderlings:includeUnderlings
); );
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
showToast("删除成功".tr,something: (){ showToast('删除成功'.tr,something: (){
pageNo = 1; pageNo = 1;
mockNetworkDataRequest(); mockNetworkDataRequest();
}); });
} }
} }
deletKeyLogic(ElectronicKeyListItem electronicKeyListItem){ void deletKeyLogic(ElectronicKeyListItem electronicKeyListItem){
if(electronicKeyListItem.keyRight == 1){ if(electronicKeyListItem.keyRight == 1){
// 授权管理员 // 授权管理员
ShowTipView().showDeleteAdministratorIsHaveAllDataDialog('同时删除其发送的所有钥匙，钥匙删除后不能恢复'.tr, (isAllData) { ShowTipView().showDeleteAdministratorIsHaveAllDataDialog('同时删除其发送的所有钥匙，钥匙删除后不能恢复'.tr, (isAllData) {
@ -74,7 +74,7 @@ class ElectronicKeyListLogic extends BaseGetXController {
}); });
}else{ }else{
// 普通用户 // 普通用户
ShowTipView().showIosTipWithContentDialog("删除钥匙会在用户APP连网后生效".tr,(){ ShowTipView().showIosTipWithContentDialog('删除钥匙会在用户APP连网后生效'.tr,(){
deleteKeyRequest(electronicKeyListItem.keyId.toString(), 0); deleteKeyRequest(electronicKeyListItem.keyId.toString(), 0);
}); });
} }
@ -92,21 +92,13 @@ class ElectronicKeyListLogic extends BaseGetXController {
@override @override
void onReady() { void onReady() {
// TODO: implement onReady
super.onReady(); super.onReady();
_getElectronicKeyListRefreshUIAction(); _getElectronicKeyListRefreshUIAction();
} }
@override
void onInit() {
// TODO: implement onInit
super.onInit();
}
@override @override
void onClose() { void onClose() {
// TODO: implement onClose
super.onClose(); super.onClose();
_getElectronicKeyListRefreshUIEvent?.cancel(); _getElectronicKeyListRefreshUIEvent?.cancel();

45
lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart
View File

@ -13,6 +13,7 @@ import 'package:star_lock/tools/storage.dart';
import '../../../../appRouters.dart'; import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
import '../../../../tools/EasyRefreshTool.dart'; import '../../../../tools/EasyRefreshTool.dart';
import '../../../../tools/customNetworkImage.dart';
import '../../../../tools/keySearchWidget.dart'; import '../../../../tools/keySearchWidget.dart';
import '../../../../tools/showTipView.dart'; import '../../../../tools/showTipView.dart';
import '../../../../tools/submitBtn.dart'; import '../../../../tools/submitBtn.dart';
@ -39,7 +40,7 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
Future<void> mockRequest() async { Future<void> mockRequest() async {
// 获取是否是演示模式 演示模式不获取接口 // 获取是否是演示模式 演示模式不获取接口
bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
logic.mockNetworkDataRequest().then((ElectronicKeyListEntity value) { logic.mockNetworkDataRequest().then((ElectronicKeyListEntity value) {
setState(() {}); setState(() {});
@ -130,7 +131,7 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
shrinkWrap: true, shrinkWrap: true,
itemCount: state.itemDataList.value.length, itemCount: state.itemDataList.value.length,
itemBuilder: (BuildContext c, int index) { itemBuilder: (BuildContext c, int index) {
ElectronicKeyListItem indexEntity = state.itemDataList.value[index]; final ElectronicKeyListItem indexEntity = state.itemDataList.value[index];
String useDateStr = ''; //使用期限 String useDateStr = ''; //使用期限
String keyStatus = ''; //钥匙状态 String keyStatus = ''; //钥匙状态
@ -166,12 +167,12 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
], ],
), ),
child: _electronicKeyItem( child: _electronicKeyItem(
'images/controls_user.png', indexEntity.headUrl!,
indexEntity.keyName!, indexEntity.keyName!,
useDateStr, useDateStr,
keyStatus, keyStatus,
isAdminKey, isAdminKey,
indexEntity.remoteEnable == 1 ? true : false, () { indexEntity.remoteEnable == 1, () {
Navigator.pushNamed( Navigator.pushNamed(
context, Routers.electronicKeyDetailPage, context, Routers.electronicKeyDetailPage,
arguments: <String, ElectronicKeyListItem>{ arguments: <String, ElectronicKeyListItem>{
@ -198,13 +199,13 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
//使用期限 //使用期限
String getUseDateStr(ElectronicKeyListItem indexEntity) { String getUseDateStr(ElectronicKeyListItem indexEntity) {
String useDateStr = ''; String useDateStr = '';
DateTime sendDateStr = final DateTime sendDateStr =
DateTime.fromMillisecondsSinceEpoch(indexEntity.sendDate!); DateTime.fromMillisecondsSinceEpoch(indexEntity.sendDate!);
if (indexEntity.keyType == XSConstantMacro.keyTypeTime) { if (indexEntity.keyType == XSConstantMacro.keyTypeTime) {
//限期 //限期
DateTime startDateStr = final DateTime startDateStr =
DateTime.fromMillisecondsSinceEpoch(indexEntity.startDate!); DateTime.fromMillisecondsSinceEpoch(indexEntity.startDate!);
DateTime endDateStr = final DateTime endDateStr =
DateTime.fromMillisecondsSinceEpoch(indexEntity.endDate!); DateTime.fromMillisecondsSinceEpoch(indexEntity.endDate!);
useDateStr = useDateStr =
'${startDateStr.toLocal().toString().substring(0, 16)}-${endDateStr.toLocal().toString().substring(0, 16)}'; '${startDateStr.toLocal().toString().substring(0, 16)}-${endDateStr.toLocal().toString().substring(0, 16)}';
@ -233,11 +234,24 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox(width: 30.w), SizedBox(width: 30.w),
Image.asset( SizedBox(
avatarURL,
width: 60.w, width: 60.w,
height: 60.w, height: 60.w,
child: ClipRRect(
borderRadius: BorderRadius.circular(30.w),
child: CustomNetworkImage(
url: avatarURL,
defaultUrl: 'images/controls_user.png',
width: 105.w,
height: 105.h,
),
),
), ),
// Image.asset(
// avatarURL,
// width: 60.w,
// height: 60.w,
// ),
SizedBox(width: 20.w), SizedBox(width: 20.w),
Expanded( Expanded(
child: Column( child: Column(
@ -259,25 +273,20 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
color: AppColors.blackColor)), color: AppColors.blackColor)),
), ),
SizedBox(width: 5.w), SizedBox(width: 5.w),
isRemteUnlocking if (isRemteUnlocking) Image.asset(
? Image.asset(
'images/icon_electronicKey_remteUnlocking.png', 'images/icon_electronicKey_remteUnlocking.png',
width: 24.w, width: 24.w,
height: 20.w, height: 20.w,
) ) else Container(),
: Container(),
SizedBox(width: 5.w), SizedBox(width: 5.w),
isAdminKey if (isAdminKey) Image.asset(
? Image.asset(
'images/icon_electronicKey_admin.png', 'images/icon_electronicKey_admin.png',
width: 24.w, width: 24.w,
height: 20.w, height: 20.w,
) ) else Container(),
: Container(),
], ],
), ),
), ),
// Expanded(child: SizedBox(width: 20.w,)), // Expanded(child: SizedBox(width: 20.w,)),
SizedBox(width: 10.w), SizedBox(width: 10.w),
Text( Text(

6
lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_state.dart
View File

@ -8,9 +8,9 @@ class ElectronicKeyListState {
TextEditingController searchController = TextEditingController(); //邮箱/手机号输入框 TextEditingController searchController = TextEditingController(); //邮箱/手机号输入框
// final keyInfo = LockListInfoItemEntity().obs; // final keyInfo = LockListInfoItemEntity().obs;
// final lockMainEntity = LockMainEntity().obs; // final lockMainEntity = LockMainEntity().obs;
var pageNum = 1.obs; //请求页码 RxInt pageNum = 1.obs; //请求页码
final pageSize = 20.obs; //请求每页数据条数 final RxInt pageSize = 20.obs; //请求每页数据条数
final itemDataList = <ElectronicKeyListItem>[].obs; final RxList<ElectronicKeyListItem> itemDataList = <ElectronicKeyListItem>[].obs;
// ElectronicKeyListState() { // ElectronicKeyListState() {
// Map map = Get.arguments; // Map map = Get.arguments;

78
lib/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart
View File

@ -1,8 +1,4 @@
class ElectronicKeyListEntity { class ElectronicKeyListEntity {
int? errorCode;
String? description;
String? errorMsg;
ElectronicKeyListData? data;
ElectronicKeyListEntity( ElectronicKeyListEntity(
{this.errorCode, this.description, this.errorMsg, this.data}); {this.errorCode, this.description, this.errorMsg, this.data});
@ -15,6 +11,10 @@ class ElectronicKeyListEntity {
? ElectronicKeyListData.fromJson(json['data']) ? ElectronicKeyListData.fromJson(json['data'])
: null; : null;
} }
int? errorCode;
String? description;
String? errorMsg;
ElectronicKeyListData? data;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{}; final Map<String, dynamic> data = <String, dynamic>{};
@ -29,11 +29,6 @@ class ElectronicKeyListEntity {
} }
class ElectronicKeyListData { class ElectronicKeyListData {
late List<ElectronicKeyListItem> itemList;
int? pageNo;
int? pageSize;
int? pages;
int? total;
ElectronicKeyListData( ElectronicKeyListData(
{required this.itemList, {required this.itemList,
@ -54,6 +49,11 @@ class ElectronicKeyListData {
pages = json['pages']; pages = json['pages'];
total = json['total']; total = json['total'];
} }
late List<ElectronicKeyListItem> itemList;
int? pageNo;
int? pageSize;
int? pages;
int? total;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{}; final Map<String, dynamic> data = <String, dynamic>{};
@ -67,29 +67,6 @@ class ElectronicKeyListData {
} }
class ElectronicKeyListItem { class ElectronicKeyListItem {
int? keyId;
int? lockId;
String? username;
String? lockName;
String? lockAlias;
int? userType;
String? keyName;
int? keyStatus;
int? startDate;
int? endDate;
int? keyRight;
int? keyType;
String? senderUsername;
String? remarks;
int? isCameraEnable;
int? faceAuthentication;
int? sendDate;
int? remoteEnable;
int? appUnlockMustOnline;
List? weekDays;
int? isOnlyManageSelf;
UserIdCard? userIdCard;
int? uid;
ElectronicKeyListItem({ ElectronicKeyListItem({
this.keyId, this.keyId,
@ -115,13 +92,14 @@ class ElectronicKeyListItem {
this.isOnlyManageSelf, this.isOnlyManageSelf,
this.userIdCard, this.userIdCard,
this.uid, this.uid,
this.headUrl
}); });
ElectronicKeyListItem.fromJson(Map<String, dynamic> json) { ElectronicKeyListItem.fromJson(Map<String, dynamic> json) {
keyId = json['keyId']; keyId = json['keyId'];
lockId = json['lockId']; lockId = json['lockId'];
json['username'] != null ? username = json['username'] : ""; json['username'] != null ? username = json['username'] : '';
json['lockName'] != null ? lockName = json['lockName'] : ""; json['lockName'] != null ? lockName = json['lockName'] : '';
lockAlias = json['lockAlias']; lockAlias = json['lockAlias'];
userType = json['userType']; userType = json['userType'];
keyName = json['keyName']; keyName = json['keyName'];
@ -131,7 +109,7 @@ class ElectronicKeyListItem {
keyRight = json['keyRight']; keyRight = json['keyRight'];
keyType = json['keyType']; keyType = json['keyType'];
senderUsername = json['senderUsername']; senderUsername = json['senderUsername'];
json['remarks'] != null ? remarks = json['remarks'] : ""; json['remarks'] != null ? remarks = json['remarks'] : '';
json['isCameraEnable'] != null json['isCameraEnable'] != null
? isCameraEnable = json['isCameraEnable'] ? isCameraEnable = json['isCameraEnable']
: 0; : 0;
@ -147,7 +125,32 @@ class ElectronicKeyListItem {
? userIdCard = UserIdCard.fromJson(json['userIdCard']) ? userIdCard = UserIdCard.fromJson(json['userIdCard'])
: null; : null;
uid = json['uid']; uid = json['uid'];
headUrl = json['headUrl'];
} }
int? keyId;
int? lockId;
String? username;
String? lockName;
String? lockAlias;
int? userType;
String? keyName;
int? keyStatus;
int? startDate;
int? endDate;
int? keyRight;
int? keyType;
String? senderUsername;
String? remarks;
int? isCameraEnable;
int? faceAuthentication;
int? sendDate;
int? remoteEnable;
int? appUnlockMustOnline;
List? weekDays;
int? isOnlyManageSelf;
UserIdCard? userIdCard;
int? uid;
String? headUrl;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{}; final Map<String, dynamic> data = <String, dynamic>{};
@ -176,13 +179,12 @@ class ElectronicKeyListItem {
data['userIdCard'] = userIdCard!.toJson(); data['userIdCard'] = userIdCard!.toJson();
} }
data['uid'] = uid; data['uid'] = uid;
data['headUrl'] = headUrl;
return data; return data;
} }
} }
class UserIdCard { class UserIdCard {
String? realName;
String? idCardNumber;
UserIdCard({this.realName, this.idCardNumber}); UserIdCard({this.realName, this.idCardNumber});
@ -190,6 +192,8 @@ class UserIdCard {
realName = json['realName']; realName = json['realName'];
idCardNumber = json['idCardNumber']; idCardNumber = json['idCardNumber'];
} }
String? realName;
String? idCardNumber;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{}; final Map<String, dynamic> data = <String, dynamic>{};

2
lib/main/lockDetail/face/addFaceType/addFaceType_page.dart
View File

@ -306,7 +306,7 @@ class _AddFaceTypePageState extends State<AddFaceTypePage> with SingleTickerProv
maxLines: 1, maxLines: 1,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'), FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(18), LengthLimitingTextInputFormatter(50),
], ],
style: TextStyle( style: TextStyle(
fontSize: 22.sp, color: AppColors.darkGrayTextColor), fontSize: 22.sp, color: AppColors.darkGrayTextColor),

72
lib/main/lockDetail/face/faceDetail/faceDetail_logic.dart
View File

@ -1,10 +1,10 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/app_settings/app_settings.dart';
import 'package:star_lock/blue/io_protocol/io_addFace.dart'; import 'package:star_lock/blue/io_protocol/io_addFace.dart';
import 'package:star_lock/blue/io_type.dart'; import 'package:star_lock/login/login/entity/LoginEntity.dart';
import 'package:star_lock/main/lockDetail/face/faceDetail/faceDetail_state.dart'; import 'package:star_lock/main/lockDetail/face/faceDetail/faceDetail_state.dart';
import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/baseGetXController.dart';
import 'package:star_lock/tools/dateTool.dart'; import 'package:star_lock/tools/dateTool.dart';
@ -23,7 +23,7 @@ class FaceDetailLogic extends BaseGetXController {
late StreamSubscription<Reply> _replySubscription; late StreamSubscription<Reply> _replySubscription;
void _initReplySubscription() { void _initReplySubscription() {
_replySubscription = _replySubscription =
EventBusManager().eventBus!.on<Reply>().listen((reply) { EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
// 添加人脸开始(此处用作删除人脸) // 添加人脸开始(此处用作删除人脸)
if ((reply is SenderAddFaceReply) && (state.ifCurrentScreen.value == true)) { if ((reply is SenderAddFaceReply) && (state.ifCurrentScreen.value == true)) {
_replyAddFaceBegin(reply); _replyAddFaceBegin(reply);
@ -33,7 +33,7 @@ class FaceDetailLogic extends BaseGetXController {
// 添加人脸开始 // 添加人脸开始
Future<void> _replyAddFaceBegin(Reply reply) async { Future<void> _replyAddFaceBegin(Reply reply) async {
int status = reply.data[2]; final int status = reply.data[2];
switch (status) { switch (status) {
case 0x00: case 0x00:
@ -49,14 +49,14 @@ class FaceDetailLogic extends BaseGetXController {
break; break;
case 0x06: case 0x06:
//无权限 //无权限
var privateKey = await Storage.getStringList(saveBluePrivateKey); final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
List<int> getPrivateKeyList = changeStringListToIntList(privateKey!); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
var signKey = await Storage.getStringList(saveBlueSignKey); final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
List<int> signKeyDataList = changeStringListToIntList(signKey!); final List<int> signKeyDataList = changeStringListToIntList(signKey!);
var token = reply.data.sublist(5, 9); final List<int> token = reply.data.sublist(5, 9);
var saveStrList = changeIntListToStringList(token); final List<String> saveStrList = changeIntListToStringList(token);
Storage.setStringList(saveBlueToken, saveStrList); Storage.setStringList(saveBlueToken, saveStrList);
IoSenderManage.senderAddFaceCommand( IoSenderManage.senderAddFaceCommand(
@ -101,14 +101,14 @@ class FaceDetailLogic extends BaseGetXController {
BlueManage().blueSendData(BlueManage().connectDeviceName, BlueManage().blueSendData(BlueManage().connectDeviceName,
(BluetoothConnectionState deviceConnectionState) async { (BluetoothConnectionState deviceConnectionState) async {
if (deviceConnectionState == BluetoothConnectionState.connected) { if (deviceConnectionState == BluetoothConnectionState.connected) {
var privateKey = await Storage.getStringList(saveBluePrivateKey); final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
List<int> getPrivateKeyList = changeStringListToIntList(privateKey!); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
var token = await Storage.getStringList(saveBlueToken); final List<String>? token = await Storage.getStringList(saveBlueToken);
List<int> getTokenList = changeStringListToIntList(token!); final List<int> getTokenList = changeStringListToIntList(token!);
var signKey = await Storage.getStringList(saveBlueSignKey); final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
List<int> signKeyDataList = changeStringListToIntList(signKey!); final List<int> signKeyDataList = changeStringListToIntList(signKey!);
IoSenderManage.senderAddFaceCommand( IoSenderManage.senderAddFaceCommand(
keyID:state.keyId.value.toString(), keyID:state.keyId.value.toString(),
@ -143,36 +143,36 @@ class FaceDetailLogic extends BaseGetXController {
} }
// 删除人脸 // 删除人脸
void deletFaceData() async { Future<void> deletFaceData() async {
var entity = await ApiRepository.to.deleteFaceData( final LoginEntity entity = await ApiRepository.to.deleteFaceData(
faceId: state.faceItemData.value.faceId!, faceId: state.faceItemData.value.faceId!,
lockId: state.faceItemData.value.lockId!, lockId: state.faceItemData.value.lockId!,
); );
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
showToast("删除成功", something: () { showToast('删除成功', something: () {
Get.back(result: "addScuess"); Get.back(result: 'addScuess');
}); });
} }
} }
// 修改人脸名称 // 修改人脸名称
void updateFaceNameData() async { Future<void> updateFaceNameData() async {
var entity = await ApiRepository.to.updateFaceName( final LoginEntity entity = await ApiRepository.to.updateFaceName(
lockId: state.faceItemData.value.lockId!, lockId: state.faceItemData.value.lockId!,
faceId: state.faceItemData.value.faceId!, faceId: state.faceItemData.value.faceId!,
faceName: state.changeNameController.text, faceName: state.changeNameController.text,
); );
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
state.typeName.value = state.changeNameController.text; state.typeName.value = state.changeNameController.text;
showToast("修改成功", something: () { showToast('修改成功', something: () {
Get.back(result: "addScuess"); Get.back(result: 'addScuess');
}); });
} }
} }
// 修改人脸有效期 // 修改人脸有效期
void editFaceData() async { Future<void> editFaceData() async {
var entity = await ApiRepository.to.updateFaceValidity( final LoginEntity entity = await ApiRepository.to.updateFaceValidity(
lockId: state.faceItemData.value.lockId!, lockId: state.faceItemData.value.lockId!,
faceId: state.faceItemData.value.faceId!, faceId: state.faceItemData.value.faceId!,
startDate: int.parse(state.startDate.value), startDate: int.parse(state.startDate.value),
@ -182,13 +182,13 @@ class FaceDetailLogic extends BaseGetXController {
faceType: state.keyType.value, faceType: state.keyType.value,
weekDay: state.weekDay.value, weekDay: state.weekDay.value,
faceName: state.changeNameController.text, faceName: state.changeNameController.text,
addType: "1", addType: '1',
isCoerced: state.isStressFace.value ? 2 : 1, isCoerced: state.isStressFace.value ? 2 : 1,
faceRight: state.isAdministrator.value ? 1 : 0, faceRight: state.isAdministrator.value ? 1 : 0,
); );
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
showToast("修改成功", something: () { showToast('修改成功', something: () {
Get.back(result: "addScuess"); Get.back(result: 'addScuess');
}); });
} }
} }
@ -196,33 +196,25 @@ class FaceDetailLogic extends BaseGetXController {
String getKeyTypeShowDateTime() { String getKeyTypeShowDateTime() {
String useDateStr = ''; String useDateStr = '';
if (state.keyType.value == 1) { if (state.keyType.value == 1) {
useDateStr = "永久"; useDateStr = '永久';
} else if (state.keyType.value == 2) { } else if (state.keyType.value == 2) {
useDateStr = useDateStr =
"${DateTool().dateToYMDHNString(state.startDate.value)}\n${DateTool().dateToYMDHNString(state.endDate.value)}"; '${DateTool().dateToYMDHNString(state.startDate.value)}\n${DateTool().dateToYMDHNString(state.endDate.value)}';
} else if (state.keyType.value == 4) { } else if (state.keyType.value == 4) {
useDateStr = useDateStr =
"${DateTool().dateToYMDString(state.startDate.value)}\n${DateTool().dateToYMDString(state.endDate.value)}"; '${DateTool().dateToYMDString(state.startDate.value)}\n${DateTool().dateToYMDString(state.endDate.value)}';
} }
return useDateStr; return useDateStr;
} }
@override @override
void onReady() { void onReady() {
// TODO: implement onReady
super.onReady(); super.onReady();
_initReplySubscription(); _initReplySubscription();
} }
@override
void onInit() {
// TODO: implement onInit
super.onInit();
}
@override @override
void onClose() { void onClose() {
// TODO: implement onClose
super.onClose(); super.onClose();
_replySubscription.cancel(); _replySubscription.cancel();

111
lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
View File

@ -1,9 +1,11 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/face/faceDetail/faceDetail_logic.dart'; import 'package:star_lock/main/lockDetail/face/faceDetail/faceDetail_logic.dart';
import 'package:star_lock/main/lockDetail/face/faceDetail/faceDetail_state.dart';
import '../../../../appRouters.dart'; import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
@ -23,22 +25,22 @@ class FaceDetailPage extends StatefulWidget {
} }
class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware { class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
final logic = Get.put(FaceDetailLogic()); final FaceDetailLogic logic = Get.put(FaceDetailLogic());
final state = Get.find<FaceDetailLogic>().state; final FaceDetailState state = Get.find<FaceDetailLogic>().state;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar( appBar: TitleAppBar(
barTitle: "人脸详情", barTitle: '人脸详情',
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
), ),
body: ListView( body: ListView(
children: [ children: <Widget>[
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: "人脸号", leftTitel: '人脸号',
rightTitle: state.typeNumber.value, rightTitle: state.typeNumber.value,
isHaveDirection: false, isHaveDirection: false,
isHaveLine: true)), isHaveLine: true)),
@ -51,23 +53,24 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
// showCupertinoAlertDialog(context); // showCupertinoAlertDialog(context);
ShowTipView().showTFViewAlertDialog( ShowTipView().showTFViewAlertDialog(
state.changeNameController, state.changeNameController,
"${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.name!.tr}", '${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.name!.tr}',
"", () { '', () {
if (state.changeNameController.text.isEmpty) { if (state.changeNameController.text.isEmpty) {
logic.showToast("请输入姓名".tr); logic.showToast('请输入姓名'.tr);
return; return;
} }
Get.back(); Get.back();
state.typeName.value = state.changeNameController.text; state.typeName.value = state.changeNameController.text;
logic.updateFaceNameData(); logic.updateFaceNameData();
}); }, inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(50),
]);
})), })),
Obx(() => Visibility( Obx(() => Visibility(
visible: (state.keyType.value == 4 || visible: state.keyType.value == 4 ||
state.keyType.value == 2 || state.keyType.value == 2 ||
state.keyType.value == 1) state.keyType.value == 1,
? true
: false,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr, leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr,
allHeight: 70.h, allHeight: 70.h,
@ -80,14 +83,14 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
// 限时 // 限时
var data = await Get.toNamed( var data = await Get.toNamed(
Routers.otherTypeKeyChangeDatePage, Routers.otherTypeKeyChangeDatePage,
arguments: { arguments: <String, Object>{
"pushType": 3, 'pushType': 3,
"fingerprintItemData": state.faceItemData.value, 'fingerprintItemData': state.faceItemData.value,
}); });
if (data != null) { if (data != null) {
setState(() { setState(() {
state.startDate.value = data["beginTimeTimestamp"]; state.startDate.value = data['beginTimeTimestamp'];
state.endDate.value = data["endTimeTimestamp"]; state.endDate.value = data['endTimeTimestamp'];
state.keyType.value = 2; state.keyType.value = 2;
}); });
} }
@ -95,23 +98,23 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
// 循环 // 循环
var data = await Get.toNamed( var data = await Get.toNamed(
Routers.otherTypeKeyChangeValidityDatePage, Routers.otherTypeKeyChangeValidityDatePage,
arguments: { arguments: <String, Object>{
"pushType": 3, 'pushType': 3,
"fingerprintItemData": state.faceItemData.value, 'fingerprintItemData': state.faceItemData.value,
}); });
if (data != null) { if (data != null) {
setState(() { setState(() {
state.startDate.value = data["starDate"]; state.startDate.value = data['starDate'];
state.endDate.value = data["endDate"]; state.endDate.value = data['endDate'];
state.startTime.value = data["starTime"]; state.startTime.value = data['starTime'];
state.endTime.value = data["endTime"]; state.endTime.value = data['endTime'];
state.weekDay.value = data["validityValue"]; state.weekDay.value = data['validityValue'];
}); });
} }
} }
}))), }))),
Obx(() => Visibility( Obx(() => Visibility(
visible: state.keyType.value == 4 ? true : false, visible: state.keyType.value == 4,
child: Obx(() => CommonItem( child: Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.effectiveDay!.tr, leftTitel: TranslationLoader.lanKeys!.effectiveDay!.tr,
rightTitle: state.weekDay.value.join(','), rightTitle: state.weekDay.value.join(','),
@ -120,41 +123,41 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
action: () async { action: () async {
var data = await Get.toNamed( var data = await Get.toNamed(
Routers.otherTypeKeyChangeValidityDatePage, Routers.otherTypeKeyChangeValidityDatePage,
arguments: { arguments: <String, Object>{
"pushType": 3, 'pushType': 3,
"fingerprintItemData": state.faceItemData.value, 'fingerprintItemData': state.faceItemData.value,
}); });
if (data != null) { if (data != null) {
setState(() { setState(() {
state.startDate.value = data["starDate"]; state.startDate.value = data['starDate'];
state.endDate.value = data["endDate"]; state.endDate.value = data['endDate'];
state.startTime.value = data["starTime"]; state.startTime.value = data['starTime'];
state.endTime.value = data["endTime"]; state.endTime.value = data['endTime'];
state.weekDay.value = data["validityValue"]; state.weekDay.value = data['validityValue'];
}); });
} }
})))), })))),
Obx(() => Visibility( Obx(() => Visibility(
visible: state.keyType.value == 4 ? true : false, visible: state.keyType.value == 4,
child: Obx(() => CommonItem( child: Obx(() => CommonItem(
leftTitel: "有效时间", leftTitel: '有效时间',
rightTitle: rightTitle:
"${DateTool().dateToHNString(state.startTime.value)}-${DateTool().dateToHNString(state.endTime.value)}", '${DateTool().dateToHNString(state.startTime.value)}-${DateTool().dateToHNString(state.endTime.value)}',
isHaveDirection: true, isHaveDirection: true,
action: () async { action: () async {
var data = await Get.toNamed( var data = await Get.toNamed(
Routers.otherTypeKeyChangeValidityDatePage, Routers.otherTypeKeyChangeValidityDatePage,
arguments: { arguments: <String, Object>{
"pushType": 3, 'pushType': 3,
"fingerprintItemData": state.faceItemData.value, 'fingerprintItemData': state.faceItemData.value,
}); });
if (data != null) { if (data != null) {
setState(() { setState(() {
state.startDate.value = data["starDate"]; state.startDate.value = data['starDate'];
state.endDate.value = data["endDate"]; state.endDate.value = data['endDate'];
state.startTime.value = data["starTime"]; state.startTime.value = data['starTime'];
state.endTime.value = data["endTime"]; state.endTime.value = data['endTime'];
state.weekDay.value = data["validityValue"]; state.weekDay.value = data['validityValue'];
}); });
} }
})))), })))),
@ -177,8 +180,8 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
// isHaveLine: true, // isHaveLine: true,
// rightWidget: SizedBox(width: 60.w, height: 50.h, child: _isStressFace()))), // rightWidget: SizedBox(width: 60.w, height: 50.h, child: _isStressFace()))),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: "是否为管理员".tr, leftTitel: '是否为管理员'.tr,
rightTitle: "", rightTitle: '',
isTipsImg: false, isTipsImg: false,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: rightWidget:
@ -186,10 +189,10 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
Container(height: 10.h), Container(height: 10.h),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr,
rightTitle: "", rightTitle: '',
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.lockOperatingRecordPage, arguments: { Get.toNamed(Routers.lockOperatingRecordPage, arguments: <String, Object?>{
'type': 4, 'type': 4,
'id': state.faceItemData.value.faceId.toString(), 'id': state.faceItemData.value.faceId.toString(),
'recordName': state.faceItemData.value.faceName 'recordName': state.faceItemData.value.faceName
@ -206,7 +209,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
left: 30.w, right: 30.w, top: 30.w, bottom: 30.w), left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
padding: EdgeInsets.only(top: 25.w, bottom: 25.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () { onClick: () {
ShowTipView().showIosTipWithContentDialog("确定要删除吗?".tr, ShowTipView().showIosTipWithContentDialog('确定要删除吗?'.tr,
() async { () async {
state.isDeletFace.value = true; state.isDeletFace.value = true;
logic.senderAddFace(); logic.senderAddFace();
@ -223,7 +226,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: state.isStressFace.value, value: state.isStressFace.value,
onChanged: (value) { onChanged: (bool value) {
setState(() { setState(() {
state.isStressFace.value = value; state.isStressFace.value = value;
state.isDeletFace.value = false; state.isDeletFace.value = false;
@ -240,7 +243,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: state.isAdministrator.value, value: state.isAdministrator.value,
onChanged: (value) { onChanged: (bool value) {
// state.isAdministrator.value = value; // state.isAdministrator.value = value;
// state.isDeletFace.value = false; // state.isDeletFace.value = false;
// logic.senderAddFace(); // logic.senderAddFace();
@ -250,7 +253,6 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
@override @override
void didChangeDependencies() { void didChangeDependencies() {
// TODO: implement didChangeDependencies
super.didChangeDependencies(); super.didChangeDependencies();
/// 路由订阅 /// 路由订阅
@ -259,7 +261,6 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
@override @override
void dispose() { void dispose() {
// TODO: implement dispose
/// 取消路由订阅 /// 取消路由订阅
AppRouteObserver().routeObserver.unsubscribe(this); AppRouteObserver().routeObserver.unsubscribe(this);
super.dispose(); super.dispose();

2
lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart
View File

@ -383,7 +383,7 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> with Si
maxLines: 1, maxLines: 1,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'), FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(18), LengthLimitingTextInputFormatter(50),
], ],
style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor), style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor),
controller: state.nameController, controller: state.nameController,

30
lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -41,7 +42,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
children: <Widget>[ children: <Widget>[
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: leftTitel:
"${TranslationLoader.lanKeys!.fingerprint!.tr}${TranslationLoader.lanKeys!.number!.tr}", '${TranslationLoader.lanKeys!.fingerprint!.tr}${TranslationLoader.lanKeys!.number!.tr}',
rightTitle: state.typeNumber.value, rightTitle: state.typeNumber.value,
isHaveDirection: false, isHaveDirection: false,
isHaveLine: true)), isHaveLine: true)),
@ -53,7 +54,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
action: () { action: () {
ShowTipView().showTFViewAlertDialog( ShowTipView().showTFViewAlertDialog(
state.changeNameController, state.changeNameController,
"${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.name!.tr}", '${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.name!.tr}',
'', () { '', () {
if (state.changeNameController.text.isEmpty) { if (state.changeNameController.text.isEmpty) {
logic.showToast('请输入姓名'.tr); logic.showToast('请输入姓名'.tr);
@ -62,14 +63,15 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
Get.back(); Get.back();
state.typeName.value = state.changeNameController.text; state.typeName.value = state.changeNameController.text;
logic.editFingerprintsData(); logic.editFingerprintsData();
}); }, inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(50),
]);
})), })),
Obx(() => Visibility( Obx(() => Visibility(
visible: (state.keyType.value == 4 || visible: state.keyType.value == 4 ||
state.keyType.value == 2 || state.keyType.value == 2 ||
state.keyType.value == 1) state.keyType.value == 1,
? true
: false,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr, leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr,
allHeight: 70.h, allHeight: 70.h,
@ -115,7 +117,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
} }
}))), }))),
Obx(() => Visibility( Obx(() => Visibility(
visible: state.keyType.value == 4 ? true : false, visible: state.keyType.value == 4,
child: Obx(() => CommonItem( child: Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.effectiveDay!.tr, leftTitel: TranslationLoader.lanKeys!.effectiveDay!.tr,
rightTitle: state.weekDay.value.join(','), rightTitle: state.weekDay.value.join(','),
@ -140,7 +142,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
} }
})))), })))),
Obx(() => Visibility( Obx(() => Visibility(
visible: state.keyType.value == 4 ? true : false, visible: state.keyType.value == 4,
child: Obx(() => CommonItem( child: Obx(() => CommonItem(
leftTitel: '有效时间'.tr, leftTitel: '有效时间'.tr,
rightTitle: rightTitle:
@ -259,7 +261,6 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
@override @override
void didChangeDependencies() { void didChangeDependencies() {
// TODO: implement didChangeDependencies
super.didChangeDependencies(); super.didChangeDependencies();
/// 路由订阅 /// 路由订阅
@ -268,7 +269,6 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
@override @override
void dispose() { void dispose() {
// TODO: implement dispose
/// 取消路由订阅 /// 取消路由订阅
AppRouteObserver().routeObserver.unsubscribe(this); AppRouteObserver().routeObserver.unsubscribe(this);
super.dispose(); super.dispose();
@ -286,7 +286,9 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
void didPop() { void didPop() {
super.didPop(); super.didPop();
logic.cancelBlueConnetctToastTimer(); logic.cancelBlueConnetctToastTimer();
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); if (EasyLoading.isShow) {
EasyLoading.dismiss(animation: true);
}
state.ifCurrentScreen.value = false; state.ifCurrentScreen.value = false;
state.sureBtnState.value = 0; state.sureBtnState.value = 0;
} }
@ -303,7 +305,9 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
void didPushNext() { void didPushNext() {
super.didPushNext(); super.didPushNext();
logic.cancelBlueConnetctToastTimer(); logic.cancelBlueConnetctToastTimer();
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); if (EasyLoading.isShow) {
EasyLoading.dismiss(animation: true);
}
state.ifCurrentScreen.value = false; state.ifCurrentScreen.value = false;
state.sureBtnState.value = 0; state.sureBtnState.value = 0;
} }

61
lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart
View File

@ -5,6 +5,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintList_state.dart';
import '../../../../appRouters.dart'; import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
@ -30,11 +31,11 @@ class FingerprintListPage extends StatefulWidget {
} }
class _FingerprintListPageState extends State<FingerprintListPage> with RouteAware { class _FingerprintListPageState extends State<FingerprintListPage> with RouteAware {
final logic = Get.put(FingerprintListLogic()); final FingerprintListLogic logic = Get.put(FingerprintListLogic());
final state = Get.find<FingerprintListLogic>().state; final FingerprintListState state = Get.find<FingerprintListLogic>().state;
Future<void> getHttpData() async { Future<void> getHttpData() async {
var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
logic.getFingerprintsListData().then((FingerprintListDataEntity value){ logic.getFingerprintsListData().then((FingerprintListDataEntity value){
if (mounted) { if (mounted) {
@ -59,23 +60,23 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
barTitle: TranslationLoader.lanKeys!.fingerprint!.tr, barTitle: TranslationLoader.lanKeys!.fingerprint!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
actionsList: [ actionsList: <Widget>[
TextButton( TextButton(
child: Text( child: Text(
TranslationLoader.lanKeys!.reset!.tr, TranslationLoader.lanKeys!.reset!.tr,
style: TextStyle(color: Colors.white, fontSize: 24.sp), style: TextStyle(color: Colors.white, fontSize: 24.sp),
), ),
onPressed: () async { onPressed: () async {
var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
ShowTipView().showIosTipWithContentDialog("重置后，该锁的指纹都将被删除哦，确认要重置吗?".tr, () async { ShowTipView().showIosTipWithContentDialog('重置后，该锁的指纹都将被删除哦，确认要重置吗?'.tr, () async {
state.isDeletAll = true; state.isDeletAll = true;
state.deletKeyID = "1"; state.deletKeyID = '1';
state.deletFingerNo = 0; state.deletFingerNo = 0;
logic.senderAddFingerprint(); logic.senderAddFingerprint();
}); });
} else { } else {
logic.showToast("演示模式".tr); logic.showToast('演示模式'.tr);
} }
}, },
), ),
@ -90,7 +91,7 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
getHttpData(); getHttpData();
}, },
child: Column( child: Column(
children: [ children: <Widget>[
KeySearchWidget( KeySearchWidget(
editingController: state.searchController, editingController: state.searchController,
onSubmittedAction: () { onSubmittedAction: () {
@ -105,10 +106,10 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
AddBottomWhiteBtn( AddBottomWhiteBtn(
btnName: '${TranslationLoader.lanKeys!.add!.tr}${TranslationLoader.lanKeys!.fingerprint!.tr}', btnName: '${TranslationLoader.lanKeys!.add!.tr}${TranslationLoader.lanKeys!.fingerprint!.tr}',
onClick: () async { onClick: () async {
var data = final data =
await Get.toNamed(Routers.addFingerprintTypePage, arguments: { await Get.toNamed(Routers.addFingerprintTypePage, arguments: <String, int>{
"lockId": state.lockId.value, 'lockId': state.lockId.value,
"fromType": 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入 'fromType': 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入
}); });
if (data != null) { if (data != null) {
logic.pageNo = 1; logic.pageNo = 1;
@ -128,18 +129,18 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
? SlidableAutoCloseBehavior( ? SlidableAutoCloseBehavior(
child: ListView.separated( child: ListView.separated(
itemCount: state.fingerprintItemListData.value.length, itemCount: state.fingerprintItemListData.value.length,
itemBuilder: (c, index) { itemBuilder: (BuildContext c, int index) {
FingerprintItemData fingerprintItemData = state.fingerprintItemListData.value[index]; final FingerprintItemData fingerprintItemData = state.fingerprintItemListData.value[index];
// 指纹 // 指纹
return Slidable( return Slidable(
key:ValueKey(fingerprintItemData.fingerprintId), key:ValueKey(fingerprintItemData.fingerprintId),
endActionPane: ActionPane( endActionPane: ActionPane(
extentRatio: 0.2, extentRatio: 0.2,
motion: const ScrollMotion(), motion: const ScrollMotion(),
children: [ children: <Widget>[
SlidableAction( SlidableAction(
onPressed: (BuildContext context){ onPressed: (BuildContext context){
ShowTipView().showIosTipWithContentDialog("确定要删除吗?".tr, () async { ShowTipView().showIosTipWithContentDialog('确定要删除吗?'.tr, () async {
state.isDeletAll = false; state.isDeletAll = false;
state.deletKeyID = fingerprintItemData.fingerprintId.toString(); state.deletKeyID = fingerprintItemData.fingerprintId.toString();
state.deletFingerNo = int.parse(fingerprintItemData.fingerprintNumber!); state.deletFingerNo = int.parse(fingerprintItemData.fingerprintNumber!);
@ -158,10 +159,10 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
fingerprintItemData.fingerprintName!, fingerprintItemData.fingerprintName!,
logic.getKeyType(fingerprintItemData), logic.getKeyType(fingerprintItemData),
logic.getKeyDateType(fingerprintItemData), () async { logic.getKeyDateType(fingerprintItemData), () async {
var data = await Get.toNamed( final data = await Get.toNamed(
Routers.fingerprintDetailPage, Routers.fingerprintDetailPage,
arguments: { arguments: <String, FingerprintItemData>{
"fingerprintItemData": fingerprintItemData, 'fingerprintItemData': fingerprintItemData,
}); });
if (data != null) { if (data != null) {
logic.pageNo = 1; logic.pageNo = 1;
@ -192,21 +193,21 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
// // borderRadius: BorderRadius.circular(10.w), // // borderRadius: BorderRadius.circular(10.w),
// ), // ),
child: Row( child: Row(
children: [ children: <Widget>[
SizedBox(width: 30.w), SizedBox(width: 30.w),
Image.asset(lockTypeIcon, width: 60.w, height: 60.w), Image.asset(lockTypeIcon, width: 60.w, height: 60.w),
SizedBox(width: 20.w), SizedBox(width: 20.w),
Expanded( Expanded(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: <Widget>[
Row( Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: <Widget>[
SizedBox( SizedBox(
width: ifInvalidation.isNotEmpty ? 1.sw - 110.w - 100.w : 1.sw - 110.w - 50.w, width: ifInvalidation.isNotEmpty ? 1.sw - 110.w - 100.w : 1.sw - 110.w - 50.w,
child: Row( child: Row(
children: [ children: <Widget>[
Flexible( Flexible(
child: Text( child: Text(
lockTypeTitle, lockTypeTitle,
@ -228,7 +229,7 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
SizedBox(height: 5.h), SizedBox(height: 5.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: <Widget>[
Flexible( Flexible(
child: Text(showTime, child: Text(showTime,
maxLines: 1, maxLines: 1,
@ -252,7 +253,6 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
@override @override
void didChangeDependencies() { void didChangeDependencies() {
// TODO: implement didChangeDependencies
super.didChangeDependencies(); super.didChangeDependencies();
/// 路由订阅 /// 路由订阅
@ -261,7 +261,6 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
@override @override
void dispose() { void dispose() {
// TODO: implement dispose
/// 取消路由订阅 /// 取消路由订阅
AppRouteObserver().routeObserver.unsubscribe(this); AppRouteObserver().routeObserver.unsubscribe(this);
super.dispose(); super.dispose();
@ -279,7 +278,9 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
void didPop() { void didPop() {
super.didPop(); super.didPop();
logic.cancelBlueConnetctToastTimer(); logic.cancelBlueConnetctToastTimer();
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); if (EasyLoading.isShow) {
EasyLoading.dismiss(animation: true);
}
state.ifCurrentScreen.value = false; state.ifCurrentScreen.value = false;
} }
@ -295,7 +296,9 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
void didPushNext() { void didPushNext() {
super.didPushNext(); super.didPushNext();
logic.cancelBlueConnetctToastTimer(); logic.cancelBlueConnetctToastTimer();
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); if (EasyLoading.isShow) {
EasyLoading.dismiss(animation: true);
}
state.ifCurrentScreen.value = false; state.ifCurrentScreen.value = false;
} }

4
lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart
View File

@ -121,7 +121,7 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
}))), }))),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.lockGrouping!.tr, leftTitel: TranslationLoader.lanKeys!.lockGrouping!.tr,
rightTitle: state.lockBasicInfo.value.groupName!.tr ?? '', rightTitle: state.lockBasicInfo.value.groupName ?? '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () async { action: () async {
@ -150,7 +150,7 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
}), }),
)), )),
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockBasicInfo.value.lockName!.contains('T9A'), visible: (state.lockBasicInfo.value.lockName ?? '').contains('T9A'),
child: CommonItem( child: CommonItem(
leftTitel: '当前网络'.tr, leftTitel: '当前网络'.tr,
rightTitle: state.lockBasicInfo.value.network ?? '-', rightTitle: state.lockBasicInfo.value.network ?? '-',

26
lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart
View File

@ -21,18 +21,18 @@ class UploadElectricQuantityLogic extends BaseGetXController {
//电量更新请求 //电量更新请求
Future<void> uploadElectricQuantityRequest(String electricQuantity, String electricQuantityStandby) async { Future<void> uploadElectricQuantityRequest(String electricQuantity, String electricQuantityStandby) async {
KeyOperationRecordEntity entity = await ApiRepository.to.uploadElectricQuantity( final KeyOperationRecordEntity entity = await ApiRepository.to.uploadElectricQuantity(
electricQuantity:electricQuantity, electricQuantity:electricQuantity,
electricQuantityStandby: electricQuantityStandby, electricQuantityStandby: electricQuantityStandby,
lockId: state.lockSetInfoData.value.lockId.toString(), lockId: state.lockSetInfoData.value.lockId.toString(),
isUnShowLoading: false isUnShowLoading: false
); );
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
showToast("锁电量更新成功".tr, something: () { showToast('锁电量更新成功'.tr, something: () {
eventBus eventBus
.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); .fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
eventBus.fire( eventBus.fire(
LockSetChangeSetRefreshLockDetailWithType(0, electricQuantity)); LockSetChangeSetRefreshLockDetailWithType(4, electricQuantity));
eventBus.fire(RefreshLockListInfoDataEvent()); eventBus.fire(RefreshLockListInfoDataEvent());
}); });
} }
@ -54,8 +54,8 @@ class UploadElectricQuantityLogic extends BaseGetXController {
(BluetoothConnectionState deviceConnectionState) async { (BluetoothConnectionState deviceConnectionState) async {
if (deviceConnectionState == BluetoothConnectionState.connected) { if (deviceConnectionState == BluetoothConnectionState.connected) {
dismissEasyLoading(); dismissEasyLoading();
var privateKey = await Storage.getStringList(saveBluePrivateKey); final privateKey = await Storage.getStringList(saveBluePrivateKey);
List<int> getPrivateKeyList = changeStringListToIntList(privateKey!); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
IoSenderManage.senderGetStarLockStatuInfo( IoSenderManage.senderGetStarLockStatuInfo(
lockID: BlueManage().connectDeviceName, lockID: BlueManage().connectDeviceName,
userID: await Storage.getUid(), userID: await Storage.getUid(),
@ -89,7 +89,7 @@ class UploadElectricQuantityLogic extends BaseGetXController {
// 获取星锁状态 // 获取星锁状态
Future<void> _replyGetStarLockStatusInfo(Reply reply) async { Future<void> _replyGetStarLockStatusInfo(Reply reply) async {
int status = reply.data[2]; final int status = reply.data[2];
switch (status) { switch (status) {
case 0x00: case 0x00:
//成功 //成功
@ -98,11 +98,11 @@ class UploadElectricQuantityLogic extends BaseGetXController {
cancelBlueConnetctToastTimer(); cancelBlueConnetctToastTimer();
// 电池剩余电量 // 电池剩余电量
var battRemCap = reply.data[132]; final battRemCap = reply.data[132];
state.lockSetInfoData.value.lockBasicInfo!.electricQuantity = battRemCap; state.lockSetInfoData.value.lockBasicInfo!.electricQuantity = battRemCap;
// 备用电池剩余电量 // 备用电池剩余电量
var battRemCapStandby = reply.data[133]; final battRemCapStandby = reply.data[133];
state.lockSetInfoData.value.lockBasicInfo!.electricQuantityStandby = battRemCapStandby; state.lockSetInfoData.value.lockBasicInfo!.electricQuantityStandby = battRemCapStandby;
state.uploadElectricQuantityDate.value = DateTime.now().millisecondsSinceEpoch; state.uploadElectricQuantityDate.value = DateTime.now().millisecondsSinceEpoch;
@ -111,8 +111,8 @@ class UploadElectricQuantityLogic extends BaseGetXController {
break; break;
case 0x06: case 0x06:
//无权限 //无权限
var privateKey = await Storage.getStringList(saveBluePrivateKey); final privateKey = await Storage.getStringList(saveBluePrivateKey);
List<int> getPrivateKeyList = changeStringListToIntList(privateKey!); final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
IoSenderManage.senderGetStarLockStatuInfo( IoSenderManage.senderGetStarLockStatuInfo(
lockID: BlueManage().connectDeviceName, lockID: BlueManage().connectDeviceName,
userID: await Storage.getUid(), userID: await Storage.getUid(),
@ -130,7 +130,7 @@ class UploadElectricQuantityLogic extends BaseGetXController {
// 从服务器获取锁的时间 开锁时传入 // 从服务器获取锁的时间 开锁时传入
void getServerDatetime() async{ void getServerDatetime() async{
var entity = await ApiRepository.to.getServerDatetimeData(); final entity = await ApiRepository.to.getServerDatetimeData();
if(entity.errorCode!.codeIsSuccessful){ if(entity.errorCode!.codeIsSuccessful){
state.differentialTime = entity.data!.date! ~/ 1000 - DateTime.now().millisecondsSinceEpoch ~/ 1000; state.differentialTime = entity.data!.date! ~/ 1000 - DateTime.now().millisecondsSinceEpoch ~/ 1000;
getLocalNetTime(); getLocalNetTime();
@ -143,8 +143,8 @@ class UploadElectricQuantityLogic extends BaseGetXController {
} }
int getLocalNetTime(){ int getLocalNetTime(){
DateTime utcTime = DateTime.fromMillisecondsSinceEpoch(getUTCNetTime()*1000, isUtc: true); final DateTime utcTime = DateTime.fromMillisecondsSinceEpoch(getUTCNetTime()*1000, isUtc: true);
DateTime localTime = utcTime.toLocal(); final DateTime localTime = utcTime.toLocal();
// AppLog.log('getUTCNetTime: ${getUTCNetTime()}'); // AppLog.log('getUTCNetTime: ${getUTCNetTime()}');
// AppLog.log('UTC time: $utcTime'); // AppLog.log('UTC time: $utcTime');

164
lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
View File

@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/lockSet/lockSet/checkingInInfoData_entity.dart';
import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSet_state.dart';
import '../../../../appRouters.dart'; import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
@ -25,8 +27,8 @@ class LockSetPage extends StatefulWidget {
} }
class _LockSetPageState extends State<LockSetPage> with RouteAware { class _LockSetPageState extends State<LockSetPage> with RouteAware {
final logic = Get.put(LockSetLogic()); final LockSetLogic logic = Get.put(LockSetLogic());
final state = Get.find<LockSetLogic>().state; final LockSetState state = Get.find<LockSetLogic>().state;
Future<void> getHttpData() async { Future<void> getHttpData() async {
logic.getLockSettingInfoData().then((LockSetInfoEntity value) { logic.getLockSettingInfoData().then((LockSetInfoEntity value) {
@ -36,7 +38,6 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
@override @override
void initState() { void initState() {
// TODO: implement initState
super.initState(); super.initState();
logic.initLoadDataAction(() { logic.initLoadDataAction(() {
@ -59,7 +60,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
getHttpData(); getHttpData();
}, },
child: Column( child: Column(
children: [ children: <Widget>[
Expanded( Expanded(
child: Obx(() => ListView( child: Obx(() => ListView(
children: getListWidget(), children: getListWidget(),
@ -83,25 +84,25 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// 普通用户 // 普通用户
List<Widget> getNormalWidget() { List<Widget> getNormalWidget() {
var showWidgetArr = [ final List<Widget> showWidgetArr = <Widget>[
// 基本信息 // 基本信息
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.basicInformation!.tr, leftTitel: TranslationLoader.lanKeys!.basicInformation!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.basicInformationPage, Get.toNamed(Routers.basicInformationPage,
arguments: {'lockSetInfoData': state.lockSetInfoData.value}); arguments: <String, LockSetInfoData>{'lockSetInfoData': state.lockSetInfoData.value});
}), }),
SizedBox(height: 10.h), SizedBox(height: 10.h),
// 自动闭锁 // 自动闭锁
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.autoLock == 1 ? true : false, visible: state.lockFeature.value.autoLock == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr, leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr,
rightTitle: (state.lockSettingInfo.value.autoLock ?? 0) > 0 rightTitle: (state.lockSettingInfo.value.autoLock ?? 0) > 0
? "${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond ?? 0}s" ? '${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond ?? 0}s'
: TranslationLoader.lanKeys!.closed!.tr, : TranslationLoader.lanKeys!.closed!.tr,
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
@ -110,14 +111,14 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s" // ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s"
// : TranslationLoader.lanKeys!.closed!.tr), // : TranslationLoader.lanKeys!.closed!.tr),
action: () { action: () {
Get.toNamed(Routers.automaticBlockingPage, arguments: { Get.toNamed(Routers.automaticBlockingPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value, 'lockSetInfoData': state.lockSetInfoData.value,
// 'lockBasicInfo': state.lockBasicInfo.value // 'lockBasicInfo': state.lockBasicInfo.value
}); });
}))), }))),
// 常开模式 // 常开模式
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.passageMode == 1 ? true : false, visible: state.lockFeature.value.passageMode == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr,
rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1 rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1
@ -126,7 +127,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.normallyOpenModePage, arguments: { Get.toNamed(Routers.normallyOpenModePage, arguments: <String, Object>{
'lockSetInfoData': state.lockSetInfoData.value, 'lockSetInfoData': state.lockSetInfoData.value,
'lockBasicInfo': state.lockBasicInfo.value 'lockBasicInfo': state.lockBasicInfo.value
}); });
@ -135,11 +136,11 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
visible: true, visible: true,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.lockTime!.tr, leftTitel: TranslationLoader.lanKeys!.lockTime!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.lockTimePage, arguments: { Get.toNamed(Routers.lockTimePage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
})), })),
@ -164,16 +165,16 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// 授权管理员、超级管理员字段 // 授权管理员、超级管理员字段
List<Widget> getAllWidget() { List<Widget> getAllWidget() {
var showWidgetArr = [ final List<Widget> showWidgetArr = <Widget>[
// 基本信息 // 基本信息
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.basicInformation!.tr, leftTitel: TranslationLoader.lanKeys!.basicInformation!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.basicInformationPage, Get.toNamed(Routers.basicInformationPage,
arguments: {'lockSetInfoData': state.lockSetInfoData.value}); arguments: <String, LockSetInfoData>{'lockSetInfoData': state.lockSetInfoData.value});
}), }),
SizedBox(height: 10.h), SizedBox(height: 10.h),
//by DaisyWu 田总：移至锁详情配件区 //by DaisyWu 田总：移至锁详情配件区
@ -226,11 +227,11 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// SizedBox(height: 10.h), // SizedBox(height: 10.h),
// 自动闭锁 // 自动闭锁
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.autoLock == 1 ? true : false, visible: state.lockFeature.value.autoLock == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr, leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr,
rightTitle: state.lockSettingInfo.value.autoLock! > 0 rightTitle: state.lockSettingInfo.value.autoLock! > 0
? "${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond}s" ? '${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond}s'
: TranslationLoader.lanKeys!.closed!.tr, : TranslationLoader.lanKeys!.closed!.tr,
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
@ -239,13 +240,13 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s" // ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s"
// : TranslationLoader.lanKeys!.closed!.tr), // : TranslationLoader.lanKeys!.closed!.tr),
action: () { action: () {
Get.toNamed(Routers.automaticBlockingPage, arguments: { Get.toNamed(Routers.automaticBlockingPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
}))), }))),
// 锁声音 // 锁声音
Obx(() { Obx(() {
var titleStr = ""; String titleStr = '';
if ((state.lockSettingInfo.value.lockSound ?? 0) == 1) { if ((state.lockSettingInfo.value.lockSound ?? 0) == 1) {
switch (state.lockSettingInfo.value.lockSoundVolume ?? 0) { switch (state.lockSettingInfo.value.lockSoundVolume ?? 0) {
case 1: case 1:
@ -268,21 +269,21 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
titleStr = TranslationLoader.lanKeys!.closed!.tr; titleStr = TranslationLoader.lanKeys!.closed!.tr;
} }
return Visibility( return Visibility(
visible: state.lockFeature.value.lockSound == 1 ? true : false, visible: state.lockFeature.value.lockSound == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.lockSound!.tr, leftTitel: TranslationLoader.lanKeys!.lockSound!.tr,
rightTitle: titleStr, rightTitle: titleStr,
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.lockSoundSetPage, arguments: { Get.toNamed(Routers.lockSoundSetPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
})); }));
}), }),
// 防撬报警 // 防撬报警
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.antiPrySwitch == 1 ? true : false, visible: state.lockFeature.value.antiPrySwitch == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.burglarAlarm!.tr, leftTitel: TranslationLoader.lanKeys!.burglarAlarm!.tr,
rightTitle: (state.lockSettingInfo.value.antiPrySwitch ?? 0) == 1 rightTitle: (state.lockSettingInfo.value.antiPrySwitch ?? 0) == 1
@ -291,14 +292,14 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.burglarAlarmPage, arguments: { Get.toNamed(Routers.burglarAlarmPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
}))), }))),
SizedBox(height: 10.h), SizedBox(height: 10.h),
// 常开模式 // 常开模式
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.passageMode == 1 ? true : false, visible: state.lockFeature.value.passageMode == 1,
// visible: true, // visible: true,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr,
@ -308,13 +309,13 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.normallyOpenModePage, arguments: { Get.toNamed(Routers.normallyOpenModePage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
}))), }))),
// 远程开锁 // 远程开锁
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.remoteUnlock == 1 ? true : false, visible: state.lockFeature.value.remoteUnlock == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.remoteUnlocking!.tr, leftTitel: TranslationLoader.lanKeys!.remoteUnlocking!.tr,
rightTitle: (state.lockSettingInfo.value.remoteUnlock ?? 0) == 1 rightTitle: (state.lockSettingInfo.value.remoteUnlock ?? 0) == 1
@ -323,16 +324,13 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.remoteUnlockingPage, arguments: { Get.toNamed(Routers.remoteUnlockingPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
}))), }))),
// 重置键 // 重置键
Obx(() => Visibility( Obx(() => Visibility(
visible: (state.lockBasicInfo.value.isLockOwner == 1 && visible: state.lockBasicInfo.value.isLockOwner == 1 && state.lockFeature.value.resetSwitch == 1,
state.lockFeature.value.resetSwitch == 1)
? true
: false,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.resetButton!.tr, leftTitel: TranslationLoader.lanKeys!.resetButton!.tr,
rightTitle: (state.lockSettingInfo.value.resetSwitch ?? 0) == 1 rightTitle: (state.lockSettingInfo.value.resetSwitch ?? 0) == 1
@ -341,7 +339,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.resetButtonPage, arguments: { Get.toNamed(Routers.resetButtonPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
}))), }))),
@ -350,14 +348,14 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// Obx(() => // Obx(() =>
// 面容开锁 // 面容开锁
Visibility( Visibility(
visible: state.lockFeature.value.d3Face == 1 ? true : false, visible: state.lockFeature.value.d3Face == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.faceUnlocks!.tr, leftTitel: TranslationLoader.lanKeys!.faceUnlocks!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.faceUnlockPage, arguments: { Get.toNamed(Routers.faceUnlockPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
})), })),
@ -367,23 +365,23 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
visible: true, visible: true,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.messageReminding!.tr, leftTitel: TranslationLoader.lanKeys!.messageReminding!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.msgNotificationPage, Get.toNamed(Routers.msgNotificationPage,
arguments: {'lockId': state.lockSetInfoData.value.lockId}); arguments: <String, int?>{'lockId': state.lockSetInfoData.value.lockId});
})), })),
//猫眼设置 //猫眼设置
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.isSupportCatEye == 1 ? true : false, visible: state.lockFeature.value.isSupportCatEye == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.catEyeSet!.tr, leftTitel: TranslationLoader.lanKeys!.catEyeSet!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.catEyeSetPage, arguments: { Get.toNamed(Routers.catEyeSetPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
}))), }))),
@ -415,23 +413,23 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// Obx(() => // Obx(() =>
// 开门方向设置 // 开门方向设置
Visibility( Visibility(
visible: state.lockFeature.value.openDirection == 1 ? true : false, visible: state.lockFeature.value.openDirection == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.openingDirectionSet!.tr, leftTitel: TranslationLoader.lanKeys!.openingDirectionSet!.tr,
rightTitle: "", rightTitle: '',
isHaveDirection: true, isHaveDirection: true,
isHaveLine: true, isHaveLine: true,
action: () { action: () {
Get.toNamed(Routers.openDoorDirectionPage, arguments: { Get.toNamed(Routers.openDoorDirectionPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
})), })),
// 电机功率设置 // 电机功率设置
Visibility( Visibility(
visible: state.lockFeature.value.motorTorsion == 1 ? true : false, visible: state.lockFeature.value.motorTorsion == 1,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.motorPowerSetting!.tr, leftTitel: TranslationLoader.lanKeys!.motorPowerSetting!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
@ -481,7 +479,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
: false, : false,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr, leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: _openCheckInSwitch())), rightWidget: _openCheckInSwitch())),
@ -489,13 +487,10 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// 开锁提醒 // 开锁提醒
Obx( Obx(
() => Visibility( () => Visibility(
visible: state.lockBasicInfo.value.isLockOwner == 1 && visible: state.lockBasicInfo.value.isLockOwner == 1 && state.lockFeature.value.unlockReminder == 1,
state.lockFeature.value.unlockReminder == 1
? true
: false,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr, leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: _lockRemindSwitch())), rightWidget: _lockRemindSwitch())),
@ -503,14 +498,11 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// APP开锁时是否需联网 // APP开锁时是否需联网
Obx( Obx(
() => Visibility( () => Visibility(
visible: state.lockBasicInfo.value.isLockOwner == 1 && visible: state.lockBasicInfo.value.isLockOwner == 1 && state.lockFeature.value.appUnlockOnline == 1,
state.lockFeature.value.appUnlockOnline == 1
? true
: false,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader leftTitel: TranslationLoader
.lanKeys!.whetherInternetRequiredWhenUnlocking!.tr, .lanKeys!.whetherInternetRequiredWhenUnlocking!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: false, isHaveLine: false,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: _openLockNeedOnlineSwitch()), rightWidget: _openLockNeedOnlineSwitch()),
@ -520,15 +512,15 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// wifi配网 // wifi配网
Obx( Obx(
() => Visibility( () => Visibility(
visible: state.lockFeature.value.wifi == 1 ? true : false, visible: state.lockFeature.value.wifi == 1,
child: CommonItem( child: CommonItem(
leftTitel: leftTitel:
TranslationLoader.lanKeys!.wifiDistributionNetwork!.tr, TranslationLoader.lanKeys!.wifiDistributionNetwork!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.wifiListPage, arguments: { Get.toNamed(Routers.wifiListPage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
// Get.toNamed(Routers.configuringWifiPage, arguments: { // Get.toNamed(Routers.configuringWifiPage, arguments: {
@ -542,11 +534,11 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
visible: true, visible: true,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.lockTime!.tr, leftTitel: TranslationLoader.lanKeys!.lockTime!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.lockTimePage, arguments: { Get.toNamed(Routers.lockTimePage, arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
})), })),
@ -572,7 +564,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
visible: true, visible: true,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.uploadData!.tr, leftTitel: TranslationLoader.lanKeys!.uploadData!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
@ -598,7 +590,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
visible: true, visible: true,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.lockEscalation!.tr, leftTitel: TranslationLoader.lanKeys!.lockEscalation!.tr,
rightTitle: "", rightTitle: '',
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
@ -626,7 +618,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
} }
Widget rightText(String rightTitle) { Widget rightText(String rightTitle) {
return Text(rightTitle ?? "", return Text(rightTitle ?? '',
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor)); style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor));
} }
@ -637,15 +629,15 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
activeColor: CupertinoColors.activeBlue, activeColor: CupertinoColors.activeBlue,
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: state.isAttendance.value == 1 ? true : false, value: state.isAttendance.value == 1,
onChanged: (value) { onChanged: (bool value) {
logic.openCheckingInData((checkingInInfoDataEntity) { logic.openCheckingInData((CheckingInInfoDataEntity checkingInInfoDataEntity) {
if (checkingInInfoDataEntity.data!.companyId == 0) { if (checkingInInfoDataEntity.data!.companyId == 0) {
// logic.showCupertinoAlertDialog(context); // logic.showCupertinoAlertDialog(context);
ShowTipView().showIosTipWithContentDialog("创建公司后,考勤功能才能使用".tr, () { ShowTipView().showIosTipWithContentDialog('创建公司后,考勤功能才能使用'.tr, () {
// 删除锁 // 删除锁
Get.toNamed(Routers.checkInCreatCompanyPage, Get.toNamed(Routers.checkInCreatCompanyPage,
arguments: {'lockSetInfoData': state.lockSetInfoData.value}); arguments: <String, LockSetInfoData>{'lockSetInfoData': state.lockSetInfoData.value});
}); });
} else { } else {
logic.setLockSetGeneralSetting(); logic.setLockSetGeneralSetting();
@ -661,11 +653,9 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
activeColor: CupertinoColors.activeBlue, activeColor: CupertinoColors.activeBlue,
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: state.isLockPickingReminder.value == 1 ? true : false, value: state.isLockPickingReminder.value == 1,
onChanged: (value) { onChanged: (bool value) {
setState(() { setState(logic.setLockPickingReminder);
logic.setLockPickingReminder();
});
}, },
); );
} }
@ -676,8 +666,8 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
activeColor: CupertinoColors.activeBlue, activeColor: CupertinoColors.activeBlue,
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: (state.isOpenLockNeedOnline.value) == 1 ? true : false, value: state.isOpenLockNeedOnline.value == 1,
onChanged: (value) { onChanged: (bool value) {
setState(() { setState(() {
logic.sendBurglarAlarm(55); logic.sendBurglarAlarm(55);
}); });
@ -721,8 +711,8 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
activeColor: CupertinoColors.activeBlue, activeColor: CupertinoColors.activeBlue,
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: (state.isOpenBlueBroadcast.value) == 1 ? true : false, value: state.isOpenBlueBroadcast.value == 1,
onChanged: (value) { onChanged: (bool value) {
setState(() { setState(() {
logic.sendBurglarAlarm(56); logic.sendBurglarAlarm(56);
}); });
@ -736,15 +726,14 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: false, value: false,
onChanged: (value) { onChanged: (bool value) {
logic.showToast("功能暂未开放"); logic.showToast('功能暂未开放');
}, },
); );
} }
@override @override
void didChangeDependencies() { void didChangeDependencies() {
// TODO: implement didChangeDependencies
super.didChangeDependencies(); super.didChangeDependencies();
/// 路由订阅 /// 路由订阅
@ -753,7 +742,6 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
@override @override
void dispose() { void dispose() {
// TODO: implement dispose
/// 取消路由订阅 /// 取消路由订阅
AppRouteObserver().routeObserver.unsubscribe(this); AppRouteObserver().routeObserver.unsubscribe(this);
super.dispose(); super.dispose();
@ -773,7 +761,9 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
super.didPop(); super.didPop();
logic.cancelBlueConnetctToastTimer(); logic.cancelBlueConnetctToastTimer();
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); if (EasyLoading.isShow) {
EasyLoading.dismiss(animation: true);
}
// if (state.deletWaitScanTimer != null) { // if (state.deletWaitScanTimer != null) {
// state.deletWaitScanTimer!.cancel(); // state.deletWaitScanTimer!.cancel();
// } // }
@ -798,7 +788,9 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
super.didPushNext(); super.didPushNext();
logic.cancelBlueConnetctToastTimer(); logic.cancelBlueConnetctToastTimer();
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); if (EasyLoading.isShow) {
EasyLoading.dismiss(animation: true);
}
state.ifCurrentScreen.value = false; state.ifCurrentScreen.value = false;
} }
} }

76
lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart'; import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_logic.dart';
import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_state.dart';
import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart'; import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyListEntity.dart';
import 'package:star_lock/tools/showTFView.dart'; import 'package:star_lock/tools/showTFView.dart';
import 'package:star_lock/tools/showTipView.dart'; import 'package:star_lock/tools/showTipView.dart';
@ -24,10 +25,9 @@ class PasswordKeyDetailPage extends StatefulWidget {
State<PasswordKeyDetailPage> createState() => _PasswordKeyDetailPageState(); State<PasswordKeyDetailPage> createState() => _PasswordKeyDetailPageState();
} }
class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> with RouteAware {
with RouteAware { final PasswordKeyDetailLogic logic = Get.put(PasswordKeyDetailLogic());
final logic = Get.put(PasswordKeyDetailLogic()); final PasswordKeyDetailState state = Get.find<PasswordKeyDetailLogic>().state;
final state = Get.find<PasswordKeyDetailLogic>().state;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -37,22 +37,20 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
barTitle: TranslationLoader.lanKeys!.passwordDetail!.tr, barTitle: TranslationLoader.lanKeys!.passwordDetail!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
actionsList: [ actionsList: <Widget>[
IconButton( IconButton(
icon: Image.asset( icon: Image.asset(
'images/icon_bar_share.png', 'images/icon_bar_share.png',
height: 30.h, height: 30.h,
width: 30.w, width: 30.w,
), ),
onPressed: () { onPressed: _openModalBottomSheet,
_openModalBottomSheet();
},
), ),
], ],
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
children: [ children: <Widget>[
Obx(() => Visibility( Obx(() => Visibility(
visible: state.itemData.value.isCustom! == 1, visible: state.itemData.value.isCustom! == 1,
child: CommonItem( child: CommonItem(
@ -64,8 +62,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.password!.tr, leftTitel: TranslationLoader.lanKeys!.password!.tr,
rightTitle: state.keyboardPwd.value, rightTitle: state.keyboardPwd.value,
isHaveDirection: isHaveDirection: state.itemData.value.isCustom! == 1,
state.itemData.value.isCustom! == 1 ? true : false,
isHaveLine: true, isHaveLine: true,
action: () { action: () {
if (state.itemData.value.isCustom! != 1) { if (state.itemData.value.isCustom! != 1) {
@ -85,11 +82,10 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
context, state.inputNameController); context, state.inputNameController);
})), })),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: "有效期", leftTitel: '有效期',
rightTitle: logic.getUseDateStr(), rightTitle: logic.getUseDateStr(),
isHaveLine: state.isCirculation.value, isHaveLine: state.isCirculation.value,
isHaveDirection: isHaveDirection: state.itemData.value.isCustom! == 1,
state.itemData.value.isCustom! == 1 ? true : false,
allHeight: allHeight:
state.itemData.value.keyboardPwdType == 3 ? 90.h : 65.h, state.itemData.value.keyboardPwdType == 3 ? 90.h : 65.h,
action: () async { action: () async {
@ -98,14 +94,14 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
} }
var backData = await Get.toNamed( var backData = await Get.toNamed(
Routers.passwordKeyDetailChangeDatePage, Routers.passwordKeyDetailChangeDatePage,
arguments: { arguments: <String, PasswordKeyListItem>{
'itemData': state.itemData.value, 'itemData': state.itemData.value,
}); });
if (backData != null) { if (backData != null) {
state.itemData.value.startDate = state.itemData.value.startDate =
int.parse(backData["beginTimeTimestamp"]); int.parse(backData['beginTimeTimestamp']);
state.itemData.value.endDate = state.itemData.value.endDate =
int.parse(backData["endTimeTimestamp"]); int.parse(backData['endTimeTimestamp']);
// 改了日期之后，永久只能改限时的 // 改了日期之后，永久只能改限时的
state.itemData.value.keyboardPwdType = 3; state.itemData.value.keyboardPwdType = 3;
setState(() {}); setState(() {});
@ -132,10 +128,10 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
Obx(() => Visibility( Obx(() => Visibility(
visible: state.itemData.value.isCustom! == 1, visible: state.itemData.value.isCustom! == 1,
child: Column( child: Column(
children: [ children: <Widget>[
CommonItem( CommonItem(
leftTitel: "是否为管理员".tr, leftTitel: '是否为管理员'.tr,
rightTitle: "", rightTitle: '',
isTipsImg: false, isTipsImg: false,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: SizedBox( rightWidget: SizedBox(
@ -146,10 +142,10 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
)), )),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr, leftTitel: TranslationLoader.lanKeys!.operatingRecord!.tr,
rightTitle: "", rightTitle: '',
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.lockOperatingRecordPage, arguments: { Get.toNamed(Routers.lockOperatingRecordPage, arguments: <String, Object?>{
'type': 1, 'type': 1,
'id': state.itemData.value.keyboardPwdId.toString(), 'id': state.itemData.value.keyboardPwdId.toString(),
'recordName': state.itemData.value.keyboardPwdName 'recordName': state.itemData.value.keyboardPwdName
@ -169,8 +165,8 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
side: BorderSide(width: 1, color: AppColors.mainColor)), side: BorderSide(width: 1, color: AppColors.mainColor)),
onPressed: () { onPressed: () {
Navigator.pushNamed(context, Routers.cardListPage, Navigator.pushNamed(context, Routers.cardListPage,
arguments: { arguments: <String, int?>{
"lockId": state.itemData.value.lockId, 'lockId': state.itemData.value.lockId,
}); });
}, },
child: Text( child: Text(
@ -191,8 +187,8 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
side: BorderSide(width: 1, color: AppColors.mainColor)), side: BorderSide(width: 1, color: AppColors.mainColor)),
onPressed: () { onPressed: () {
Navigator.pushNamed(context, Routers.fingerprintListPage, Navigator.pushNamed(context, Routers.fingerprintListPage,
arguments: { arguments: <String, int?>{
"lockId": state.itemData.value.lockId, 'lockId': state.itemData.value.lockId,
}); });
}, },
child: Text( child: Text(
@ -214,8 +210,8 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
onPressed: () { onPressed: () {
Navigator.pushNamed( Navigator.pushNamed(
context, Routers.remoteControlListPage, context, Routers.remoteControlListPage,
arguments: { arguments: <String, int?>{
"lockId": state.itemData.value.lockId, 'lockId': state.itemData.value.lockId,
}); });
}, },
child: Text( child: Text(
@ -235,7 +231,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
left: 30.w, right: 30.w, top: 30.w, bottom: 30.w), left: 30.w, right: 30.w, top: 30.w, bottom: 30.w),
padding: EdgeInsets.only(top: 25.w, bottom: 25.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () { onClick: () {
ShowTipView().showIosTipWithContentDialog("确定要删除吗?".tr, () { ShowTipView().showIosTipWithContentDialog('确定要删除吗?'.tr, () {
state.isDeletPasswordKey.value = true; state.isDeletPasswordKey.value = true;
logic.senderCustomPasswords(); logic.senderCustomPasswords();
}); });
@ -247,15 +243,15 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
Widget bottomTip(){ Widget bottomTip(){
return Column( return Column(
children: [ children: <Widget>[
Container( Container(
padding: EdgeInsets.all(20.w), padding: EdgeInsets.all(20.w),
child: Row( child: Row(
// crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: <Widget>[
Expanded( Expanded(
child: Text( child: Text(
"密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。".tr, '密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。'.tr,
textAlign: TextAlign.start, textAlign: TextAlign.start,
style: TextStyle(fontSize: 20.sp), style: TextStyle(fontSize: 20.sp),
)), )),
@ -273,7 +269,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: state.isAdministrator.value, value: state.isAdministrator.value,
onChanged: (value) { onChanged: (bool value) {
// state.isAdministrator.value = value; // state.isAdministrator.value = value;
// state.isDeletPasswordKey.value = false; // state.isDeletPasswordKey.value = false;
// logic.senderCustomPasswords(); // logic.senderCustomPasswords();
@ -297,11 +293,11 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
state.ifCurrentScreen.value = true; state.ifCurrentScreen.value = true;
return ShowTFView( return ShowTFView(
title: inputController == state.inputNameController title: inputController == state.inputNameController
? "${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.name!.tr}" ? '${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.name!.tr}'
: "${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.password!.tr}", : '${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.password!.tr}',
tipTitle: inputController.text.isNotEmpty tipTitle: inputController.text.isNotEmpty
? inputController.text ? inputController.text
: "请输入6-9位密码", : '请输入6-9位密码',
controller: inputController, controller: inputController,
keyboardType: inputController == state.inputNameController keyboardType: inputController == state.inputNameController
? TextInputType.text ? TextInputType.text
@ -317,7 +313,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
if (inputController.text.isEmpty || if (inputController.text.isEmpty ||
inputController.text.length < 6 || inputController.text.length < 6 ||
inputController.text.length > 9) { inputController.text.length > 9) {
logic.showToast("请输入6-9位密码"); logic.showToast('请输入6-9位密码');
return; return;
} }
} }
@ -346,7 +342,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
constraints: BoxConstraints(maxHeight: 270.h), constraints: BoxConstraints(maxHeight: 270.h),
builder: (BuildContext context) { builder: (BuildContext context) {
return Column( return Column(
children: [ children: <Widget>[
SizedBox( SizedBox(
width: ScreenUtil().screenWidth, width: ScreenUtil().screenWidth,
height: 180.h, height: 180.h,
@ -377,7 +373,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
} }
List<Widget> initBottomSheetList() { List<Widget> initBottomSheetList() {
List<Widget> widgetList = []; List<Widget> widgetList = <Widget>[];
widgetList.add(buildCenter3('images/icon_wechat.png', '微信好友', 0)); widgetList.add(buildCenter3('images/icon_wechat.png', '微信好友', 0));
widgetList.add(buildCenter3('images/icon_message.png', '短信', 1)); widgetList.add(buildCenter3('images/icon_message.png', '短信', 1));
@ -397,7 +393,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
EdgeInsets.only(top: 20.w, bottom: 20.w, left: 10.w, right: 10.w), EdgeInsets.only(top: 20.w, bottom: 20.w, left: 10.w, right: 10.w),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: <Widget>[
Image.asset( Image.asset(
imageName, imageName,
width: 50.w, width: 50.w,

7
lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart
View File

@ -215,8 +215,6 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
); );
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
senderCustomPasswords(); senderCustomPasswords();
} else {
showToast('${entity.errorMsg}');
} }
} }
@ -438,7 +436,7 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
case 3: case 3:
//自定义 //自定义
if (state.isPermanent.value == false) { if (state.isPermanent.value == false) {
'类型:自定义-限时\n有效期:${state.customBeginTime.value} -- ${state.customEndTime.value}'; useDateStr = '类型:自定义-限时\n有效期:${state.customBeginTime.value} -- ${state.customEndTime.value}';
} else { } else {
useDateStr = '类型:自定义-永久'; useDateStr = '类型:自定义-永久';
} }
@ -466,7 +464,6 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
@override @override
void onReady() { void onReady() {
// TODO: implement onReady
super.onReady(); super.onReady();
_initReplySubscription(); _initReplySubscription();
@ -475,13 +472,11 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
@override @override
void onInit() { void onInit() {
// TODO: implement onInit
super.onInit(); super.onInit();
} }
@override @override
void onClose() { void onClose() {
// TODO: implement onClose
_replySubscription.cancel(); _replySubscription.cancel();
} }
} }

33
lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart
View File

@ -223,8 +223,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
return Column( return Column(
children: <Widget>[ children: <Widget>[
Visibility( Visibility(
visible: visible: CommonDataManage().currentKeyInfo.vendor == 'XHJ',
CommonDataManage().currentKeyInfo.vendor == 'XHJ' ? false : true,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr, leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr,
rightTitle: state.beginTime.value, rightTitle: state.beginTime.value,
@ -333,7 +332,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
Widget keyIfAdministratorWidget() { Widget keyIfAdministratorWidget() {
return Visibility( return Visibility(
visible: visible:
CommonDataManage().currentKeyInfo.isLockOwner == 1 ? true : false, CommonDataManage().currentKeyInfo.isLockOwner == 1,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
// SizedBox(height: 10.h), // SizedBox(height: 10.h),
@ -375,14 +374,12 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
showPickerView(context, pickerDataList); showPickerView(context, pickerDataList);
}), }),
Visibility( Visibility(
visible: (CommonDataManage().currentKeyInfo.vendor == visible: CommonDataManage().currentKeyInfo.vendor ==
IoModelVendor.vendor_XL && IoModelVendor.vendor_XL &&
(CommonDataManage().currentKeyInfo.model == (CommonDataManage().currentKeyInfo.model ==
IoModelVendor.model_XL_BLE || IoModelVendor.model_XL_BLE ||
CommonDataManage().currentKeyInfo.model == CommonDataManage().currentKeyInfo.model ==
IoModelVendor.model_XL_WIFI)) IoModelVendor.model_XL_WIFI),
? true
: false,
child: CommonItem( child: CommonItem(
leftTitel: '结束日期', leftTitel: '结束日期',
rightTitle: state.endTime.value, rightTitle: state.endTime.value,
@ -411,7 +408,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
state.loopEffectiveDate.value = state.loopEffectiveDate.value =
DateTool().getYMDHNDateString(p, 5); DateTool().getYMDHNDateString(p, 5);
state.loopStartHours.value = p.hour!; state.loopStartHours.value = p.hour!;
}); }, hourShow24: true);
}), }),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.failureTime!.tr, leftTitel: TranslationLoader.lanKeys!.failureTime!.tr,
@ -425,7 +422,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
state.loopFailureDate.value = state.loopFailureDate.value =
DateTool().getYMDHNDateString(p, 5); DateTool().getYMDHNDateString(p, 5);
state.loopEndHours.value = p.hour!; state.loopEndHours.value = p.hour!;
}); }, hourShow24: true);
}), }),
], ],
); );
@ -620,7 +617,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
); );
} }
_switch() { CupertinoSwitch _switch() {
return CupertinoSwitch( return CupertinoSwitch(
activeColor: CupertinoColors.activeBlue, activeColor: CupertinoColors.activeBlue,
trackColor: CupertinoColors.systemGrey5, trackColor: CupertinoColors.systemGrey5,
@ -694,7 +691,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
onTap: (int index) { onTap: (int index) {
FocusScope.of(context).requestFocus(FocusNode()); FocusScope.of(context).requestFocus(FocusNode());
}, },
tabs: _itemTabs.map((ItemView item) => _tab(item)).toList(), tabs: _itemTabs.map(_tab).toList(),
isScrollable: true, isScrollable: true,
indicatorColor: Colors.red, indicatorColor: Colors.red,
unselectedLabelColor: Colors.black, unselectedLabelColor: Colors.black,
@ -718,14 +715,9 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
Tab _tab(ItemView item) { Tab _tab(ItemView item) {
return Tab( return Tab(
// text: item.title, // text: item.title,
child: Container( child: Text(
// width: item.title.length > 2 ? 1.sw / 8 : 1.sw / 12, item.title,
// margin: EdgeInsets.all(10.w), textAlign: TextAlign.center,
// color: Colors.red,
child: Text(
item.title,
textAlign: TextAlign.center,
),
), ),
); );
} }
@ -735,7 +727,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
child: TabBarView( child: TabBarView(
controller: state.tabController, controller: state.tabController,
children: _itemTabs children: _itemTabs
.map((ItemView item) => Obx(() => indexChangeWidget())) .map((ItemView item) => Obx(indexChangeWidget))
.toList(), .toList(),
), ),
); );
@ -827,7 +819,6 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage>
@override @override
void dispose() { void dispose() {
// TODO: implement dispose
/// 取消路由订阅 /// 取消路由订阅
AppRouteObserver().routeObserver.unsubscribe(this); AppRouteObserver().routeObserver.unsubscribe(this);
super.dispose(); super.dispose();

6
lib/mine/mine/starLockMine_page.dart
View File

@ -1,10 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
import 'package:star_lock/flavors.dart'; import 'package:star_lock/flavors.dart';
import 'package:star_lock/mine/mine/starLockMine_state.dart'; import 'package:star_lock/mine/mine/starLockMine_state.dart';
import 'package:star_lock/tools/commonDataManage.dart';
import '../../appRouters.dart'; import '../../appRouters.dart';
import '../../app_settings/app_colors.dart'; import '../../app_settings/app_colors.dart';
@ -80,7 +80,7 @@ class StarLockMinePageState extends State<StarLockMinePage> with BaseWidget {
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(52.5.w), borderRadius: BorderRadius.circular(52.5.w),
child: CustomNetworkImage( child: CustomNetworkImage(
url: state.userHeadUrl.value ?? "", url: state.userHeadUrl.value,
defaultUrl: 'images/controls_user.png', defaultUrl: 'images/controls_user.png',
width: 105.w, width: 105.w,
height: 105.h, height: 105.h,
@ -99,7 +99,7 @@ class StarLockMinePageState extends State<StarLockMinePage> with BaseWidget {
// logic.showToast('请先添加锁'); // logic.showToast('请先添加锁');
// } else { // } else {
Get.toNamed(Routers.advancedFeaturesWebPage, Get.toNamed(Routers.advancedFeaturesWebPage,
arguments: { arguments: <String, int>{
'webBuyType': XSConstantMacro.webBuyTypeVip, 'webBuyType': XSConstantMacro.webBuyTypeVip,
}); });
// } // }

18
lib/mine/mineSet/authorityManagement/getDeviceList_page.dart
View File

@ -28,7 +28,7 @@ class _GetDeviceListPageState extends State<GetDeviceListPage> {
body: Column( body: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 30.w, top: 16.w, right: 30.w, bottom: 16.w), left: 30.w, top: 16.w, right: 30.w, bottom: 16.w),
@ -48,25 +48,25 @@ class _GetDeviceListPageState extends State<GetDeviceListPage> {
//设备列表 //设备列表
Widget _permissionDeviceList() { Widget _permissionDeviceList() {
return Column( return Column(
children: [ children: <Widget>[
Expanded( Expanded(
child: ListView.separated( child: ListView.separated(
itemBuilder: (context, index) { itemBuilder: (BuildContext context, int index) {
if (index == 0) { if (index == 0) {
return _buildDeviceWidget( return _buildDeviceWidget(
context, index, 'images/icon_lock.png', "大门锁"); context, index, 'images/icon_lock.png', '大门锁');
} else if (index == 1) { } else if (index == 1) {
return _buildDeviceWidget( return _buildDeviceWidget(
context, index, 'images/icon_lock.png', "办公室锁"); context, index, 'images/icon_lock.png', '办公室锁');
} else if (index == 2) { } else if (index == 2) {
return _buildDeviceWidget( return _buildDeviceWidget(
context, index, 'images/icon_lock.png', "会议室锁"); context, index, 'images/icon_lock.png', '会议室锁');
} else { } else {
return _buildDeviceWidget( return _buildDeviceWidget(
context, index, 'images/icon_lock.png', "宴会厅锁"); context, index, 'images/icon_lock.png', '宴会厅锁');
} }
}, },
separatorBuilder: (context, index) { separatorBuilder: (BuildContext context, int index) {
return const Divider( return const Divider(
height: 1, height: 1,
color: AppColors.greyLineColor, color: AppColors.greyLineColor,
@ -94,7 +94,7 @@ class _GetDeviceListPageState extends State<GetDeviceListPage> {
color: Colors.white, color: Colors.white,
width: ScreenUtil().screenWidth, width: ScreenUtil().screenWidth,
child: Row( child: Row(
children: [ children: <Widget>[
SizedBox( SizedBox(
width: 30.w, width: 30.w,
), ),

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

@ -225,7 +225,7 @@ class _AddAuthorizedAdministratorPageState
maxLines: 1, maxLines: 1,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'), FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(18), LengthLimitingTextInputFormatter(50),
], ],
style: TextStyle( style: TextStyle(
fontSize: 22.sp, color: AppColors.darkGrayTextColor), fontSize: 22.sp, color: AppColors.darkGrayTextColor),

15
lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_page.dart
View File

@ -14,6 +14,7 @@ import '../../../../../tools/titleAppBar.dart';
import '../../../../../translations/trans_lib.dart'; import '../../../../../translations/trans_lib.dart';
import '../../../../common/XSConstantMacro/XSConstantMacro.dart'; import '../../../../common/XSConstantMacro/XSConstantMacro.dart';
import '../../../../tools/EasyRefreshTool.dart'; import '../../../../tools/EasyRefreshTool.dart';
import '../../../../tools/customNetworkImage.dart';
import '../../../../tools/showTipView.dart'; import '../../../../tools/showTipView.dart';
import '../../../../tools/storage.dart'; import '../../../../tools/storage.dart';
import 'authorizedAdministratorList_logic.dart'; import 'authorizedAdministratorList_logic.dart';
@ -195,7 +196,19 @@ class _AuthorizedAdministratorListPageState
SizedBox( SizedBox(
width: 30.w, width: 30.w,
), ),
Image.asset('images/controls_user.png', width: 60.w, height: 60.w), SizedBox(
width: 60.w,
height: 60.w,
child: ClipRRect(
borderRadius: BorderRadius.circular(30.w),
child: CustomNetworkImage(
url: itemData.headUrl ?? '',
defaultUrl: 'images/controls_user.png',
width: 105.w,
height: 105.h,
),
),
),
SizedBox(width: 20.w), SizedBox(width: 20.w),
Expanded( Expanded(
child: Column( child: Column(

44
lib/mine/mineSet/lockUserManage/expireLockList/expireElectronicKey/expireLockList_page.dart
View File

@ -5,10 +5,12 @@ import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
import 'package:star_lock/mine/mineSet/lockUserManage/expireLockList/expireElectronicKey/expireLockList_entity.dart'; import 'package:star_lock/mine/mineSet/lockUserManage/expireLockList/expireElectronicKey/expireLockList_entity.dart';
import 'package:star_lock/mine/mineSet/lockUserManage/expireLockList/expireElectronicKey/expireLockList_state.dart';
import '../../../../../appRouters.dart'; import '../../../../../appRouters.dart';
import '../../../../../app_settings/app_colors.dart'; import '../../../../../app_settings/app_colors.dart';
import '../../../../../tools/EasyRefreshTool.dart'; import '../../../../../tools/EasyRefreshTool.dart';
import '../../../../../tools/customNetworkImage.dart';
import '../../../../../tools/noData.dart'; import '../../../../../tools/noData.dart';
import 'expireLockList_logic.dart'; import 'expireLockList_logic.dart';
@ -20,8 +22,8 @@ class ExpireLockListPage extends StatefulWidget {
} }
class _ExpireLockListPageState extends State<ExpireLockListPage> { class _ExpireLockListPageState extends State<ExpireLockListPage> {
final logic = Get.put(ExpireLockListLogic()); final ExpireLockListLogic logic = Get.put(ExpireLockListLogic());
final state = Get.find<ExpireLockListLogic>().state; final ExpireLockListState state = Get.find<ExpireLockListLogic>().state;
Future<void> getHttpData() async { Future<void> getHttpData() async {
logic.expireLockListRequest().then((ExpireLockListEntity value){ logic.expireLockListRequest().then((ExpireLockListEntity value){
@ -46,7 +48,7 @@ class _ExpireLockListPageState extends State<ExpireLockListPage> {
onLoad: (){ onLoad: (){
getHttpData(); getHttpData();
}, },
child: Obx(() => _buildMainUI()) child: Obx(_buildMainUI)
); );
} }
@ -56,14 +58,14 @@ class _ExpireLockListPageState extends State<ExpireLockListPage> {
: SlidableAutoCloseBehavior( : SlidableAutoCloseBehavior(
child: ListView.separated( child: ListView.separated(
itemCount: state.dataList.length, itemCount: state.dataList.length,
itemBuilder: (c, index) { itemBuilder: (BuildContext c, int index) {
ExpireLockItem indexEntity = state.dataList[index]; ExpireLockItem indexEntity = state.dataList[index];
return Slidable( return Slidable(
key:ValueKey(indexEntity.uid), key:ValueKey(indexEntity.uid),
endActionPane: ActionPane( endActionPane: ActionPane(
extentRatio: 0.2, extentRatio: 0.2,
motion: const ScrollMotion(), motion: const ScrollMotion(),
children: [ children: <Widget>[
SlidableAction( SlidableAction(
onPressed: (BuildContext context){ onPressed: (BuildContext context){
logic.deletKeyLogic(indexEntity); logic.deletKeyLogic(indexEntity);
@ -93,9 +95,9 @@ class _ExpireLockListPageState extends State<ExpireLockListPage> {
onTap: () async { onTap: () async {
if(itemData.keyType! == 4){ if(itemData.keyType! == 4){
// 循环 // 循环
var data = await Get.toNamed(Routers.electronicKeyPeriodValidityPage, arguments: { var data = await Get.toNamed(Routers.electronicKeyPeriodValidityPage, arguments: <String, Object>{
"pushType": 0, 'pushType': 0,
"expireLockItem": itemData, 'expireLockItem': itemData,
}); });
if(data != null) { if(data != null) {
// setState(() { // setState(() {
@ -109,9 +111,9 @@ class _ExpireLockListPageState extends State<ExpireLockListPage> {
getHttpData(); getHttpData();
} }
}else{ }else{
var data = await Get.toNamed(Routers.electronicKeyDetailChangeDate, arguments: { var data = await Get.toNamed(Routers.electronicKeyDetailChangeDate, arguments: <String, Object>{
"pushType": 0, 'pushType': 0,
"expireLockItem": itemData, 'expireLockItem': itemData,
}); });
if(data != null) { if(data != null) {
setState(() { setState(() {
@ -129,14 +131,22 @@ class _ExpireLockListPageState extends State<ExpireLockListPage> {
height: 90.h, height: 90.h,
color: Colors.white, color: Colors.white,
child: Row( child: Row(
children: [ children: <Widget>[
SizedBox( SizedBox(
width: 30.w, width: 30.w,
), ),
Image.asset( SizedBox(
'images/controls_user.png',
width: 60.w, width: 60.w,
height: 60.w, height: 60.w,
child: ClipRRect(
borderRadius: BorderRadius.circular(30.w),
child: CustomNetworkImage(
url: itemData.headUrl ?? '',
defaultUrl: 'images/controls_user.png',
width: 105.w,
height: 105.h,
),
),
), ),
SizedBox( SizedBox(
width: 20.w, width: 20.w,
@ -144,10 +154,10 @@ class _ExpireLockListPageState extends State<ExpireLockListPage> {
Expanded( Expanded(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: <Widget>[
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: <Widget>[
Text( Text(
itemData.nickname ?? '', itemData.nickname ?? '',
style: TextStyle( style: TextStyle(
@ -167,7 +177,7 @@ class _ExpireLockListPageState extends State<ExpireLockListPage> {
SizedBox(height: 10.h), SizedBox(height: 10.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: <Widget>[
Text( Text(
logic.getExpireDateStr(itemData), logic.getExpireDateStr(itemData),
style: TextStyle( style: TextStyle(

48
lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_page.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_entity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_entity.dart';
import 'package:star_lock/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_state.dart';
import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/noData.dart';
import '../../../../../appRouters.dart'; import '../../../../../appRouters.dart';
@ -10,6 +11,7 @@ import '../../../../../app_settings/app_colors.dart';
import '../../../../../tools/titleAppBar.dart'; import '../../../../../tools/titleAppBar.dart';
import '../../../../../translations/trans_lib.dart'; import '../../../../../translations/trans_lib.dart';
import '../../../../tools/EasyRefreshTool.dart'; import '../../../../tools/EasyRefreshTool.dart';
import '../../../../tools/customNetworkImage.dart';
import '../../../../tools/keySearchWidget.dart'; import '../../../../tools/keySearchWidget.dart';
import '../../../../tools/showIosTipView.dart'; import '../../../../tools/showIosTipView.dart';
import 'lockUserManageList_logic.dart'; import 'lockUserManageList_logic.dart';
@ -22,12 +24,14 @@ class LockUserManageListPage extends StatefulWidget {
} }
class _LockUserManageListPageState extends State<LockUserManageListPage> { class _LockUserManageListPageState extends State<LockUserManageListPage> {
final logic = Get.put(LockUserManageListLogic()); final LockUserManageListLogic logic = Get.put(LockUserManageListLogic());
final state = Get.find<LockUserManageListLogic>().state; final LockUserManageListState state = Get.find<LockUserManageListLogic>().state;
Future<void> getHttpData() async { Future<void> getHttpData() async {
logic.lockUserListRequest().then((LockUserListEntity value) { logic.lockUserListRequest().then((LockUserListEntity value) {
if (mounted) setState(() {}); if (mounted) {
setState(() {});
}
}); });
} }
@ -46,7 +50,7 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
barTitle: TranslationLoader.lanKeys!.lockUserManagement!.tr, barTitle: TranslationLoader.lanKeys!.lockUserManagement!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
actionsList: [ actionsList: <Widget>[
TextButton( TextButton(
child: Text( child: Text(
TranslationLoader.lanKeys!.aboutToExpire!.tr, TranslationLoader.lanKeys!.aboutToExpire!.tr,
@ -67,7 +71,7 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
getHttpData(); getHttpData();
}, },
child: Column( child: Column(
children: [ children: <Widget>[
KeySearchWidget( KeySearchWidget(
editingController: state.searchController, editingController: state.searchController,
onSubmittedAction: () { onSubmittedAction: () {
@ -89,7 +93,7 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
onPressed: () { onPressed: () {
Navigator.pushNamed( Navigator.pushNamed(
context, Routers.massSendElectronicKeyManagePage) context, Routers.massSendElectronicKeyManagePage)
.then((value) { .then((Object? value) {
logic.lockUserListRequest(); logic.lockUserListRequest();
}); });
}, },
@ -121,22 +125,22 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
: SlidableAutoCloseBehavior( : SlidableAutoCloseBehavior(
child: ListView.separated( child: ListView.separated(
itemCount: state.dataList.length, itemCount: state.dataList.length,
itemBuilder: (c, index) { itemBuilder: (BuildContext c, int index) {
LockUserItemData indexEntity = state.dataList[index]; final LockUserItemData indexEntity = state.dataList[index];
if (index < state.dataList.length) { if (index < state.dataList.length) {
return Slidable( return Slidable(
key: ValueKey(indexEntity.uid), key: ValueKey(indexEntity.uid),
endActionPane: ActionPane( endActionPane: ActionPane(
extentRatio: 0.2, extentRatio: 0.2,
motion: const ScrollMotion(), motion: const ScrollMotion(),
children: [ children: <Widget>[
SlidableAction( SlidableAction(
onPressed: (BuildContext context) { onPressed: (BuildContext context) {
showIosTipViewDialog(context, indexEntity); showIosTipViewDialog(context, indexEntity);
}, },
backgroundColor: Colors.red, backgroundColor: Colors.red,
foregroundColor: Colors.white, foregroundColor: Colors.white,
label: '删除', label: '删除'.tr,
padding: EdgeInsets.only(left: 5.w, right: 5.w), padding: EdgeInsets.only(left: 5.w, right: 5.w),
), ),
], ],
@ -161,7 +165,7 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
Navigator.pushNamed(context, Routers.ownedKeyListPage, Navigator.pushNamed(context, Routers.ownedKeyListPage,
arguments: {'uid': itemData.uid}); arguments: <String, int?>{'uid': itemData.uid});
}, },
child: Container( child: Container(
height: 90.h, height: 90.h,
@ -171,14 +175,20 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
// borderRadius: BorderRadius.circular(10.w), // borderRadius: BorderRadius.circular(10.w),
// ), // ),
child: Row( child: Row(
children: [ children: <Widget>[
SizedBox(width: 30.w),
SizedBox( SizedBox(
width: 30.w,
),
Image.asset(
'images/controls_user.png',
width: 60.w, width: 60.w,
height: 60.w, height: 60.w,
child: ClipRRect(
borderRadius: BorderRadius.circular(30.w),
child: CustomNetworkImage(
url: itemData.headUrl ?? '',
defaultUrl: 'images/controls_user.png',
width: 105.w,
height: 105.h,
),
),
), ),
SizedBox( SizedBox(
width: 20.w, width: 20.w,
@ -186,10 +196,10 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
Expanded( Expanded(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: <Widget>[
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: <Widget>[
Text( Text(
itemData.nickname ?? '', itemData.nickname ?? '',
style: TextStyle( style: TextStyle(
@ -200,7 +210,7 @@ class _LockUserManageListPageState extends State<LockUserManageListPage> {
SizedBox(height: 5.h), SizedBox(height: 5.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: <Widget>[
Text( Text(
itemData.userid ?? '', itemData.userid ?? '',
style: TextStyle( style: TextStyle(

5
lib/tools/pickers/pickers.dart
View File

@ -182,7 +182,8 @@ class Pickers {
DateCallback? onChanged, DateCallback? onChanged,
DateCallback? onConfirm, DateCallback? onConfirm,
Function(bool isCancel)? onCancel, Function(bool isCancel)? onCancel,
bool overlapTabBar = false}) { bool overlapTabBar = false,
bool hourShow24 = false}) {
pickerStyle ??= DefaultPickerStyle(); pickerStyle ??= DefaultPickerStyle();
pickerStyle.context ??= context; pickerStyle.context ??= context;
@ -212,6 +213,7 @@ class Pickers {
} }
} }
AppLog.log('picker Tip >>> hourShow24 : $hourShow24');
Navigator.of(context, rootNavigator: overlapTabBar).push(DatePickerRoute( Navigator.of(context, rootNavigator: overlapTabBar).push(DatePickerRoute(
mode: mode, mode: mode,
initDate: selectDate, initDate: selectDate,
@ -225,6 +227,7 @@ class Pickers {
// theme: Theme.of(context, shadowThemeOnly: true), // theme: Theme.of(context, shadowThemeOnly: true),
theme: Theme.of(context), theme: Theme.of(context),
barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel, barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
hourShow24: hourShow24,
)); ));
} }
} }

22
lib/tools/pickers/time_picker/route/date_picker_route.dart
View File

@ -35,6 +35,7 @@ class DatePickerRoute<T> extends PopupRoute<T> {
this.onCancel, this.onCancel,
this.theme, this.theme,
this.barrierLabel, this.barrierLabel,
this.hourShow24,
RouteSettings? settings, RouteSettings? settings,
}) : super(settings: settings); }) : super(settings: settings);
@ -48,6 +49,7 @@ class DatePickerRoute<T> extends PopupRoute<T> {
final DateCallback? onConfirm; final DateCallback? onConfirm;
final Function(bool isCancel)? onCancel; final Function(bool isCancel)? onCancel;
final PickerStyle? pickerStyle; final PickerStyle? pickerStyle;
bool? hourShow24;
@override @override
Duration get transitionDuration => const Duration(milliseconds: 200); Duration get transitionDuration => const Duration(milliseconds: 200);
@ -96,6 +98,7 @@ class DatePickerRoute<T> extends PopupRoute<T> {
minDate: minDate, minDate: minDate,
pickerStyle: pickerStyle!, pickerStyle: pickerStyle!,
route: this, route: this,
hourShow24: hourShow24 ?? false,
), ),
); );
if (theme != null) { if (theme != null) {
@ -115,6 +118,7 @@ class _PickerContentView extends StatefulWidget {
required this.maxDate, required this.maxDate,
required this.minDate, required this.minDate,
required this.route, required this.route,
this.hourShow24 = false,
}) : super(key: key); }) : super(key: key);
final DateMode? mode; final DateMode? mode;
@ -126,9 +130,12 @@ class _PickerContentView extends StatefulWidget {
late final PDuration maxDate; late final PDuration maxDate;
late final PDuration minDate; late final PDuration minDate;
// 是否显示24小时
late final bool hourShow24;
@override @override
State<StatefulWidget> createState() => _PickerState( State<StatefulWidget> createState() => _PickerState(
this.mode, this.initData, this.maxDate, this.minDate, this.pickerStyle); mode, initData, maxDate, minDate, pickerStyle, hourShow24);
} }
class _PickerState extends State<_PickerContentView> { class _PickerState extends State<_PickerContentView> {
@ -150,6 +157,9 @@ class _PickerState extends State<_PickerContentView> {
late final PDuration maxDate; late final PDuration maxDate;
late final PDuration minDate; late final PDuration minDate;
// 是否显示24小时
bool hourShow24 = false;
Animation<double>? animation; Animation<double>? animation;
Map<DateType, FixedExtentScrollController> scrollCtrl = {}; Map<DateType, FixedExtentScrollController> scrollCtrl = {};
@ -157,9 +167,9 @@ class _PickerState extends State<_PickerContentView> {
late double pickerItemHeight; late double pickerItemHeight;
_PickerState(DateMode? mode, this._initSelectData, this.maxDate, this.minDate, _PickerState(DateMode? mode, this._initSelectData, this.maxDate, this.minDate,
this._pickerStyle) { this._pickerStyle, this.hourShow24) {
this._dateItemModel = DateItemModel.parse(mode!); _dateItemModel = DateItemModel.parse(mode!);
this.pickerItemHeight = _pickerStyle.pickerItemHeight; pickerItemHeight = _pickerStyle.pickerItemHeight;
_init(); _init();
} }
@ -246,7 +256,7 @@ class _PickerState extends State<_PickerContentView> {
if (_dateItemModel.hour) { if (_dateItemModel.hour) {
index = 0; index = 0;
int begin = 0; int begin = 0;
int end = 23; int end = hourShow24 ? 24 : 23;
// 限制区域 // 限制区域
if (intNotEmpty(minDate.hour)) { if (intNotEmpty(minDate.hour)) {
begin = minDate.hour!; begin = minDate.hour!;
@ -255,7 +265,7 @@ class _PickerState extends State<_PickerContentView> {
end = maxDate.hour!; end = maxDate.hour!;
} }
_dateTimeData.hour = TimeUtils.calcHour(begin: begin, end: end); _dateTimeData.hour = TimeUtils.calcHour(begin: begin, end: end, hourShow24: hourShow24);
if (_initSelectData.hour != null) { if (_initSelectData.hour != null) {
index = _dateTimeData.hour.indexOf(_initSelectData.hour); index = _dateTimeData.hour.indexOf(_initSelectData.hour);

5
lib/tools/pickers/time_picker/time_utils.dart
View File

@ -22,9 +22,10 @@ class TimeUtils {
} }
/// 时 /// 时
static List calcHour({int begin = 0, int end = 23}) { static List calcHour({int begin = 0, int end = 23, bool hourShow24 = false}) {
begin = begin < 0 ? 0 : begin; begin = begin < 0 ? 0 : begin;
end = end > 23 ? 23 : end; int hour = hourShow24 ? 24 : 23;
end = end > hour ? hour : end;
return _calcCount(begin, end); return _calcCount(begin, end);
} }

6
lib/tools/showTipView.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/app_settings/app_colors.dart';
@ -95,14 +96,15 @@ class ShowTipView {
} }
void showTFViewAlertDialog(TextEditingController controller, String title, void showTFViewAlertDialog(TextEditingController controller, String title,
String tipTitle, Function sureClick) { String tipTitle, Function sureClick, {List<TextInputFormatter>? inputFormatters}) {
// 点击删除 开始扫描 // 点击删除 开始扫描
showDialog( showDialog(
context: Get.context!, context: Get.context!,
builder: (BuildContext context) { builder: (BuildContext context) {
return ShowTFView( return ShowTFView(
title: title, title: title,
tipTitle: tipTitle ?? "", tipTitle: tipTitle,
inputFormatters: inputFormatters,
controller: controller, controller: controller,
sureClick: () { sureClick: () {
//发送删除锁请求 //发送删除锁请求

51
lib/tools/submitBtn.dart
View File

@ -10,6 +10,20 @@ import '../app_settings/app_colors.dart';
* */ * */
class SubmitBtn extends StatelessWidget { class SubmitBtn extends StatelessWidget {
SubmitBtn({
required this.btnName, Key? key,
this.borderRadius,
this.color,
this.padding,
this.onClick,
this.margin,
this.width,
this.backgroundColorList,
this.isDelete,
this.fontSize,
this.isDisabled,
}) : super(key: key);
String? btnName; String? btnName;
Function()? onClick; Function()? onClick;
@ -32,21 +46,6 @@ class SubmitBtn extends StatelessWidget {
bool? isDisabled; bool? isDisabled;
SubmitBtn({
Key? key,
required this.btnName,
this.borderRadius,
this.color,
this.padding,
this.onClick,
this.margin,
this.width,
this.backgroundColorList,
this.isDelete,
this.fontSize,
this.isDisabled,
}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
@ -113,16 +112,15 @@ class SubmitBtn extends StatelessWidget {
* */ * */
class AddBottomWhiteBtn extends StatelessWidget { class AddBottomWhiteBtn extends StatelessWidget {
AddBottomWhiteBtn({
required this.btnName, Key? key,
this.onClick,
}) : super(key: key);
String? btnName; String? btnName;
Function()? onClick; Function()? onClick;
AddBottomWhiteBtn({
Key? key,
required this.btnName,
this.onClick,
}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
@ -167,16 +165,15 @@ class AddBottomWhiteBtn extends StatelessWidget {
* */ * */
class OutLineBtn extends StatelessWidget { class OutLineBtn extends StatelessWidget {
OutLineBtn({
required this.btnName, Key? key,
this.onClick,
}) : super(key: key);
String? btnName; String? btnName;
Function()? onClick; Function()? onClick;
OutLineBtn({
Key? key,
required this.btnName,
this.onClick,
}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SizedBox( return SizedBox(