Merge branch 'master' of gitee.com:starlock-cn/app-starlock

This commit is contained in:
Daisy 2024-05-13 17:43:57 +08:00
commit 6bc644c5e9

View File

@ -145,7 +145,9 @@ class _LockDetailPageState extends State<LockDetailPage>
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
body: Obx(() { body: Obx(() {
return Column( return Stack(
children: [
Column(
children: [ children: [
SizedBox( SizedBox(
height: 35.h, height: 35.h,
@ -155,14 +157,24 @@ class _LockDetailPageState extends State<LockDetailPage>
height: 35.h, height: 35.h,
), ),
labelText('images/icon_slider_horizontal.png', '功能'.tr, () { labelText('images/icon_slider_horizontal.png', '功能'.tr, () {
Get.to( Get.to(LockDetailListPage(
LockDetailListPage(title: '功能'.tr, items: getBottomWidget())); title: '功能'.tr, items: getBottomWidget()));
}), }),
labelText('images/icon_puzzlepiece_extension.png', '配件'.tr, () { labelText('images/icon_puzzlepiece_extension.png', '配件'.tr, () {
Get.to(LockDetailListPage( Get.to(LockDetailListPage(
title: '配件'.tr, items: getAttachmentWidget())); title: '配件'.tr, items: getAttachmentWidget()));
}), }),
], ],
),
Visibility(
visible: state.iSClosedUnlockSuccessfulPopup.value,
child: Container(
width: 1.sw,
height: 1.sh - ScreenUtil().statusBarHeight * 2,
color: Colors.black.withOpacity(0.3),
child: _unlockSuccessWidget()),
)
],
); );
}), }),
); );
@ -447,19 +459,11 @@ class _LockDetailPageState extends State<LockDetailPage>
), ),
Visibility( Visibility(
visible: state.iSClosedUnlockSuccessfulPopup.value, visible: state.iSClosedUnlockSuccessfulPopup.value,
// visible: true,
child: GestureDetector(
onTap: () {
setState(() {
state.iSClosedUnlockSuccessfulPopup.value = false;
});
},
child: Container( child: Container(
width: 1.sw, width: 1.sw,
height: 1.sh - ScreenUtil().statusBarHeight * 2, height: 1.sh - ScreenUtil().statusBarHeight * 2,
color: Colors.black.withOpacity(0.3), color: Colors.black.withOpacity(0.3),
child: _unlockSuccessWidget()), child: _unlockSuccessWidget()),
),
) )
]), ]),
], ],
@ -1242,8 +1246,8 @@ class _LockDetailPageState extends State<LockDetailPage>
} }
Widget _unlockSuccessWidget() { Widget _unlockSuccessWidget() {
return Stack( return Center(
alignment: Alignment.center, child: Stack(
children: [ children: [
Image.asset( Image.asset(
state.iSOpenLock.value == true state.iSOpenLock.value == true
@ -1253,8 +1257,10 @@ class _LockDetailPageState extends State<LockDetailPage>
height: 348.h, height: 348.h,
), ),
Positioned( Positioned(
top: (1.sh - ScreenUtil().statusBarHeight * 2) / 2, top: 180.h,
left: 55.w,
child: Column( child: Column(
mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( Text(
state.keyInfos.value.lockAlias!, state.keyInfos.value.lockAlias!,
@ -1270,8 +1276,24 @@ class _LockDetailPageState extends State<LockDetailPage>
color: AppColors.darkGrayTextColor, fontSize: 24.sp), color: AppColors.darkGrayTextColor, fontSize: 24.sp),
) )
], ],
)) )),
Positioned(
top: 288.h,
left: 155.w,
child: GestureDetector(
onTap: () {
setState(() {
state.iSClosedUnlockSuccessfulPopup.value = false;
});
},
child: Container(
width: 60.r,
height: 60.r,
color: Colors.transparent,
)),
),
], ],
),
); );
} }