From 94a20961c2dcdc27f0879b1ff5297de6071d9a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Mon, 23 Oct 2023 09:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=94=81=E5=90=8D=E5=AD=97=E8=BF=87=E9=95=BF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checkInCreatCompany_page.dart | 7 +- .../lockDetail/lockDetail_page.dart | 76 +++++++++++++------ .../main/lockMian/entity/lockInfoEntity.dart | 8 +- .../main/lockMian/lockList/lockList_page.dart | 5 +- 4 files changed, 66 insertions(+), 30 deletions(-) diff --git a/star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_page.dart b/star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_page.dart index ab6161c0..8049ddaf 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_page.dart @@ -44,7 +44,12 @@ class _CheckInCreatCompanyPageState extends State { isHaveLine: true, isHaveDirection: true, action: () async { - var data = await Get.toNamed(Routers.checkingInSetWorkTimePage); + var data = await Get.toNamed(Routers.checkingInSetWorkTimePage, arguments: { + "getKeyInfosData": state.getKeyInfosData.value, + "companyId": "", + "pushType": "", + "checkingInSetInfo": "", + }); if(data != null) { setState(() { state.beginTime.value = data["beginTime"]; diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 86872650..b9595cd7 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -89,33 +89,61 @@ class _LockDetailPageState extends State with TickerProviderStat return Column( children: [ SizedBox(height: 50.h), + // Stack( + // alignment: Alignment.center, + // children: [ + // Align( + // alignment: Alignment.center, + // child: Text( + // widget.keyInfo!.lockAlias!, + // style: + // TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w400), + // )), + // Row( + // mainAxisAlignment: MainAxisAlignment.end, + // children: [ + // Text( + // "100%", + // style: TextStyle( + // fontSize: 18.sp, color: AppColors.darkGrayTextColor), + // ), + // SizedBox(width: 2.w), + // Image.asset( + // 'images/main/icon_main_cell.png', + // width: 30.w, + // height: 24.w, + // ), + // SizedBox(width: 30.w), + // ], + // ), + // ], + // ), Stack( - alignment: Alignment.centerRight, + alignment: Alignment.center, children: [ - Align( - alignment: Alignment.center, - child: Text( - widget.keyInfo!.lockAlias!, - style: - TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w400), - )), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Text( - "100%", - style: TextStyle( - fontSize: 18.sp, color: AppColors.darkGrayTextColor), - ), - SizedBox(width: 2.w), - Image.asset( - 'images/main/icon_main_cell.png', - width: 30.w, - height: 24.w, - ), - SizedBox(width: 30.w), - ], + Container( + width: 1.sw - 120.w*2, + child: Center(child: Text(widget.keyInfo!.lockAlias!, style:TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w400),)) ), + Positioned( + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Text( + "100%", + style: TextStyle( + fontSize: 18.sp, color: AppColors.darkGrayTextColor), + ), + SizedBox(width: 2.w), + Image.asset( + 'images/main/icon_main_cell.png', + width: 30.w, + height: 24.w, + ), + SizedBox(width: 30.w), + ], + ) + ) ], ), SizedBox(height: 30.h), diff --git a/star_lock/lib/main/lockMian/entity/lockInfoEntity.dart b/star_lock/lib/main/lockMian/entity/lockInfoEntity.dart index fccb21a8..ba176939 100644 --- a/star_lock/lib/main/lockMian/entity/lockInfoEntity.dart +++ b/star_lock/lib/main/lockMian/entity/lockInfoEntity.dart @@ -221,7 +221,7 @@ class KeyInfos { int? resetButton; int? endDate; int? keyRight; - int? electricQuantity; + // int? electricQuantity; int? lockSound; int? volume; int? specialValue; @@ -277,7 +277,7 @@ class KeyInfos { this.resetButton, this.endDate, this.keyRight, - this.electricQuantity, + // this.electricQuantity, this.lockSound, this.volume, this.specialValue, @@ -334,7 +334,7 @@ class KeyInfos { resetButton = json['resetButton']; endDate = json['endDate']; keyRight = json['keyRight']; - electricQuantity = json['electricQuantity']; + // electricQuantity = json['electricQuantity']; lockSound = json['lockSound']; volume = json['volume']; specialValue = json['specialValue']; @@ -397,7 +397,7 @@ class KeyInfos { data['resetButton'] = resetButton; data['endDate'] = endDate; data['keyRight'] = keyRight; - data['electricQuantity'] = electricQuantity; + // data['electricQuantity'] = electricQuantity; data['lockSound'] = lockSound; data['volume'] = volume; data['specialValue'] = specialValue; diff --git a/star_lock/lib/main/lockMian/lockList/lockList_page.dart b/star_lock/lib/main/lockMian/lockList/lockList_page.dart index f22310d3..7ef1d959 100644 --- a/star_lock/lib/main/lockMian/lockList/lockList_page.dart +++ b/star_lock/lib/main/lockMian/lockList/lockList_page.dart @@ -45,7 +45,7 @@ class _LockListPageState extends State { return GestureDetector( onTap: action, child: Container( - height: 122.h, + // height: 122.h, margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w), decoration: BoxDecoration( color: Colors.white, @@ -101,6 +101,9 @@ class _LockListPageState extends State { ), ], ), + SizedBox( + height: 20.h, + ), ], ), ),