From 2f207db3ec979e9201ea128257d5793786b43077 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Tue, 5 Mar 2024 15:54:51 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=BC=94=E7=A4=BA=E6=A8=A1=E5=BC=8F=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/login/login/starLock_login_page.dart | 116 +++++++++++++----- .../demoModeLockDetail_page.dart | 53 ++++---- 2 files changed, 111 insertions(+), 58 deletions(-) diff --git a/star_lock/lib/login/login/starLock_login_page.dart b/star_lock/lib/login/login/starLock_login_page.dart index bad0e8b2..1f55f7f3 100644 --- a/star_lock/lib/login/login/starLock_login_page.dart +++ b/star_lock/lib/login/login/starLock_login_page.dart @@ -49,18 +49,26 @@ class _StarLockLoginPageState extends State { children: [ Container( padding: EdgeInsets.all(10.w), - child: Center(child: Image.asset('images/icon_main_1024.png', width: 110.w, height: 110.w))), + child: Center( + child: Image.asset('images/icon_main_1024.png', + width: 110.w, height: 110.w))), SizedBox(height: 50.w), LoginInput( controller: state.emailOrPhoneController, - onchangeAction: (v){ + onchangeAction: (v) { logic.checkNext(state.emailOrPhoneController); }, leftWidget: Padding( - padding: EdgeInsets.only(top: 30.w, bottom: 20.w, right: 20.w, left: 5.w), - child: Image.asset('images/icon_login_account.png', width: 36.w, height: 36.w,), + padding: EdgeInsets.only( + top: 30.w, bottom: 20.w, right: 20.w, left: 5.w), + child: Image.asset( + 'images/icon_login_account.png', + width: 36.w, + height: 36.w, + ), ), - hintText: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, + hintText: + TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, keyboardType: TextInputType.number, inputFormatters: [ // FilteringTextInputFormatter.allow(RegExp('[0-9]')), @@ -69,15 +77,21 @@ class _StarLockLoginPageState extends State { SizedBox(height: 10.h), LoginInput( controller: state.pwdController, - onchangeAction: (v){ + onchangeAction: (v) { logic.checkNext(state.pwdController); }, isPwd: true, leftWidget: Padding( - padding: EdgeInsets.only(top: 30.w, bottom: 20.w, right: 20.w, left: 5.w), - child: Image.asset('images/icon_login_password.png', width: 36.w, height: 36.w,), + padding: EdgeInsets.only( + top: 30.w, bottom: 20.w, right: 20.w, left: 5.w), + child: Image.asset( + 'images/icon_login_password.png', + width: 36.w, + height: 36.w, + ), ), - hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", + hintText: + "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -86,41 +100,55 @@ class _StarLockLoginPageState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ Obx(() => GestureDetector( - onTap: (){ + onTap: () { state.agree.value = !state.agree.value; logic.changeAgreeState(); }, - child: Image.asset(state.agree.value ? 'images/icon_round_select.png' : 'images/icon_round_unSelect.png', width: 30.w, height: 30.w,) - )), - SizedBox(width: 15.w,), + child: Image.asset( + state.agree.value + ? 'images/icon_round_select.png' + : 'images/icon_round_unSelect.png', + width: 30.w, + height: 30.w, + ))), + SizedBox( + width: 15.w, + ), Flexible( child: RichText( text: TextSpan( text: TranslationLoader.lanKeys!.readAndAgree!.tr, - style: TextStyle(color: const Color(0xff333333), fontSize: 20.sp), + style: TextStyle( + color: const Color(0xff333333), fontSize: 20.sp), children: [ WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( - child: Text('《${TranslationLoader.lanKeys!.userAgreement!.tr}》', style: TextStyle(color: AppColors.mainColor, fontSize: 20.sp)), + child: Text( + '《${TranslationLoader.lanKeys!.userAgreement!.tr}》', + style: TextStyle( + color: AppColors.mainColor, + fontSize: 20.sp)), onTap: () { - Get.toNamed(Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro.userAgreementURL, - "title": '用户协议' - }); + Get.toNamed(Routers.webviewShowPage, arguments: { + "url": XSConstantMacro.userAgreementURL, + "title": '用户协议' + }); }, )), WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( - child: Text('《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), + child: Text( + '《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', + style: TextStyle( + color: AppColors.mainColor, + fontSize: 20.sp)), onTap: () { - Get.toNamed(Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro.privacyPolicyURL, - "title": '隐私政策' - }); + Get.toNamed(Routers.webviewShowPage, arguments: { + "url": XSConstantMacro.privacyPolicyURL, + "title": '隐私政策' + }); }, )), ], @@ -135,10 +163,11 @@ class _StarLockLoginPageState extends State { borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), isDisabled: state.canNext.value, - onClick: state.canNext.value ? (){ - logic.login(); - }: null) - ), + onClick: state.canNext.value + ? () { + logic.login(); + } + : null)), SizedBox(height: 50.w), Row( mainAxisAlignment: MainAxisAlignment.center, @@ -149,11 +178,34 @@ class _StarLockLoginPageState extends State { height: 50.h, // color: Colors.red, child: Center( - child: Text('${TranslationLoader.lanKeys!.forgetPassword!.tr}？', style: TextStyle(fontSize: 22.sp, color: AppColors.mainColor)), + child: Text( + '${TranslationLoader.lanKeys!.forgetPassword!.tr}？', + style: TextStyle( + fontSize: 22.sp, color: AppColors.mainColor)), ), ), onTap: () { - Navigator.pushNamed(context, Routers.starLockForgetPasswordPage); + Navigator.pushNamed( + context, Routers.starLockForgetPasswordPage); + }, + ), + Expanded( + child: SizedBox( + width: 10.sp, + )), + GestureDetector( + child: SizedBox( + // width: 150.w, + height: 50.h, + // color: Colors.red, + child: Center( + child: Text('演示模式', + style: TextStyle( + fontSize: 22.sp, color: AppColors.mainColor)), + ), + ), + onTap: () { + Get.toNamed(Routers.demoModeLockDetailPage); }, ) ], diff --git a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart index b2644969..cd277a67 100644 --- a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart +++ b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart @@ -22,7 +22,6 @@ class _DemoModeLockDetailPageState extends State { @override void initState() { - // TODO: implement initState super.initState(); } @@ -35,17 +34,21 @@ class _DemoModeLockDetailPageState extends State { haveBack: true, backgroundColor: AppColors.mainColor, ), - body: Container( - width: 1.sw, - height: 1.sh - ScreenUtil().statusBarHeight * 2, - color: Colors.white, - child: Column( - children: [ - topTip(), - topWidget(), - Expanded(child: bottomWidget()) - ], - ), + body: ListView( + children: [ + Container( + width: 1.sw, + height: 1.sh - ScreenUtil().statusBarHeight, + color: Colors.white, + child: Column( + children: [ + topTip(), + topWidget(), + Expanded(child: bottomWidget()) + ], + ), + ), + ], )); } @@ -72,6 +75,7 @@ class _DemoModeLockDetailPageState extends State { Widget topWidget() { // KeyInfos keyInfo = widget.lockMainEntity.data!.keyInfos![0]; return Column( + mainAxisSize: MainAxisSize.min, children: [ SizedBox(height: 30.h), Stack( @@ -231,7 +235,8 @@ class _DemoModeLockDetailPageState extends State { showWidgetArr.add(bottomItem('images/main/icon_main_clockingIn.png', TranslationLoader.lanKeys!.checkingIn!.tr, () { // gotoLogin(); - Get.toNamed(Routers.checkingInListPage, arguments: LockListInfoItemEntity()); + Get.toNamed(Routers.checkingInListPage, + arguments: LockListInfoItemEntity()); })); // } @@ -241,9 +246,8 @@ class _DemoModeLockDetailPageState extends State { TranslationLoader.lanKeys!.electronicKey!.tr, () { // gotoLogin(); - Get.toNamed(Routers.electronicKeyListPage, arguments: { - "keyInfo": LockListInfoItemEntity() - }); + Get.toNamed(Routers.electronicKeyListPage, + arguments: {"keyInfo": LockListInfoItemEntity()}); }), // 密码 @@ -251,9 +255,8 @@ class _DemoModeLockDetailPageState extends State { TranslationLoader.lanKeys!.password!.tr, () { // gotoLogin(); - Get.toNamed(Routers.passwordKeyListPage, arguments: { - "keyInfo": LockListInfoItemEntity() - }); + Get.toNamed(Routers.passwordKeyListPage, + arguments: {"keyInfo": LockListInfoItemEntity()}); }), // ic卡 @@ -261,8 +264,7 @@ class _DemoModeLockDetailPageState extends State { TranslationLoader.lanKeys!.card!.tr, () { // gotoLogin(); - Get.toNamed(Routers.cardListPage, - arguments: {"lockId": 0}); + Get.toNamed(Routers.cardListPage, arguments: {"lockId": 0}); }), // 指纹 @@ -315,9 +317,8 @@ class _DemoModeLockDetailPageState extends State { TranslationLoader.lanKeys!.authorizedAdmin!.tr, () { // gotoLogin(); - Get.toNamed(Routers.authorizedAdminListPage, arguments: { - "keyInfo": LockListInfoItemEntity() - }); + Get.toNamed(Routers.authorizedAdminListPage, + arguments: {"keyInfo": LockListInfoItemEntity()}); }), // 操作记录 bottomItem('images/main/icon_main_operatingRecord.png', @@ -332,7 +333,8 @@ class _DemoModeLockDetailPageState extends State { Get.toNamed(Routers.videoLogPage); }), // 消息提醒 - bottomItem('images/main/icon_lockDetail_messageReminding.png', "消息提醒", () { + bottomItem('images/main/icon_lockDetail_messageReminding.png', "消息提醒", + () { Get.toNamed(Routers.msgNotificationPage); }), // 设置 @@ -378,5 +380,4 @@ class _DemoModeLockDetailPageState extends State { // Get.toNamed(Routers.selectLockTypePage); logic.showToast("演示模式"); } - }