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

Merge branch 'release_hyx' into release

Browse Source
This commit is contained in:
anfe 2024-06-18 14:13:23 +08:00
commit e30530f3d5
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/main/lockDetail/lockDetail/lockDetail_page.dart
View File

@ -103,7 +103,7 @@ class _LockDetailPageState extends State<LockDetailPage>
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 15.h, height: 10.h,
), ),
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 24.w), padding: EdgeInsets.symmetric(horizontal: 24.w),
@ -114,20 +114,16 @@ class _LockDetailPageState extends State<LockDetailPage>
), ),
), ),
SizedBox( SizedBox(
height: 35.h, height: 20.h,
), ),
xhjInfoView(), xhjInfoView(),
SizedBox( SizedBox(
height: 35.h, height: 20.h,
), ),
labelText( labelText(
img: 'images/icon_slider_horizontal.png', img: 'images/icon_slider_horizontal.png',
text: '功能'.tr, text: '功能'.tr,
child: bottomWidget()), child: bottomWidget()),
labelText(
img: 'images/icon_puzzlepiece_extension.png',
text: '配件'.tr,
child: attachmentWidget()),
btnText( btnText(
img: 'images/main/icon_main_set.png', img: 'images/main/icon_main_set.png',
text: TranslationLoader.lanKeys!.set!.tr, text: TranslationLoader.lanKeys!.set!.tr,
@ -141,6 +137,10 @@ class _LockDetailPageState extends State<LockDetailPage>
'isOnlyOneData': state.isOnlyOneData 'isOnlyOneData': state.isOnlyOneData
}); });
}), }),
labelText(
img: 'images/icon_puzzlepiece_extension.png',
text: '配件'.tr,
child: attachmentWidget()),
], ],
), ),
), ),
@ -208,7 +208,7 @@ class _LockDetailPageState extends State<LockDetailPage>
{required String img, required String text, required Widget child}) { {required String img, required String text, required Widget child}) {
return Container( return Container(
margin: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h), margin: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h),
padding: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 20.h), padding: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(16.r), borderRadius: BorderRadius.circular(16.r),
@ -900,7 +900,7 @@ class _LockDetailPageState extends State<LockDetailPage>
child: GridView.count( child: GridView.count(
crossAxisCount: 4, crossAxisCount: 4,
// childAspectRatio: 3, // childAspectRatio: 3,
crossAxisSpacing: 20.w, crossAxisSpacing: 0.w,
mainAxisSpacing: 0.h, mainAxisSpacing: 0.h,
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
@ -946,8 +946,8 @@ class _LockDetailPageState extends State<LockDetailPage>
child: GridView.count( child: GridView.count(
crossAxisCount: 4, crossAxisCount: 4,
// childAspectRatio: 3, // childAspectRatio: 3,
crossAxisSpacing: 25.h, crossAxisSpacing: 0.h,
mainAxisSpacing: 5.h, mainAxisSpacing: 0.h,
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
children: getBottomWidget()), children: getBottomWidget()),

7
lib/main/lockMian/lockMain/lockMain_logic.dart
View File

@ -42,9 +42,10 @@ class LockMainLogic extends BaseGetXController {
} }
void loadMainDataLogic(LockListInfoGroupEntity entity) { void loadMainDataLogic(LockListInfoGroupEntity entity) {
final bool every = entity.groupList!.every((GroupList list) => final bool every = entity.groupList?.every((GroupList list) =>
(list.lockList ?? <LockListInfoItemEntity>[]).isEmpty); (list.lockList ?? <LockListInfoItemEntity>[]).isEmpty) ??
if (entity.groupList!.isEmpty || every) { false;
if ((entity.groupList??<GroupList>[]).isEmpty || every) {
state.dataLength.value = 0; state.dataLength.value = 0;
} else if (entity.groupList!.length == 1) { } else if (entity.groupList!.length == 1) {
final GroupList groupList = entity.groupList![0]; final GroupList groupList = entity.groupList![0];