Merge branch 'master' of gitee.com:starlock-cn/app-starlock
This commit is contained in:
commit
6bc644c5e9
@ -145,23 +145,35 @@ class _LockDetailPageState extends State<LockDetailPage>
|
|||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: Colors.white,
|
backgroundColor: Colors.white,
|
||||||
body: Obx(() {
|
body: Obx(() {
|
||||||
return Column(
|
return Stack(
|
||||||
children: [
|
children: [
|
||||||
SizedBox(
|
Column(
|
||||||
height: 35.h,
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 35.h,
|
||||||
|
),
|
||||||
|
xhjInfoView(),
|
||||||
|
SizedBox(
|
||||||
|
height: 35.h,
|
||||||
|
),
|
||||||
|
labelText('images/icon_slider_horizontal.png', '功能'.tr, () {
|
||||||
|
Get.to(LockDetailListPage(
|
||||||
|
title: '功能'.tr, items: getBottomWidget()));
|
||||||
|
}),
|
||||||
|
labelText('images/icon_puzzlepiece_extension.png', '配件'.tr, () {
|
||||||
|
Get.to(LockDetailListPage(
|
||||||
|
title: '配件'.tr, items: getAttachmentWidget()));
|
||||||
|
}),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
xhjInfoView(),
|
Visibility(
|
||||||
SizedBox(
|
visible: state.iSClosedUnlockSuccessfulPopup.value,
|
||||||
height: 35.h,
|
child: Container(
|
||||||
),
|
width: 1.sw,
|
||||||
labelText('images/icon_slider_horizontal.png', '功能'.tr, () {
|
height: 1.sh - ScreenUtil().statusBarHeight * 2,
|
||||||
Get.to(
|
color: Colors.black.withOpacity(0.3),
|
||||||
LockDetailListPage(title: '功能'.tr, items: getBottomWidget()));
|
child: _unlockSuccessWidget()),
|
||||||
}),
|
)
|
||||||
labelText('images/icon_puzzlepiece_extension.png', '配件'.tr, () {
|
|
||||||
Get.to(LockDetailListPage(
|
|
||||||
title: '配件'.tr, items: getAttachmentWidget()));
|
|
||||||
}),
|
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
@ -447,19 +459,11 @@ class _LockDetailPageState extends State<LockDetailPage>
|
|||||||
),
|
),
|
||||||
Visibility(
|
Visibility(
|
||||||
visible: state.iSClosedUnlockSuccessfulPopup.value,
|
visible: state.iSClosedUnlockSuccessfulPopup.value,
|
||||||
// visible: true,
|
child: Container(
|
||||||
child: GestureDetector(
|
width: 1.sw,
|
||||||
onTap: () {
|
height: 1.sh - ScreenUtil().statusBarHeight * 2,
|
||||||
setState(() {
|
color: Colors.black.withOpacity(0.3),
|
||||||
state.iSClosedUnlockSuccessfulPopup.value = false;
|
child: _unlockSuccessWidget()),
|
||||||
});
|
|
||||||
},
|
|
||||||
child: Container(
|
|
||||||
width: 1.sw,
|
|
||||||
height: 1.sh - ScreenUtil().statusBarHeight * 2,
|
|
||||||
color: Colors.black.withOpacity(0.3),
|
|
||||||
child: _unlockSuccessWidget()),
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
]),
|
]),
|
||||||
],
|
],
|
||||||
@ -1242,36 +1246,54 @@ 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
|
||||||
? 'images/main/unlocked_bg.png'
|
? 'images/main/unlocked_bg.png'
|
||||||
: 'images/main/locked_bg.png',
|
: 'images/main/locked_bg.png',
|
||||||
width: 358.w,
|
width: 358.w,
|
||||||
height: 348.h,
|
height: 348.h,
|
||||||
),
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
top: (1.sh - ScreenUtil().statusBarHeight * 2) / 2,
|
top: 180.h,
|
||||||
child: Column(
|
left: 55.w,
|
||||||
children: [
|
child: Column(
|
||||||
Text(
|
mainAxisSize: MainAxisSize.min,
|
||||||
state.keyInfos.value.lockAlias!,
|
children: [
|
||||||
style: TextStyle(
|
Text(
|
||||||
color: AppColors.placeholderTextColor, fontSize: 24.sp),
|
state.keyInfos.value.lockAlias!,
|
||||||
),
|
style: TextStyle(
|
||||||
SizedBox(
|
color: AppColors.placeholderTextColor, fontSize: 24.sp),
|
||||||
height: 10.h,
|
),
|
||||||
),
|
SizedBox(
|
||||||
Text(
|
height: 10.h,
|
||||||
getCurrentFormattedTime(),
|
),
|
||||||
style: TextStyle(
|
Text(
|
||||||
color: AppColors.darkGrayTextColor, fontSize: 24.sp),
|
getCurrentFormattedTime(),
|
||||||
)
|
style: TextStyle(
|
||||||
],
|
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,
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user