Commit 43d33868 authored by akari's avatar akari

fix: 关于本机样式提交

parent 70a1ac3d
This diff is collapsed.
......@@ -22,7 +22,7 @@ class SettingsAboutPanel extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const _LogoPlaceholder(),
SizedBox(height: 20.h),
SizedBox(height: 12.h),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
......@@ -31,9 +31,9 @@ class SettingsAboutPanel extends StatelessWidget {
const _BarcodeCard(),
],
),
SizedBox(height: 36.h),
SizedBox(height: 20.h),
Divider(color: const Color(0xFF4CA7D2).withValues(alpha: 0.36)),
SizedBox(height: 18.h),
SizedBox(height: 4.h),
Expanded(
child: Row(
children: [
......@@ -72,7 +72,7 @@ class _LogoPlaceholder extends StatelessWidget {
return Center(
child: Container(
width: 863.w,
height: 185.h,
height: 150.h,
color: const Color(0xFFD7D7D7),
alignment: Alignment.center,
child: Text(
......@@ -155,8 +155,7 @@ class _DeviceInfoColumn extends StatelessWidget {
return BlocBuilder<BluetoothReadBloc, BluetoothReadState>(
buildWhen: (previous, current) => previous.info.sn != current.info.sn,
builder: (context, state) {
final sn =
state.info.sn?.isNotEmpty == true ? state.info.sn! : 'CNA07212L';
final sn = state.info.sn?.isNotEmpty == true ? state.info.sn! : '--';
return Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
......@@ -239,10 +238,14 @@ class _InfoRow extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Row(
return SizedBox(
height: 96.h,
child: Row(
children: [
SizedBox(
width: 210.w,
child: Align(
alignment: Alignment.centerLeft,
child: Text(
label,
style: TextStyle(
......@@ -252,6 +255,7 @@ class _InfoRow extends StatelessWidget {
),
),
),
),
Expanded(
child: Align(
alignment: Alignment.centerRight,
......@@ -269,6 +273,7 @@ class _InfoRow extends StatelessWidget {
),
),
],
),
);
}
}
......@@ -282,8 +287,8 @@ class _SelectButton extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
width: 350.w,
height: 52.h,
decoration: settingsButtonDecoration(),
height: 96.h,
decoration: settingsButtonDecoration(asset: settingsAssetDDL),
padding: EdgeInsets.symmetric(horizontal: 28.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
......@@ -296,12 +301,7 @@ class _SelectButton extends StatelessWidget {
fontWeight: FontWeight.w700,
),
),
SizedBox(width: 28.w),
Icon(
Icons.keyboard_arrow_down,
color: const Color(0xFF7CCDF0).withValues(alpha: 0.74),
size: 30.w,
),
SizedBox(width: 100.w)
],
),
);
......
......@@ -4,9 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
const String settingsAssetPanelLeft =
'lib/assets/monitoring/box_bg_460x905.png';
const String settingsAssetPanelMain =
'lib/assets/monitoring/box_bg_674x509.png';
const String settingsAssetButton =
'lib/assets/monitoring/frame_button_324x164.png';
'lib/assets/settings/frame_panel_3900x2000.png';
const String settingsAssetDDL = 'lib/assets/settings/ddl.png';
const String settingsAssetButton = 'lib/assets/settings/frame_333x150.png';
class SettingsPanelFrame extends StatelessWidget {
const SettingsPanelFrame({
......@@ -37,10 +38,13 @@ class SettingsPanelFrame extends StatelessWidget {
}
}
BoxDecoration settingsButtonDecoration({bool active = false}) {
BoxDecoration settingsButtonDecoration({
bool active = false,
String asset = settingsAssetButton,
}) {
return BoxDecoration(
image: const DecorationImage(
image: AssetImage(settingsAssetButton),
image: DecorationImage(
image: AssetImage(asset),
fit: BoxFit.fill,
),
boxShadow: active
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment