diff --git a/lib/mine/addLock/lockAddFaq/lockAddFaq_page.dart b/lib/mine/addLock/lockAddFaq/lockAddFaq_page.dart index 865d0981..4259c89e 100644 --- a/lib/mine/addLock/lockAddFaq/lockAddFaq_page.dart +++ b/lib/mine/addLock/lockAddFaq/lockAddFaq_page.dart @@ -91,13 +91,15 @@ class _LockAddFaqPageState extends State { width: double.infinity, padding: EdgeInsets.symmetric(horizontal: 20.w), child: ElevatedButton.icon( - onPressed: logic.startOtaUpgrade, - icon: const Icon(Icons.system_update_alt, color: Colors.white), + onPressed: () { + logic.startOtaUpgrade(); + }, + icon: Icon(Icons.system_update_alt, color: Colors.white), label: Text( '尝试升级固件'.tr, style: TextStyle( color: Colors.white, - fontSize: 20.sp, + fontSize: 20.sp, // 保持与项目一致 fontWeight: FontWeight.w500, ), ), @@ -133,7 +135,7 @@ class _LockAddFaqPageState extends State { Text( '升级说明'.tr, style: TextStyle( - fontSize: 16.sp, + fontSize: 20.sp, // 调整为项目标准 fontWeight: FontWeight.w600, color: Colors.orange[700], ), @@ -144,7 +146,7 @@ class _LockAddFaqPageState extends State { Text( '如果以上方法都无法解决问题,可以尝试升级锁的固件。升级前请确保:'.tr, style: TextStyle( - fontSize: 14.sp, + fontSize: 18.sp, // 调整为项目标准 color: Colors.orange[800], ), ), @@ -152,7 +154,7 @@ class _LockAddFaqPageState extends State { Text( '• 锁电量充足\n• 已获取正确的固件文件\n• 升级过程中不要断开连接'.tr, style: TextStyle( - fontSize: 14.sp, + fontSize: 16.sp, // 保持与项目一致 color: Colors.orange[800], height: 1.4, ), @@ -193,7 +195,7 @@ class _LockAddFaqPageState extends State { child: Icon( icon, color: AppColors.mainColor, - size: 26.w, + size: 24.w, ), ), SizedBox(width: 12.w), @@ -201,7 +203,7 @@ class _LockAddFaqPageState extends State { child: Text( title, style: TextStyle( - fontSize: 20.sp, + fontSize: 22.sp, // 调整为项目标准 fontWeight: FontWeight.w600, color: Colors.black87, ), @@ -213,7 +215,7 @@ class _LockAddFaqPageState extends State { Text( description, style: TextStyle( - fontSize: 16.sp, + fontSize: 20.sp, // 调整为项目标准 color: Colors.black54, height: 1.4, ), @@ -227,19 +229,20 @@ class _LockAddFaqPageState extends State { border: Border.all(color: AppColors.mainColor.withOpacity(0.2)), ), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, children: [ Icon( Icons.lightbulb_outline, color: AppColors.mainColor, - size: 18.w, + size: 20.w, ), SizedBox(width: 8.w), Expanded( child: Text( solution, style: TextStyle( - fontSize: 14.sp, + fontSize: 18.sp, // 调整为项目标准 color: AppColors.mainColor, fontWeight: FontWeight.w500, height: 1.4, diff --git a/lib/mine/addLock/lockResetConfirm/lockResetConfirm_page.dart b/lib/mine/addLock/lockResetConfirm/lockResetConfirm_page.dart index c3b20ea3..3394b766 100644 --- a/lib/mine/addLock/lockResetConfirm/lockResetConfirm_page.dart +++ b/lib/mine/addLock/lockResetConfirm/lockResetConfirm_page.dart @@ -30,24 +30,23 @@ class _LockResetConfirmPageState extends State // 根据设备类型设置文案 final String deviceType = isLockType ? '锁' : '设备'; - final String title = - isAllDevices ? '请确认设备已重置' : '请确认${deviceType}已重置'; + final String title = isAllDevices ? '请确认设备已重置' : '请确认$deviceType已重置'; final String description = isAllDevices ? '添加设备前,请确保设备已重置为出厂状态。重置后的设备将清除所有用户数据。' - : '添加${deviceType}前,请确保${deviceType}已重置为出厂状态。重置后的${deviceType}将清除所有用户数据,包括指纹、密码、卡片等信息。'; + : '添加$deviceType前,请确保$deviceType已重置为出厂状态。重置后的$deviceType将清除所有用户数据,包括指纹、密码、卡片等信息。'; final String confirmButtonText = - isAllDevices ? '我已重置设备,继续添加' : '我已重置${deviceType},继续添加'; + isAllDevices ? '我已重置设备,继续添加' : '我已重置$deviceType,继续添加'; return Scaffold( backgroundColor: Colors.white, appBar: F.sw( skyCall: () => TitleAppBar( - barTitle: '${deviceType}重置确认'.tr, + barTitle: '重置确认'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), xhjCall: () => TitleAppBar( - barTitle: '${deviceType}重置确认'.tr, + barTitle: '重置确认'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, @@ -84,7 +83,7 @@ class _LockResetConfirmPageState extends State title.tr, textAlign: TextAlign.center, style: TextStyle( - fontSize: 24.sp, + fontSize: 24.sp, // 保持与项目一致 fontWeight: FontWeight.w600, color: Colors.black87, ), @@ -101,7 +100,7 @@ class _LockResetConfirmPageState extends State description.tr, textAlign: TextAlign.center, style: TextStyle( - fontSize: 16.sp, + fontSize: 20.sp, // 调整为项目标准 color: Colors.black54, height: 1.5, ), @@ -134,7 +133,7 @@ class _LockResetConfirmPageState extends State child: Text( '重置方法请查阅设备说明书'.tr, style: TextStyle( - fontSize: 16.sp, + fontSize: 20.sp, // 调整为项目标准 color: Colors.blue[700], fontWeight: FontWeight.w500, ), @@ -164,13 +163,11 @@ class _LockResetConfirmPageState extends State Container( margin: EdgeInsets.symmetric(horizontal: 40.w), child: TextButton( - onPressed: () { - Get.back(); - }, + onPressed: Get.back, child: Text( '取消'.tr, style: TextStyle( - fontSize: 16.sp, + fontSize: 22.sp, color: Colors.grey[600], ), ),