Commit 43d33868 authored by akari's avatar akari

fix: 关于本机样式提交

parent 70a1ac3d
This diff is collapsed.
...@@ -22,7 +22,7 @@ class SettingsAboutPanel extends StatelessWidget { ...@@ -22,7 +22,7 @@ class SettingsAboutPanel extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
const _LogoPlaceholder(), const _LogoPlaceholder(),
SizedBox(height: 20.h), SizedBox(height: 12.h),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
...@@ -31,9 +31,9 @@ class SettingsAboutPanel extends StatelessWidget { ...@@ -31,9 +31,9 @@ class SettingsAboutPanel extends StatelessWidget {
const _BarcodeCard(), const _BarcodeCard(),
], ],
), ),
SizedBox(height: 36.h), SizedBox(height: 20.h),
Divider(color: const Color(0xFF4CA7D2).withValues(alpha: 0.36)), Divider(color: const Color(0xFF4CA7D2).withValues(alpha: 0.36)),
SizedBox(height: 18.h), SizedBox(height: 4.h),
Expanded( Expanded(
child: Row( child: Row(
children: [ children: [
...@@ -72,7 +72,7 @@ class _LogoPlaceholder extends StatelessWidget { ...@@ -72,7 +72,7 @@ class _LogoPlaceholder extends StatelessWidget {
return Center( return Center(
child: Container( child: Container(
width: 863.w, width: 863.w,
height: 185.h, height: 150.h,
color: const Color(0xFFD7D7D7), color: const Color(0xFFD7D7D7),
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
...@@ -155,8 +155,7 @@ class _DeviceInfoColumn extends StatelessWidget { ...@@ -155,8 +155,7 @@ class _DeviceInfoColumn extends StatelessWidget {
return BlocBuilder<BluetoothReadBloc, BluetoothReadState>( return BlocBuilder<BluetoothReadBloc, BluetoothReadState>(
buildWhen: (previous, current) => previous.info.sn != current.info.sn, buildWhen: (previous, current) => previous.info.sn != current.info.sn,
builder: (context, state) { builder: (context, state) {
final sn = final sn = state.info.sn?.isNotEmpty == true ? state.info.sn! : '--';
state.info.sn?.isNotEmpty == true ? state.info.sn! : 'CNA07212L';
return Column( return Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
...@@ -239,36 +238,42 @@ class _InfoRow extends StatelessWidget { ...@@ -239,36 +238,42 @@ class _InfoRow extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row( return SizedBox(
children: [ height: 96.h,
SizedBox( child: Row(
width: 210.w, children: [
child: Text( SizedBox(
label, width: 210.w,
style: TextStyle( child: Align(
color: Colors.white, alignment: Alignment.centerLeft,
fontSize: 27.sp, child: Text(
fontWeight: FontWeight.w700, label,
style: TextStyle(
color: Colors.white,
fontSize: 27.sp,
fontWeight: FontWeight.w700,
),
),
), ),
), ),
), Expanded(
Expanded( child: Align(
child: Align( alignment: Alignment.centerRight,
alignment: Alignment.centerRight, child: valueWidget ??
child: valueWidget ?? Text(
Text( value ?? '',
value ?? '', maxLines: 1,
maxLines: 1, overflow: TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis, style: TextStyle(
style: TextStyle( color: Colors.white,
color: Colors.white, fontSize: 27.sp,
fontSize: 27.sp, fontWeight: FontWeight.w700,
fontWeight: FontWeight.w700, ),
), ),
), ),
), ),
), ],
], ),
); );
} }
} }
...@@ -282,8 +287,8 @@ class _SelectButton extends StatelessWidget { ...@@ -282,8 +287,8 @@ class _SelectButton extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
width: 350.w, width: 350.w,
height: 52.h, height: 96.h,
decoration: settingsButtonDecoration(), decoration: settingsButtonDecoration(asset: settingsAssetDDL),
padding: EdgeInsets.symmetric(horizontal: 28.w), padding: EdgeInsets.symmetric(horizontal: 28.w),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
...@@ -296,12 +301,7 @@ class _SelectButton extends StatelessWidget { ...@@ -296,12 +301,7 @@ class _SelectButton extends StatelessWidget {
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
SizedBox(width: 28.w), SizedBox(width: 100.w)
Icon(
Icons.keyboard_arrow_down,
color: const Color(0xFF7CCDF0).withValues(alpha: 0.74),
size: 30.w,
),
], ],
), ),
); );
......
...@@ -4,9 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; ...@@ -4,9 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
const String settingsAssetPanelLeft = const String settingsAssetPanelLeft =
'lib/assets/monitoring/box_bg_460x905.png'; 'lib/assets/monitoring/box_bg_460x905.png';
const String settingsAssetPanelMain = const String settingsAssetPanelMain =
'lib/assets/monitoring/box_bg_674x509.png'; 'lib/assets/settings/frame_panel_3900x2000.png';
const String settingsAssetButton =
'lib/assets/monitoring/frame_button_324x164.png'; const String settingsAssetDDL = 'lib/assets/settings/ddl.png';
const String settingsAssetButton = 'lib/assets/settings/frame_333x150.png';
class SettingsPanelFrame extends StatelessWidget { class SettingsPanelFrame extends StatelessWidget {
const SettingsPanelFrame({ const SettingsPanelFrame({
...@@ -37,10 +38,13 @@ class SettingsPanelFrame extends StatelessWidget { ...@@ -37,10 +38,13 @@ class SettingsPanelFrame extends StatelessWidget {
} }
} }
BoxDecoration settingsButtonDecoration({bool active = false}) { BoxDecoration settingsButtonDecoration({
bool active = false,
String asset = settingsAssetButton,
}) {
return BoxDecoration( return BoxDecoration(
image: const DecorationImage( image: DecorationImage(
image: AssetImage(settingsAssetButton), image: AssetImage(asset),
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
boxShadow: active 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