Merge branch 'dev'

ui调整
# Conflicts:
#	ln_jq_app/lib/pages/login/view.dart

ln_jq_app/android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -5,6 +8,14 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.inputStream().use { input ->
+        keystoreProperties.load(input.reader(Charsets.UTF_8))
+    }
+}
+
 android {
     namespace = "com.lnkj.ln_jq_app"
     compileSdk = flutter.compileSdkVersion
@@ -26,15 +37,30 @@ android {
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = 4
-        versionName = "1.2.1"
+        versionCode = 6
+        versionName = "1.2.3"
+    }
+
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String?
+            keyPassword = keystoreProperties["keyPassword"] as String?
+            val storeFilePath = keystoreProperties["storeFile"] as String?
+            storeFile = if (storeFilePath != null) file(storeFilePath) else null
+            storePassword = keystoreProperties["storePassword"] as String?
+        }
     }
 
     buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.getByName("debug")
+        getByName("release") {
+            // 使用上面定义的 release 签名
+            signingConfig = signingConfigs.getByName("release")
+
+            // 修复混淆规则引用语法
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 }

ln_jq_app/android/app/proguard-rules.pro

@@ -0,0 +1,61 @@
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+
+# 忽略 Google Play Core 相关的缺失警告（解决你目前的报错）
+-dontwarn com.google.android.play.core.**
+
+    # Flutter 基础规则
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.** { *; }
+-keep class io.flutter.util.** { *; }
+-keep class io.flutter.view.** { *; }
+-keep class io.flutter.** { *; }
+-keep class io.flutter.plugins.** { *; }
+
+
+-dontwarn com.huawei.android.os.BuildEx$VERSION
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsConfig$Builder
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsConfig
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsInstance$Builder
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsInstance
+-dontwarn com.huawei.hianalytics.process.HiAnalyticsManager
+-dontwarn com.huawei.hianalytics.util.HiAnalyticTools
+-dontwarn com.huawei.hms.availableupdate.UpdateAdapterMgr
+-dontwarn com.huawei.libcore.io.ExternalStorageFile
+-dontwarn com.huawei.libcore.io.ExternalStorageFileInputStream
+-dontwarn com.huawei.libcore.io.ExternalStorageFileOutputStream
+-dontwarn com.huawei.libcore.io.ExternalStorageRandomAccessFile
+-dontwarn org.android.netutil.PingEntry
+-dontwarn org.android.netutil.PingResponse
+-dontwarn org.android.netutil.PingTask
+-dontwarn org.bouncycastle.crypto.BlockCipher
+-dontwarn org.bouncycastle.crypto.engines.AESEngine
+-dontwarn org.bouncycastle.crypto.prng.SP800SecureRandom
+-dontwarn org.bouncycastle.crypto.prng.SP800SecureRandomBuilder
+
+
+-keepclasseswithmembernames class ** {
+    native <methods>;
+}
+-keepattributes Signature
+-keep class sun.misc.Unsafe { *; }
+-keep class com.taobao.** {*;}
+-keep class com.alibaba.** {*;}
+-keep class com.alipay.** {*;}
+-keep class com.ut.** {*;}
+-keep class com.ta.** {*;}
+-keep class anet.**{*;}
+-keep class anetwork.**{*;}
+-keep class org.android.spdy.**{*;}
+-keep class org.android.agoo.**{*;}
+-keep class android.os.**{*;}
+-keep class org.json.**{*;}
+-dontwarn com.taobao.**
+-dontwarn com.alibaba.**
+-dontwarn com.alipay.**
+-dontwarn anet.**
+-dontwarn org.android.spdy.**
+-dontwarn org.android.agoo.**
+-dontwarn anetwork.**
+-dontwarn com.ut.**
+-dontwarn com.ta.**

ln_jq_app/assets/html/map.html

@@ -32,7 +32,7 @@
         /* --- 搜索栏样式 --- */
         #search-box {
             position: absolute;
-            top: 10px;
+            top: 40px;
             left: 10px;
             right: 10px;
             z-index: 100;
@@ -74,7 +74,7 @@
         /* --- 导航结果面板 (底部弹出) --- */
         #panel {
             position: fixed;
-            bottom: 0;
+            bottom: 75px;
             left: 0;
             width: 100%;
             height: 35%;
@@ -94,7 +94,7 @@
         #location-btn {
             position: fixed;
             right: 10px;
-            bottom: 50px;
+            bottom: 75px;
             /* 默认位置 */
             width: 44px;
             height: 44px;
@@ -121,9 +121,24 @@
             fill: #555;
         }
 
+        /* --- 调整比例尺位置 --- */
+        .amap-scalecontrol {
+            /* 初始状态：避开底部的定位按钮或留出安全间距 */
+            bottom: 80px !important;
+            left: 10px !important;
+            transition: bottom 0.3s ease;
+            /* 增加平滑动画 */
+        }
+
+        /* --- 当路径规划面板显示时，比例尺自动上移 --- */
+        body.panel-active .amap-scalecontrol {
+            bottom: 38% !important;
+            /* 移动到面板上方 (面板高度35% + 3%间距) */
+        }
+
         /* --- 关键：当 body 有 panel-active 类时，按钮上移 --- */
         body.panel-active #location-btn {
-            bottom: 38%;
+            bottom: 45%;
             /* 对应 #panel 的 height + 一点间距 */
         }
     </style>
@@ -167,7 +182,7 @@
     </div>
 
     <script>
-        var map, marker, driving, truckDriving, geocoder;
+        var map, marker, destMarker, driving, truckDriving, geocoder;
         var currentLat, currentLng;
         var isTruckMode = false;
         var isInitialLocationSet = false;
@@ -176,7 +191,7 @@
         function initMap() {
             map = new AMap.Map('container', {
                 resizeEnable: true,
-                zoom: 15,
+                zoom: 17,
                 viewMode: '3D'
             });
 
@@ -237,7 +252,7 @@
         /**
          * 核心功能 1: 接收 Flutter 传来的定位数据
          * Flutter 端调用: webViewController.evaluateJavascript("updateMyLocation(...)")
-         *  经度  维度
+         *  纬度 经度
          */
         function updateMyLocation(lat, lng, angle) {
             var rawLat = parseFloat(lat);
@@ -263,6 +278,7 @@
                             angle: isNaN(rawAngle) ? 0 : rawAngle,
                         });
                         map.setCenter(position);
+                        map.setZoom(13);
                     } else {
                         marker.moveTo(position, {
                             duration: 1000,
@@ -281,6 +297,10 @@
                                 const addressComponent = regeo.addressComponent;
                                 const pois = regeo.pois;
 
+                                console.log("地理：" + JSON.stringify(result));
+                                fetchStationInfo(addressComponent.province, addressComponent.city,
+                                    addressComponent.district, lat, lng);
+
                                 // 策略1: 优先使用最近的、类型合适的POI的名称
                                 if (pois && pois.length > 0) {
                                     // 查找第一个类型不是“商务住宅”或“地名地址信息”的POI，这类POI通常是具体的建筑或地点名
@@ -295,8 +315,9 @@
                                 }
                                 // 策略2: 如果没有POI，使用"道路+门牌号"
                                 else if (addressComponent.street && addressComponent.streetNumber) {
-                                    shortAddress = addressComponent.street + addressComponent
-                                        .streetNumber;
+                                    shortAddress = addressComponent.district +
+                                        addressComponent.township +
+                                        addressComponent.street + addressComponent.streetNumber;
                                 }
                                 // 策略3: 如果还没有，使用"区+乡镇"
                                 else if (addressComponent.district) {
@@ -330,7 +351,105 @@
         }
 
         /**
-         * 核心功能 2: 点击按钮回到当前位置
+         *  调用后端接口获取站点
+         */
+        function fetchStationInfo(province, city, district, lat, lng) {
+            // 注意：某些直辖市在高德中 city 字段可能为空，需做兼容处理
+            console.log("JS->: 开始请求." + province + city + district);
+            var cityName = (typeof city === 'string' && city.length > 0) ? city : province;
+
+            fetch('https://beta-esg.api.lnh2e.com/appointment/station/getStationInfoByArea', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        // "asoco-token": "e28eada8-4611-4dc2-a942-0122e52f52da"
+                    },
+                    body: JSON.stringify({
+                        province: province,
+                        city: cityName,
+                        district: district,
+                        longitude: lng,
+                        latitude: lat,
+                    })
+                })
+                .then(response => {
+                    if (!response.ok) {
+                        throw new Error('网络响应错误: ' + response.status);
+                    }
+                    return response.json(); // 解析 JSON
+                })
+                .then(res => {
+                    // 打印完整的返回结果，方便调试观察结构
+                    console.log("JS->: 接口完整返回:", JSON.stringify(res));
+
+                    // 安全校验：判断 res.data 是否存在
+                    if (res.code === 0 && res.data) {
+                        if (res.data.address) {
+                            console.log("JS->: 找到地址:", res.data.address);
+                            var destAddress = res.data.address;
+                            document.getElementById('endInput').value = destAddress;
+                            // 标记终点
+                            markDestination(destAddress, res.data.name || "目的地",
+                                res.data.longitude, res.data.latitude
+                            );
+                        } else {
+                            console.log("JS->: 接口请求成功，但该区域暂无站点地址");
+                        }
+                    } else {
+                        console.log("JS->: 业务报错或无数据:", res.message);
+                    }
+                })
+                .catch(err => console.error('JS->:获取站点信息失败:', err));
+        }
+
+        /**
+         *  地理编码并在地图标记终点
+         */
+        function markDestination(address, name, longitude, latitude) {
+
+
+            // 1. 清除旧的终点标记
+            if (destMarker) destMarker.setMap(null);
+
+            // 2. 创建自定义图标
+            // 假设图标大小为 32x32，你可以根据实际图片尺寸调整 Size
+            var destIcon = new AMap.Icon({
+                size: new AMap.Size(32, 32), // 图标尺寸
+                image: 'ic_tag.png', // 本地图片路径
+                imageSize: new AMap.Size(32, 32) // 图片在图标内拉伸的大小
+            });
+
+            // 3. 创建标记
+            destMarker = new AMap.Marker({
+                map: map,
+                position: [longitude, latitude],
+                icon: destIcon, // 使用自定义图标
+                // 偏移量：如果图标底部中心是尖角，offset 设为宽的一半的负数，高度的负数
+                // 这样能确保图片的底部尖端指向地图上的精确位置
+                offset: new AMap.Pixel(-16, -32),
+                title: name,
+                label: {
+                    content: '<div style="background:#fff;padding:2px 5px;border:1px solid #3366FF;border-radius:3px;font-size:12px;">' +
+                        name + '</div>',
+                    direction: 'top'
+                }
+            });
+
+            // 4. 打印调试信息
+            console.log("JS->: 终点标记已添加", address, loc.toString());
+
+            // 5. 自动调整视野包含起点和终点
+            // if (marker) {
+            //     // 如果起点标志已存在，缩放地图以展示两者
+            //     map.setFitView([marker, destMarker], false, [60, 60, 60, 60]);
+            // } else {
+            //     // 如果没有起点，直接跳到终点
+            //     map.setCenter(loc);
+            // }
+        }
+
+        /**
+         * 点击按钮回到当前位置
          */
         function backToLocation() {
             if (currentLng && currentLat) {
@@ -346,7 +465,7 @@
         }
 
         /**
-         * 核心功能 3: 路径规划
+         *  路径规划
          */
         function startRouteSearch() {
             // 获取输入框的文字

ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -13,7 +13,7 @@
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-App-29x29@1x.png",
+      "filename" : "Icon-App-29x29 1.png",
       "idiom" : "iphone",
       "scale" : "1x",
       "size" : "29x29"
@@ -31,25 +31,25 @@
       "size" : "29x29"
     },
     {
-      "filename" : "Icon-App-80x80.jpg",
+      "filename" : "Icon-App-80x80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-App-120x120.jpg",
+      "filename" : "Icon-App-120x120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-App-120x120 1.jpg",
+      "filename" : "Icon-App-120x120 1.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "Icon-App-180.jpg",
+      "filename" : "Icon-App-180.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
@@ -61,19 +61,19 @@
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-App-20x20@2x.png",
+      "filename" : "Icon-App-20x20@2x 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "Icon-App-29x29@1x.png",
+      "filename" : "Icon-App-29x29.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
-      "filename" : "Icon-App-29x29@2x.png",
+      "filename" : "Icon-App-29x29@2x 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
@@ -91,7 +91,7 @@
       "size" : "40x40"
     },
     {
-      "filename" : "Icon-App-76x76@1x.png",
+      "filename" : "Icon-App-76x76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"

ln_jq_app/ios/Runner/Info.plist

@@ -70,5 +70,11 @@
     		<string>fetch</string>
     	</array>
 
+<key>CFBundleLocalizations</key>
+<array>
+    <string>zh-Hans</string>
+    <string>en</string>
+</array>
+
 </dict>
 </plist>

ln_jq_app/lib/common/login_util.dart

@@ -29,7 +29,7 @@ class LoginUtil {
   }
 
   static ui.Image getAssImg(String imgName){
-    return ui.Image(image: ui.AssetImage('assets/images/$imgName.png'));
+    return ui.Image(image: ui.AssetImage('assets/images/$imgName.png'),fit: ui.BoxFit.cover,);
   }
 }
 

ln_jq_app/lib/common/styles/theme.dart

@@ -8,11 +8,11 @@ class AppTheme {
   static const Color themeColor = Color(0xFF017137);
 
   //是否开放域名切换
-  static const bool is_show_host = true;
+  static const bool is_show_host = false;
 
   //http://192.168.110.222:8080/
   //http://192.168.110.44:8080/
-  static String test_service_url = "https://beta-esg.api.lnh2e.com/";
+  static String test_service_url = "http://47.101.201.13:8443/api/";
   static const String release_service_url = "";
 
   //加氢站相关查询

ln_jq_app/lib/main.dart

@@ -16,7 +16,7 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   WidgetsBinding widgetsBinding = await init(
-    isDebug: true,
+    isDebug: false,
     logTag: '小羚羚',
     supportedLocales: [const Locale('zh', 'CN')],
   );
@@ -31,12 +31,19 @@ void main() async {
 
   runApp(
     GetxApp(
+      // 设计稿尺寸 单位：dp
       designSize: const Size(390, 844),
-      enableLog: true,
+      // Getx Log
+      enableLog: false,
+      // 默认的跳转动画
       defaultTransition: Transition.rightToLeft,
+      // 主题模式
       themeMode: GlobalService.to.themeMode,
+      // 主题
       theme: AppTheme.light,
+      // Dark主题
       darkTheme: AppTheme.light,
+      // AppTitle
       title: '小羚羚',
       // 将入口改为启动页
       home: const WelcomePage(),
@@ -62,6 +69,9 @@ void initHttpSet() {
   HttpService.to.dio.interceptors.add(TokenInterceptor(tokenKey: 'asoco-token'));
   HttpService.to.setOnResponseHandler((response) async {
     try {
+      if (response.data == null) {
+        return null;
+      }
       final baseModel = BaseModel.fromJson(response.data);
       if (baseModel.code == 0 || baseModel.code == 200) {
         return null;

ln_jq_app/lib/pages/b_page/base_widgets/view.dart

@@ -1,22 +1,25 @@
 import 'package:flutter/material.dart';
 import 'package:getx_scaffold/common/index.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
+import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/pages/b_page/base_widgets/controller.dart';
 import 'package:ln_jq_app/pages/b_page/reservation/view.dart';
 import 'package:ln_jq_app/pages/b_page/site/view.dart';
 
 class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
-   B_BaseWidgetsPage({super.key});
+  B_BaseWidgetsPage({super.key});
 
   final PageController _pageController = PageController();
+
   // 主视图
   Widget _buildView() {
     return PageView(
       controller: _pageController,
+      physics: const NeverScrollableScrollPhysics(), // 禁止滑动
       onPageChanged: (index) {
         jumpTabAndPage(index);
       },
-      children: _buildPages(), // 页面的列表
+      children: _buildPages(),
     );
   }
 
@@ -25,33 +28,59 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
     controller.updateUi(); // 更新 UI
     _pageController.jumpToPage(controller.pageIndex);
   }
+
   // 对应的页面
   List<Widget> _buildPages() {
-    return [
-      SitePage(),
-      ReservationPage(),
-    ];
+    return [SitePage(), ReservationPage()];
   }
 
-  //导航栏
+  // 自定义导航栏 (悬浮胶囊样式)
   Widget _buildNavigationBar() {
-    return NavigationX(
-      currentIndex: controller.pageIndex, // 当前选中的tab索引
-      onTap: (index) {
-        jumpTabAndPage(index);
-      }, // 切换tab事件
-      items: [
-        NavigationItemModel(
-          label: '加氢预约',
-          icon: AntdIcon.orderedlist,
-          selectedIcon: AntdIcon.calendar_fill,
+    return SafeArea(
+      child: Container(
+        height: 50.h,
+        margin: const EdgeInsets.fromLTRB(24, 0, 24, 10), // 悬浮边距
+        decoration: BoxDecoration(
+          color: Color.fromRGBO(240, 244, 247, 1), // 浅灰色背景
+          borderRadius: BorderRadius.circular(30),
+          boxShadow: [
+            BoxShadow(
+              color: Colors.black.withOpacity(0.05),
+              blurRadius: 10,
+              offset: const Offset(0, 5),
+            ),
+          ],
         ),
-        NavigationItemModel(
-          label: '站点信息',
-          icon: AntdIcon.car,
-          selectedIcon: AntdIcon.car_fill,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceAround,
+          children: [
+            _buildNavItem(0, "ic_h2_select@2x", "ic_h2@2x"),
+            _buildNavItem(1, "ic_h2_my@2x", "ic_h2_my_select@2x"),
+          ],
         ),
-      ],
+      ),
+    );
+  }
+
+  // 构建单个导航项
+  Widget _buildNavItem(int index, String icon, String selectedIcon) {
+    bool isSelected = controller.pageIndex == index;
+    return GestureDetector(
+      onTap: () => jumpTabAndPage(index),
+      behavior: HitTestBehavior.opaque,
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 200),
+        padding:  EdgeInsets.symmetric(horizontal: 50.w, vertical: 8),
+        decoration: BoxDecoration(
+          color: isSelected ? const Color(0xFF006633) : Colors.transparent, // 选中时的深绿色背景
+          borderRadius: BorderRadius.circular(20),
+        ),
+        child: SizedBox(
+          height: 24,
+          width: 24,
+          child: LoginUtil.getAssImg(isSelected ? selectedIcon : icon),
+        ),
+      ),
     );
   }
 
@@ -62,10 +91,10 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
       id: 'b_baseWidgets',
       builder: (_) {
         return Scaffold(
-          extendBody: false,
+          extendBody: true,
           resizeToAvoidBottomInset: false,
           bottomNavigationBar: _buildNavigationBar(),
-          body: SafeArea(child: _buildView()),
+          body: _buildView(),
         );
       },
     );

ln_jq_app/lib/pages/b_page/history/view.dart

@@ -173,6 +173,10 @@ class HistoryPage extends GetView<HistoryController> {
         text = '未加氢';
         color = Colors.red;
         break;
+      case ReservationStatus.cancel:
+        text = '已取消';
+        color = Colors.red;
+        break;
       default:
         text = '未知状态';
         color = Colors.grey;

ln_jq_app/lib/pages/b_page/reservation/controller.dart

@@ -45,7 +45,7 @@ class ReservationController extends GetxController with BaseControllerMixin {
     customStartTime = DateTime.now();
     customEndTime = customStartTime!.add(const Duration(days: 1));
     renderData();
-    _msgNotice(); // 红点消息
+    msgNotice(); // 红点消息
     startAutoRefresh();
   }
 
@@ -248,7 +248,7 @@ class ReservationController extends GetxController with BaseControllerMixin {
     }
   }
 
-  Future<void> _msgNotice() async {
+  Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,
       'isRead': 1,
@@ -264,6 +264,7 @@ class ReservationController extends GetxController with BaseControllerMixin {
       if (result.code == 0 && result.data != null) {
         String total = result.data["total"].toString();
         isNotice = int.parse(total) > 0;
+        updateUi();
       }
     }
   }

ln_jq_app/lib/pages/b_page/reservation/view.dart

@@ -36,7 +36,7 @@ class ReservationPage extends GetView<ReservationController> {
                       _buildSystemTips(),
                       SizedBox(height: 24),
                       _buildLogoutButton(),
-                      SizedBox(height: 40),
+                      SizedBox(height: 75.h),
                     ],
                   ),
                 ),
@@ -98,8 +98,12 @@ class ReservationPage extends GetView<ReservationController> {
                 ),
               ),
               IconButton(
-                onPressed: () {
-                  Get.to(() => const MessagePage());
+                onPressed: () async{
+                  var scanResult = await Get.to(() => const MessagePage());
+                  if (scanResult == null) {
+                    controller.msgNotice();
+                  }
+
                 },
                 style: IconButton.styleFrom(
                   backgroundColor: Colors.grey[100],
@@ -332,7 +336,8 @@ class ReservationPage extends GetView<ReservationController> {
                         controller.jobTipStr,
                         style: TextStyle(color: Colors.yellow[800], fontSize: 14),
                       ),
-                      Icon(AntdIcon.question_circle, size: 14, color: Colors.yellow[800]),
+                      SizedBox(width: 2.w),
+                      Icon(AntdIcon.info_circle, size: 14, color: Colors.yellow[800]),
                     ],
                   ),
                 ),
@@ -358,9 +363,9 @@ class ReservationPage extends GetView<ReservationController> {
                   child: Text(
                     status,
                     style: TextStyle(
-                      fontSize: 11.sp,
+                      fontSize: 13.sp,
                       color: isSelected ? Colors.white : Color.fromRGBO(51, 51, 51, 1),
-                      fontWeight: FontWeight.w400,
+                      fontWeight: FontWeight.w500,
                     ),
                   ),
                 ),

ln_jq_app/lib/pages/b_page/site/controller.dart

@@ -6,17 +6,20 @@ import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/storage_service.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 enum ReservationStatus {
   pending, // 待处理 ( addStatus: 0)
   completed, // 完成 ( addStatus: 1)
   rejected, // 拒绝 ( -1)
   unadded, // 未加 ( 2)
+  cancel, // 取消预约
   unknown, // 未知状态
 }
 
 class ReservationModel {
   final String id;
+  final String stationId;
   final String plateNumber;
   String amount;
   final String time;
@@ -40,6 +43,7 @@ class ReservationModel {
 
   ReservationModel({
     required this.id,
+    required this.stationId,
     required this.plateNumber,
     required this.amount,
     required this.time,
@@ -80,6 +84,9 @@ class ReservationModel {
         case 2:
           currentStatus = ReservationStatus.unadded;
           break;
+        case 6:
+          currentStatus = ReservationStatus.cancel;
+          break;
         default:
           currentStatus = ReservationStatus.unknown;
       }
@@ -97,6 +104,7 @@ class ReservationModel {
     return ReservationModel(
       // 原始字段，用于UI兼容
       id: json['id']?.toString() ?? '',
+      stationId: json['stationId']?.toString() ?? '',
       plateNumber: json['plateNumber']?.toString() ?? '未知车牌',
       amount: '${json['hydAmount']?.toString() ?? '0'}kg',
       time: timeRange,
@@ -137,15 +145,25 @@ class SiteController extends GetxController with BaseControllerMixin {
 
   final TextEditingController searchController = TextEditingController();
   bool isNotice = false;
+  final RefreshController refreshController = RefreshController(initialRefresh: false);
+
+  @override
+  bool get listenLifecycleEvent => true;
 
   @override
   void onInit() {
     super.onInit();
     renderData();
-    _msgNotice();
+    msgNotice();
     startAutoRefresh();
   }
 
+  @override
+  void onPaused() {
+    stopAutoRefresh();
+    super.onPaused();
+  }
+
   @override
   void onClose() {
     stopAutoRefresh();
@@ -153,7 +171,7 @@ class SiteController extends GetxController with BaseControllerMixin {
     super.onClose();
   }
 
-  Future<void> _msgNotice() async {
+  Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,
       'isRead': 1,
@@ -169,6 +187,7 @@ class SiteController extends GetxController with BaseControllerMixin {
       if (result.code == 0 && result.data != null) {
         String total = result.data["total"].toString();
         isNotice = int.parse(total) > 0;
+        updateUi();
       }
     }
   }
@@ -183,7 +202,9 @@ class SiteController extends GetxController with BaseControllerMixin {
     });
   }
 
-  /// 【6. 新增】停止定时器的方法
+  void onRefresh() => renderData(isRefresh: true);
+
+  ///停止定时器的方法
   void stopAutoRefresh() {
     // 如果定时器存在并且是激活状态，就取消它
     _refreshTimer?.cancel();
@@ -205,6 +226,7 @@ class SiteController extends GetxController with BaseControllerMixin {
           'pageNum': 1,
           'pageSize': 50, // 暂时不考虑分页，一次获取30条
           'keyword': searchText, // 加氢站名称、手机号
+          'stationId': StorageService.to.userId,
         },
       );
 
@@ -570,7 +592,7 @@ class SiteController extends GetxController with BaseControllerMixin {
   String orderTotalAmount = "";
   String orderUnfinishedAmount = "";
 
-  Future<void> renderData() async {
+  Future<void> renderData({bool isRefresh = false}) async {
     try {
       var responseData = await HttpService.to.get(
         'appointment/station/getStationInfoById?hydrogenId=${StorageService.to.userId}',
@@ -603,6 +625,10 @@ class SiteController extends GetxController with BaseControllerMixin {
     } finally {
       //加载列表数据
       fetchReservationData();
+
+      if (isRefresh) {
+        refreshController.refreshCompleted();
+      }
     }
   }
 }

ln_jq_app/lib/pages/b_page/site/view.dart

@@ -4,6 +4,7 @@ import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/b_page/history/view.dart';
 import 'package:ln_jq_app/pages/c_page/message/view.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import 'controller.dart';
 
@@ -19,7 +20,12 @@ class SitePage extends GetView<SiteController> {
       builder: (_) {
         return Scaffold(
           backgroundColor: Color.fromRGBO(247, 249, 251, 1),
-          body: SingleChildScrollView(child: _buildView(context)),
+          body: SmartRefresher(
+            controller: controller.refreshController,
+            enablePullUp: false,
+            onRefresh: controller.onRefresh,
+            child: SingleChildScrollView(child: _buildView(context)),
+          ),
         );
       },
     );
@@ -52,7 +58,7 @@ class SitePage extends GetView<SiteController> {
                     GestureDetector(
                       onTap: () {
                         Get.to(
-                              () => HistoryPage(),
+                          () => HistoryPage(),
                           arguments: {'stationName': controller.name},
                         );
                       },
@@ -78,7 +84,7 @@ class SitePage extends GetView<SiteController> {
                 ],
               ),
 
-              SizedBox(height: 35.h,),
+              SizedBox(height: 35.h),
               //第三部分
               Container(
                 padding: const EdgeInsets.all(15),
@@ -130,6 +136,7 @@ class SitePage extends GetView<SiteController> {
             ],
           ),
         ),
+        SizedBox(height: 75.h),
       ],
     );
   }
@@ -142,10 +149,7 @@ class SitePage extends GetView<SiteController> {
         borderRadius: BorderRadius.vertical(bottom: Radius.circular(20)),
       ),
       padding: EdgeInsets.only(
-        top: MediaQuery
-            .of(context)
-            .padding
-            .top + 10,
+        top: MediaQuery.of(context).padding.top + 10,
         left: 20,
         right: 20,
         bottom: 25,
@@ -182,8 +186,11 @@ class SitePage extends GetView<SiteController> {
                 ),
               ),
               IconButton(
-                onPressed: () {
-                  Get.to(() => const MessagePage());
+                onPressed: () async {
+                  var scanResult = await Get.to(() => const MessagePage());
+                  if (scanResult == null) {
+                    controller.msgNotice();
+                  }
                 },
                 style: IconButton.styleFrom(
                   backgroundColor: Colors.grey[100],
@@ -204,8 +211,7 @@ class SitePage extends GetView<SiteController> {
           const SizedBox(height: 25),
           Row(
             children: [
-              _buildStatBox(
-                  "剩余氢量", "remaining quantity", controller.leftHydrogen, "kg"),
+              _buildStatBox("剩余氢量", "remaining quantity", controller.leftHydrogen, "kg"),
               SizedBox(width: 4.w),
               _buildStatBox(
                 "今日加氢量",
@@ -367,15 +373,17 @@ class SitePage extends GetView<SiteController> {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          Icon(Icons.inventory_2_outlined, size: 80, color: Colors.grey[300]),
-          const SizedBox(height: 16),
-          const Text(
-              '暂无预约数据', style: TextStyle(fontSize: 16, color: Colors.black54)),
-          const SizedBox(height: 8),
-          const Text(
-            '点击右上角刷新按钮获取最新数据',
-            style: TextStyle(fontSize: 14, color: Colors.grey),
+          LoginUtil.getAssImg("ic_no_data@2x"),
+          SizedBox(height: 16.h),
+          Text(
+            '暂无订单',
+            style: TextStyle(
+              fontSize: 16.sp,
+              color: Colors.black54,
+              fontWeight: FontWeight.w600,
+            ),
           ),
+          const SizedBox(height: 8),
         ],
       ),
     );
@@ -492,7 +500,7 @@ class SitePage extends GetView<SiteController> {
                 "预约量:${item.amount}",
                 style: TextStyle(
                   color: Color(0xFF00A870),
-                  fontSize: 12.sp,
+                  fontSize: 13.sp,
                   fontWeight: FontWeight.bold,
                 ),
               ),
@@ -507,7 +515,7 @@ class SitePage extends GetView<SiteController> {
                 "${item.contactPerson} | ${item.contactPhone}",
                 style: TextStyle(
                   color: Color(0xFF999999),
-                  fontSize: 12.sp,
+                  fontSize: 13.sp,
                   fontWeight: FontWeight.w400,
                 ),
               ),
@@ -546,7 +554,8 @@ class SitePage extends GetView<SiteController> {
   }
 
   /// 通用小按钮
-  Widget _buildSmallButton(String text, {
+  Widget _buildSmallButton(
+    String text, {
     required bool isOutline,
     required VoidCallback onTap,
   }) {
@@ -601,6 +610,11 @@ class SitePage extends GetView<SiteController> {
         textColor = const Color(0xFFFF7D7D); // 红色
         bgColor = const Color(0xFFFFEEEE);
         break;
+      case ReservationStatus.cancel:
+        text = '已取消';
+        textColor = const Color(0xFFFF7D7D); // 红色
+        bgColor = const Color(0xFFFFEEEE);
+        break;
       default:
         text = "未知";
         textColor = Colors.grey;
@@ -690,6 +704,10 @@ class SitePage extends GetView<SiteController> {
         text = '未加氢';
         color = Colors.red;
         break;
+      case ReservationStatus.cancel:
+        text = '已取消';
+        color = Colors.red;
+        break;
       default:
         text = '未知状态';
         color = Colors.grey;
@@ -716,11 +734,12 @@ class SitePage extends GetView<SiteController> {
   }
 
   /// 构建信息详情行
-  Widget _buildDetailRow(IconData icon,
-      String label,
-      String value, {
-        Color valueColor = Colors.black87,
-      }) {
+  Widget _buildDetailRow(
+    IconData icon,
+    String label,
+    String value, {
+    Color valueColor = Colors.black87,
+  }) {
     return Row(
       children: [
         Icon(icon, color: Colors.grey, size: 20),

ln_jq_app/lib/pages/c_page/car_info/controller.dart

@@ -34,10 +34,10 @@ class CarInfoController extends GetxController with BaseControllerMixin {
   void onInit() {
     super.onInit();
     getUserBindCarInfo();
-    _msgNotice();
+    msgNotice();
   }
 
-  Future<void> _msgNotice() async {
+  Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,
       'isRead': 1,
@@ -53,6 +53,7 @@ class CarInfoController extends GetxController with BaseControllerMixin {
       if (result.code == 0 && result.data != null) {
         String total = result.data["total"].toString();
         isNotice = int.parse(total) > 0;
+        updateUi();
       }
     }
   }
@@ -63,6 +64,7 @@ class CarInfoController extends GetxController with BaseControllerMixin {
     // 如果未绑定车辆，且本次会话尚未提示过，则弹出提示
     if (!StorageService.to.hasShownBindVehicleDialog &&
         StorageService.to.isLoggedIn &&
+        StorageService.to.loginChannel == LoginChannel.driver &&
         !StorageService.to.hasVehicleInfo) {
       Future.delayed(const Duration(milliseconds: 500), () {
         DialogX.to.showConfirmDialog(

ln_jq_app/lib/pages/c_page/car_info/view.dart

@@ -133,8 +133,11 @@ class CarInfoPage extends GetView<CarInfoController> {
                   ),
                 ),
                 IconButton(
-                  onPressed: () {
-                    Get.to(() => const MessagePage());
+                  onPressed: () async{
+                    var scanResult = await Get.to(() => const MessagePage());
+                    if (scanResult == null) {
+                      controller.msgNotice();
+                    }
                   },
                   style: IconButton.styleFrom(
                     backgroundColor: Colors.grey[100],
@@ -345,7 +348,7 @@ class CarInfoPage extends GetView<CarInfoController> {
           ),
           const SizedBox(height: 9),
           SizedBox(
-            height: 336.h, // 给定一个高度，或者使用别的方式布局
+            height: 356.h, // 给定一个高度，或者使用别的方式布局
             child: TabBarView(
               children: [
                 _buildCertificateContent('行驶证', controller.drivingAttachments),
@@ -379,7 +382,7 @@ class CarInfoPage extends GetView<CarInfoController> {
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        _buildCertDetailItem('所属公司', controller.rentFromCompany, isFull: true),
+                        _buildCertDetailItem('所属公司', controller.rentFromCompany, isFull: false),
                         _buildCertDetailItem('运营城市', controller.address),
                       ],
                     ),

ln_jq_app/lib/pages/c_page/message/controller.dart

@@ -19,6 +19,10 @@ class MessageController extends GetxController {
     _loadData(isRefresh: true);
   }
 
+  void onRefresh() => _loadData(isRefresh: true);
+
+  void onLoading() => _loadData(isRefresh: false);
+
   Future<void> _loadData({bool isRefresh = false}) async {
     final int targetPage = isRefresh ? 1 : _pageNum + 1;
 
@@ -100,9 +104,7 @@ class MessageController extends GetxController {
     }
   }
 
-  void onRefresh() => _loadData(isRefresh: true);
 
-  void onLoading() => _loadData(isRefresh: false);
 
   // 标记全部已读
   void markAllRead() async {

ln_jq_app/lib/pages/c_page/mine/controller.dart

@@ -57,7 +57,7 @@ class MineController extends GetxController with BaseControllerMixin {
         _fetchAccidentCount(), // 请求2：事故数
         _fetchBreakRulesCount(), // 请求3：违章数
         _rating(), // 司机评分
-        _msgNotice(), // 红点消息
+        msgNotice(), // 红点消息
       ]);
 
       await renderViolation();
@@ -69,7 +69,7 @@ class MineController extends GetxController with BaseControllerMixin {
     }
   }
 
-  Future<void> _msgNotice() async {
+  Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,
       'isRead': 1,
@@ -85,6 +85,7 @@ class MineController extends GetxController with BaseControllerMixin {
       if (result.code == 0 && result.data != null) {
         String total = result.data["total"].toString();
         isNotice = int.parse(total) > 0;
+        updateUi();
       }
     }
   }

ln_jq_app/lib/pages/c_page/mine/view.dart

@@ -140,8 +140,12 @@ class MinePage extends GetView<MineController> {
                   ),
                 ),
                 IconButton(
-                  onPressed: () {
-                    Get.to(() => const MessagePage());
+                  onPressed: () async{
+                    var scanResult = await Get.to(() => const MessagePage());
+                    if (scanResult == null) {
+                      controller.msgNotice();
+                    }
+
                   },
                   style: IconButton.styleFrom(
                     backgroundColor: Colors.grey[100],

ln_jq_app/lib/pages/c_page/reservation/controller.dart

@@ -33,6 +33,8 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
   @override
   String get builderId => 'reservation';
 
+  C_ReservationController();
+
   final DateTime _now = DateTime.now();
 
   // 计算当前时间属于哪个1小时区间
@@ -335,14 +337,14 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
     final startTimeStr =
         '$dateStr ${_formatTimeOfDay(startTime.value)}:00'; // Use helper directly
 
-    if (lastSuccessfulReservation != null &&
+    /*if (lastSuccessfulReservation != null &&
         lastSuccessfulReservation!.id == selectedStationId.value &&
         lastSuccessfulReservation!.startTime == startTimeStr) {
       showToast("请勿重复提交相同时间段的预约，可在“查看预约”中修改");
       return;
-    }
+    }*/
 
-    final reservationEndDateTime = DateTime(
+    DateTime reservationEndDateTime = DateTime(
       selectedDate.value.year,
       selectedDate.value.month,
       selectedDate.value.day,
@@ -350,7 +352,13 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       endTime.value.minute,
     );
 
-    //判断预约区间的结束时间是否早于当前时间（留出1分钟缓冲）
+    // 如果结束的小时数小于开始的小时数，或者结束时间是 00:00，说明是次日
+    if (endTime.value.hour < startTime.value.hour ||
+        (endTime.value.hour == 0 && endTime.value.minute == 0)) {
+      reservationEndDateTime = reservationEndDateTime.add(const Duration(days: 1));
+    }
+
+    // 执行时间检查
     if (reservationEndDateTime.isBefore(
       DateTime.now().subtract(const Duration(minutes: 1)),
     )) {
@@ -363,10 +371,10 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
         (s) => s.hydrogenId == selectedStationId.value,
       );
 
-      if (selectedStation.siteStatusName != "营运中") {
+      /*if (selectedStation.siteStatusName != "营运中") {
         showToast("该站点${selectedStation.siteStatusName}，暂无法预约");
         return;
-      }
+      }*/
 
       showLoading("提交中");
 
@@ -401,6 +409,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
         lastSuccessfulReservation = ReservationModel(
           id: selectedStationId.value!,
+          stationId: '',
           hydAmount: ampuntStr,
           startTime: startTimeStr,
           endTime: endTimeStr,
@@ -540,6 +549,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
   //用来管理查看预约的弹窗
   Worker? _sheetWorker;
   bool init = false;
+  Timer? _refreshTimer;
 
   @override
   bool get listenLifecycleEvent => true;
@@ -549,7 +559,8 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
     super.onInit();
     getUserBindCarInfo();
     getSiteList();
-    _msgNotice();
+    startAutoRefresh();
+    msgNotice();
 
     if (!init) {
       _setupListener();
@@ -559,7 +570,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
   bool isNotice = false;
 
-  Future<void> _msgNotice() async {
+  Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,
       'isRead': 1,
@@ -575,14 +586,26 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       if (result.code == 0 && result.data != null) {
         String total = result.data["total"].toString();
         isNotice = int.parse(total) > 0;
+        updateUi();
       }
     }
   }
 
-  @override
-  void dispose() {
-    _sheetWorker?.dispose();
-    super.dispose();
+  void startAutoRefresh() {
+    // 先停止已存在的定时器，防止重复启动
+    stopAutoRefresh();
+
+    // 创建一个每1分钟执行一次的周期性定时器
+    _refreshTimer = Timer.periodic(const Duration(minutes: 1), (timer) {
+      getSiteList();
+    });
+  }
+
+  ///停止定时器的方法
+  void stopAutoRefresh() {
+    // 如果定时器存在并且是激活状态，就取消它
+    _refreshTimer?.cancel();
+    _refreshTimer = null; // 置为null，方便判断
   }
 
   void _setupListener() {
@@ -636,8 +659,10 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
       var result = BaseModel.fromJson(responseData.data);
 
-      fillingWeight =
-          "${result.data["fillingWeight"]}${result.data["fillingWeightUnit"]}";
+      final value = double.tryParse(result.data["fillingWeight"]?.toString() ?? '0') ?? 0;
+      final String formatted = value.toStringAsFixed(2);
+
+      fillingWeight = "$formatted${result.data["fillingWeightUnit"]}";
       fillingTimes = "${result.data["fillingTimes"]}${result.data["fillingTimesUnit"]}";
 
       updateUi();
@@ -684,8 +709,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       }
 
       updateUi();
-    } catch (e) {
-    }
+    } catch (e) {}
     renderSliderTheme();
   }
 
@@ -757,7 +781,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       if (stationOptions.isEmpty) {
         showToast('附近暂无可用加氢站');
       } else {
-        showToast('站点列表已刷新');
+        // showToast('站点列表已刷新');
       }
 
       // 找到第一个可选的站点作为默认值
@@ -779,6 +803,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       // 如果未绑定车辆，且本次会话尚未提示过，则弹出提示
       if (!StorageService.to.hasShownBindVehicleDialog &&
           StorageService.to.isLoggedIn &&
+          StorageService.to.loginChannel == LoginChannel.driver &&
           !StorageService.to.hasVehicleInfo) {
         Future.delayed(const Duration(milliseconds: 500), () {
           DialogX.to.showConfirmDialog(
@@ -804,11 +829,13 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
   @override
   void onClose() {
+    super.onClose();
     amountController.dispose();
     plateNumberController.dispose();
     if (_debounce != null) {
       _debounce?.cancel();
     }
-    super.onClose();
+    _sheetWorker?.dispose();
+    stopAutoRefresh();
   }
 }

ln_jq_app/lib/pages/c_page/reservation/view.dart

@@ -1,17 +1,12 @@
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/login_util.dart';
 import 'package:ln_jq_app/common/model/station_model.dart';
-import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/c_page/message/view.dart';
-import 'package:ln_jq_app/pages/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
 
 import 'controller.dart';
-import 'reservation_list_bottomsheet.dart';
 
 ///加氢预约
 class ReservationPage extends GetView<C_ReservationController> {
@@ -152,7 +147,12 @@ class ReservationPage extends GetView<C_ReservationController> {
                   ),
                 ),
                 IconButton(
-                  onPressed: () => Get.to(() => const MessagePage()),
+                  onPressed: () async {
+                    var scanResult = await Get.to(() => const MessagePage());
+                    if (scanResult == null) {
+                      controller.msgNotice();
+                    }
+                  },
                   icon: Badge(
                     smallSize: 8,
                     backgroundColor: controller.isNotice
@@ -519,7 +519,7 @@ class ReservationPage extends GetView<C_ReservationController> {
       color: Colors.white,
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
       child: Padding(
-        padding: const EdgeInsets.all(13.0),
+        padding: EdgeInsets.all(13.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -566,19 +566,27 @@ class ReservationPage extends GetView<C_ReservationController> {
                     borderRadius: BorderRadius.circular(12),
                   ),
                   child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       IconButton(
                         onPressed: () => _updateAmount(-1),
-                        icon: const Icon(Icons.remove, size: 18, color: Colors.grey),
+                        icon: Icon(Icons.remove, size: 14.sp, color: Colors.grey),
                       ),
-                      Text(
-                        "${controller.amountController.text} Kg",
-                        style: const TextStyle(fontSize: 14, color: Colors.black87),
+                      Expanded(
+                        child: Text(
+                          "${controller.amountController.text}Kg",
+                          textAlign: TextAlign.center,
+                          softWrap: false,
+                          overflow: TextOverflow.fade,
+                          style: TextStyle(
+                            fontSize: 11.sp,
+                            color: Colors.black87,
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
                       ),
                       IconButton(
                         onPressed: () => _updateAmount(1),
-                        icon: const Icon(Icons.add, size: 18, color: Colors.grey),
+                        icon: Icon(Icons.add, size: 14.sp, color: Colors.grey),
                       ),
                     ],
                   ),
@@ -758,6 +766,9 @@ class ReservationPage extends GetView<C_ReservationController> {
       controller.amountController.text = newAmount.toStringAsFixed(2);
     }
 
+    //更新进度条
+    controller.current = newAmount;
+
     //  移动光标到末尾，防止光标跳到前面
     controller.amountController.selection = TextSelection.fromPosition(
       TextPosition(offset: controller.amountController.text.length),

ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart

@@ -74,8 +74,8 @@ class ReservationEditController extends GetxController with BaseControllerMixin
     final now = DateTime.now();
     final isToday =
         selectedDate.value.year == now.year &&
-            selectedDate.value.month == now.month &&
-            selectedDate.value.day == now.day;
+        selectedDate.value.month == now.month &&
+        selectedDate.value.day == now.day;
 
     final List<TimeSlot> availableSlots = [];
     for (int i = 0; i < 24; i++) {
@@ -123,7 +123,7 @@ class ReservationEditController extends GetxController with BaseControllerMixin
 
     // 查找当前选中的时间对应的新列表中的索引
     int initialItem = availableSlots.indexWhere(
-          (slot) => slot.start.hour == startTime.value.hour,
+      (slot) => slot.start.hour == startTime.value.hour,
     );
 
     if (initialItem == -1) {
@@ -132,7 +132,6 @@ class ReservationEditController extends GetxController with BaseControllerMixin
 
     TimeSlot tempSlot = availableSlots[initialItem];
 
-
     Get.bottomSheet(
       Container(
         height: 300,
@@ -228,6 +227,7 @@ class ReservationEditController extends GetxController with BaseControllerMixin
         'appointment/orderAddHyd/saveOrUpdate',
         data: {
           'id': reservation.id,
+          'stationId': reservation.stationId,
           'startTime': startTimeStr,
           'endTime': endTimeStr,
           'hydAmount': amountStr,

ln_jq_app/lib/pages/home/controller.dart

@@ -7,6 +7,7 @@ import 'package:getx_scaffold/getx_scaffold.dart';
 import 'package:ln_jq_app/common/styles/theme.dart';
 import 'package:ln_jq_app/pages/b_page/base_widgets/view.dart';
 import 'package:ln_jq_app/pages/c_page/base_widgets/view.dart';
+import 'package:ln_jq_app/pages/c_page/message/view.dart';
 import 'package:ln_jq_app/pages/login/view.dart';
 
 import '../../storage_service.dart';
@@ -156,6 +157,7 @@ class HomeController extends GetxController with BaseControllerMixin {
 
   Future<void> _onNotificationOpened(Map<dynamic, dynamic> message) async {
     Logger.d('onNotificationOpened ====> $message');
+    await Get.to(() => const MessagePage());
   }
 
   Future<void> _onNotificationRemoved(Map<dynamic, dynamic> message) async {

ln_jq_app/lib/pages/login/view.dart

@@ -68,13 +68,14 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
 
         return Scaffold(
           backgroundColor: Colors.white,
+          resizeToAvoidBottomInset: false,
           body: GestureDetector(
             onTap: () {
               hideKeyboard();
             },
             child: Stack(
               children: [
-                // 1. 顶部背景与装饰
+                //顶部背景与装饰
                 Positioned(
                   top: 0,
                   left: 0,
@@ -92,9 +93,9 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
                 ),
                 _buildBrandingHeader(),
 
-                // 2. 登录表单主体
+                //  登录表单主体
                 Positioned(
-                  top: 280.h,
+                  top: 300.h,
                   left: 0,
                   right: 0,
                   bottom: 0,
@@ -443,12 +444,19 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
         data: {'account': account, 'password': encryptedPassword, 'loginType': "station"},
       );
 
-      if (_rememberPassword) {
-        await StorageService.to.saveStationCredentials(account, password);
-      } else {
-        await StorageService.to.clearStationCredentials();
+      if (responseData != null && responseData.data != null) {
+        var result = BaseModel.fromJson(responseData.data);
+        if (result.code == 0) {
+          // 登录成功，处理记住密码逻辑
+          if (_rememberPassword) {
+            await StorageService.to.saveStationCredentials(account, password);
+          } else {
+            await StorageService.to.clearStationCredentials();
+          }
+        }
       }
 
+
       _processLoginResponse(responseData, "station", account);
     } catch (e) {
       dismissLoading();
@@ -475,7 +483,6 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
   ) async {
     if (responseData == null || responseData.data == null) {
       dismissLoading();
-      showToast('登录失败');
       return;
     }
     var result = BaseModel.fromJson(responseData.data);
@@ -495,14 +502,25 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
         phone: result.data['phone'],
       );
       // 成功后自动获取车辆信息
-      var carInfo = await HttpService.to.get(
-        "appointment/driver/getTruckInfoByDriver?phone=${result.data['phone']}",
-      );
-      if (carInfo != null) {
-        var carResult = BaseModel.fromJson(carInfo.data);
-        if (carResult.data != null)
-          await StorageService.to.saveVehicleInfo(VehicleInfo.fromJson(carResult.data));
+      try {
+        var carInfo = await HttpService.to.get(
+          "appointment/driver/getTruckInfoByDriver?phone=${result.data['phone']}",
+        );
+        if (carInfo != null) {
+          var carInforesult = BaseModel.fromJson(carInfo.data);
+          if (carInforesult.data != null) {
+            final vehicle = VehicleInfo.fromJson(
+              carInforesult.data as Map<String, dynamic>,
+            );
+            //保存使用
+            await StorageService.to.saveVehicleInfo(vehicle);
+          }
+        }
+      } catch (e) {
+        Logger.d("暂时不处理 查询车辆信息失败的情况");
       }
+
+
       dismissLoading();
       Get.offAll(() => BaseWidgetsPage());
     } else {
@@ -521,7 +539,16 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
   final _aliyunPush = AliyunPushFlutter();
 
   void addAlias(String alias) async {
-    await _aliyunPush.addAlias(alias);
+    var result = await _aliyunPush.bindAccount(alias);
+
+    var code = result['code'];
+    if (code == kAliyunPushSuccessCode) {
+      Logger.d('添加别名$alias成功');
+    } else {
+      var errorCode = result['code'];
+      var errorMsg = result['errorMsg'];
+      Logger.d('添加别名$alias失败: $errorCode - $errorMsg');
+    }
   }
 
   Widget buildAgreement() {

ln_jq_app/lib/pages/qr_code/controller.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:dio/dio.dart' as dio;
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
@@ -6,243 +7,156 @@ import 'package:image_picker/image_picker.dart';
 import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/model/vehicle_info.dart';
 import 'package:ln_jq_app/storage_service.dart';
-import 'package:mobile_scanner/mobile_scanner.dart';
 import 'package:permission_handler/permission_handler.dart';
 
-class QrCodeController extends GetxController
-    with BaseControllerMixin, GetSingleTickerProviderStateMixin {
+class QrCodeController extends GetxController with BaseControllerMixin {
   @override
   String get builderId => 'qrcode';
 
-  // --- Animation ---
-  late final AnimationController animationController;
-  late final Animation<double> scanAnimation;
-
-  // --- 使用 MobileScanner 的控制器 ---
-  final MobileScannerController scannerController = MobileScannerController();
-
-  final RxBool isFlashOn = false.obs;
-  final RxBool isProcessingResult = false.obs;
-
-  final RxBool hasPermission = false.obs;
+  final RxBool hasCameraPermission = false.obs;
 
   @override
   void onInit() {
     super.onInit();
-    requestPermission();
-
-    animationController = AnimationController(
-      duration: const Duration(milliseconds: 2500),
-      vsync: this,
-    );
-    scanAnimation =
-        Tween<double>(begin: 0, end: 1).animate(animationController);
-    animationController.repeat(reverse: false);
+    _checkPermission();
   }
 
-  /// MobileScanner 的 onDetect 回调方法
-  void onDetect(BarcodeCapture capture) {
-    if (isProcessingResult.value) return;
-
-    final Barcode? barcode = capture.barcodes.firstOrNull;
-    if (barcode?.rawValue != null && barcode!.rawValue!.isNotEmpty) {
-      isProcessingResult.value = true;
-      scannerController.stop();
-      animationController.stop();
-      renderResult(barcode.rawValue!);
-    }
+  /// 检查权限
+  void _checkPermission() async {
+    var status = await Permission.camera.status;
+    hasCameraPermission.value = status.isGranted;
   }
 
-  /// 恢复扫描状态
-  void resumeScanner() {
-    isProcessingResult.value = false;
-    try {
-      scannerController.start();
-      animationController.repeat(reverse: false);
-    } catch (e) {
-      print("无法重启相机: $e");
-    }
-  }
-
-  /// 从相册选择图片并扫描二维码
-  void scanFromGallery() async {
-    try {
-      final XFile? imageFile =
-      await ImagePicker().pickImage(source: ImageSource.gallery);
-      if (imageFile == null) {
-        return;
-      }
-
-      scannerController.stop();
-      animationController.stop();
-      showLoading("正在识别...");
-
-      final BarcodeCapture? capture =
-      await scannerController.analyzeImage(imageFile.path);
-
-      dismissLoading();
-
-      final Barcode? firstBarcode = capture?.barcodes.firstOrNull;
-
-      if (firstBarcode?.rawValue != null &&
-          firstBarcode!.rawValue!.isNotEmpty) {
-        final String scanResult = firstBarcode.rawValue!;
-        print("相册识别到的内容: $scanResult");
-        renderResult(scanResult);
-      } else {
-        showErrorToast('未识别到二维码');
-        resumeScanner();
-      }
-    } catch (e, stackTrace) {
-      dismissLoading();
-      showErrorToast('从相册选择失败，请稍后重试');
-      print("scanFromGallery Error: $e\n$stackTrace");
-      resumeScanner();
-    }
-  }
-
-  /// 切换闪光灯
-  void toggleFlash() async {
-    try {
-      await scannerController.toggleTorch();
-      final currentTorchState = scannerController.value.torchState;
-      isFlashOn.value = currentTorchState == TorchState.on;
-    } catch (e) {
-      print("切换闪光灯失败: $e");
-      showErrorToast("无法打开闪光灯");
-    }
-  }
-
-  /// 翻转相机
-  void flipCamera() async {
-    await scannerController.switchCamera();
-  }
-
-  /// 请求相机权限
-  void requestPermission() async {
+  /// 1. 拍照并识别车牌流程
+  void takePhotoAndRecognize() async {
     var status = await Permission.camera.request();
-
-    hasPermission.value = status.isGranted;
-
     if (!status.isGranted) {
-      if (status.isPermanentlyDenied) {
-        showErrorToast('相机权限已被永久拒绝，请到系统设置中开启');
-        // 延迟一会再引导用户去设置
-        Future.delayed(const Duration(seconds: 2), () => openAppSettings());
-      } else {
-        showErrorToast('请授予相机权限以使用扫描功能');
-      }
+      if (status.isPermanentlyDenied) openAppSettings();
+      showErrorToast("需要相机权限才能拍照识别");
+      return;
     }
 
-  }
+    final XFile? photo = await ImagePicker().pickImage(
+      source: ImageSource.camera,
+      imageQuality: 80, // 压缩图片质量以加快上传
+    );
+    if (photo == null) return;
 
-  void requestPhotoPermission() async {
-    var status = await Permission.photos.request();
-    if (status.isGranted) {
-      scanFromGallery();
-    } else if (status.isPermanentlyDenied) {
-      openAppSettings();
-    } else {
-      showErrorToast('需要相册权限才能从相册中选择图片');
-    }
-  }
-
-  /// 处理扫描结果
-  void renderResult(String resultStr, {plateNumber}) async {
-    showLoading("正在获取车辆信息...");
-    try {
-      final Map<String, dynamic> requestData = {
-        "code": resultStr,
-        "phone": StorageService.to.phone,
-      };
-      if (plateNumber != null && plateNumber.isNotEmpty) {
-        requestData['plateNumber'] = plateNumber;
-      }
-      var responseData = await HttpService.to.post(
-        "appointment/truck/bindTruck",
-        data: requestData,
-      );
-
-      if (responseData == null) {
-        dismissLoading();
-        showToast('无法获取车辆信息，请检查网络或稍后重试');
-        resumeScanner();
-        return;
-      }
-      var result = BaseModel.fromJson(responseData.data);
-
-      if (result.code != 0) {
-        showToast(result.error);
-        dismissLoading();
-        resumeScanner(); // 绑定失败也要恢复扫描
-        return;
-      }
-
-      if (result.data == null) {
-        dismissLoading();
-        showBindDialog(resultStr);
-        return;
-      }
-
-      final vehicle = VehicleInfo.fromJson(result.data as Map<String, dynamic>);
-      await StorageService.to.saveVehicleInfo(vehicle);
-      dismissLoading();
-      Get.back(result: true);
-
-    } on DioException catch (_) {
-      showErrorToast("网络请求失败，请稍后重试");
-      resumeScanner();
-    } catch (e, _) {
-      showErrorToast("处理失败，请稍后重舍");
-      resumeScanner();
-    } finally {
-      if (Get.isDialogOpen ?? false) {
-        dismissLoading();
+    // 1.1 上传文件
+    String? imageUrl = await uploadFile(photo.path);
+    if (imageUrl != null) {
+      // 1.2 获取车牌号
+      String? plateNumber = await getPlateNumber(imageUrl);
+      if (plateNumber != null) {
+        // 1.3 弹窗确认
+        manualInputBind(plateNumber, 0);
       }
     }
   }
 
-  /// 显示绑定确认对话框
-  void showBindDialog(String resultStr) {
-    final TextEditingController plateNumberController = TextEditingController();
-    // 使用 showConfirmDialog，它有 onCancel 回调
+  /// 手动输入车牌绑定
+  void manualInputBind(String plateNumber, int source) {
+    final TextEditingController controller = TextEditingController(
+      text: plateNumber.toUpperCase() ?? '',
+    );
+
     DialogX.to.showConfirmDialog(
-      title: '请输入车牌号',
-      barrierDismissible: false,
-      content: TextField(
-        controller: plateNumberController,
-        autofocus: false,
-        decoration: const InputDecoration(
-          hintText: '请输入完整的车牌号',
-          border: OutlineInputBorder(),
-          contentPadding: EdgeInsets.symmetric(horizontal: 12.0),
+      title: source == 0 ? "识别结果" : '手动输入车牌',
+      content: SizedBox(
+        height: 40.h,
+        child: TextField(
+          textAlign: TextAlign.start,
+          controller: controller,
+          autofocus: plateNumber.isEmpty,
+          textCapitalization: TextCapitalization.characters,
+          decoration: const InputDecoration(
+            contentPadding: EdgeInsets.only(left: 5),
+            hintText: '请输入完整的车牌号',
+            border: OutlineInputBorder(),
+          ),
         ),
       ),
       confirmText: '确认绑定',
-      cancelText: '取消', // showConfirmDialog 有 cancelText
-      onConfirm: () {
-        final String plateNumber = plateNumberController.text.trim();
-        if (plateNumber.isEmpty) {
-          showToast("请输入车牌号");
-          // 返回 false 可以阻止弹窗关闭，让用户继续输入
-          return false;
-        }
-        renderResult(resultStr, plateNumber: plateNumber);
-        //关闭弹窗
-        return true;
-      },
+      cancelText: source == 0 ? "重新拍摄" : '取消',
       onCancel: () {
-        // 如果用户点击取消，恢复扫描
-        resumeScanner();
+        if (source == 0) {
+          takePhotoAndRecognize();
+        }
+      },
+      onConfirm: () {
+        final plate = controller.text.trim().toUpperCase();
+        if (plate.isNotEmpty) {
+          bindVehicleByPlate(plate);
+        }
       },
     );
   }
 
-  @override
-  void onClose() {
-    scannerController.dispose();
-    animationController.dispose();
-    super.onClose();
+  /// 上传图片
+  Future<String?> uploadFile(String filePath) async {
+    showLoading("正在上传图片...");
+    try {
+      dio.FormData formData = dio.FormData.fromMap({
+        'file': await dio.MultipartFile.fromFile(filePath, filename: 'ocr_plate.jpg'),
+      });
+
+      var response = await HttpService.to.post("appointment/ocr/upload", data: formData);
+      if (response != null) {
+        final result = BaseModel.fromJson(response.data);
+        if (result.code == 0) return result.data.toString();
+        showErrorToast(result.error);
+      }
+    } catch (e) {
+      showErrorToast("图片上传失败");
+    } finally {
+      dismissLoading();
+    }
+    return null;
+  }
+
+  /// OCR 识别
+  Future<String?> getPlateNumber(String imageUrl) async {
+    showLoading("正在识别车牌...");
+    try {
+      var response = await HttpService.to.get(
+        "appointment/ocr/getPlateNumber",
+        params: {'imageUrl': imageUrl},
+      );
+      if (response != null) {
+        final result = BaseModel.fromJson(response.data);
+        if (result.code == 0) return result.data.toString();
+        showErrorToast(result.error);
+      }
+    } catch (e) {
+      showErrorToast("车牌识别失败");
+    } finally {
+      dismissLoading();
+    }
+    return null;
+  }
+
+  /// 核心绑定方法
+  void bindVehicleByPlate(String plateNumber) async {
+    showLoading("正在绑定车辆...");
+    try {
+      var responseData = await HttpService.to.post(
+        "appointment/truck/bindOcrTruck",
+        data: {"plateNumber": plateNumber, "phone": StorageService.to.phone},
+      );
+
+      var result = BaseModel.fromJson(responseData?.data);
+      if (result.code == 0 && result.data != null) {
+        await StorageService.to.saveVehicleInfo(VehicleInfo.fromJson(result.data));
+        dismissLoading();
+        showSuccessToast("绑定成功");
+        Get.back(result: true);
+      } else {
+        showErrorToast(result.error);
+      }
+    } catch (e) {
+
+    } finally {
+      dismissLoading();
+    }
   }
 }
-

ln_jq_app/lib/pages/qr_code/view.dart

@@ -1,285 +1,82 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:ln_jq_app/common/styles/theme.dart';
-import 'package:mobile_scanner/mobile_scanner.dart';
+import 'package:getx_scaffold/getx_scaffold.dart';
 
 import 'controller.dart';
 
 class QrCodePage extends GetView<QrCodeController> {
-  const QrCodePage({super.key});
+  const QrCodePage({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    Get.put(QrCodeController());
-    return Scaffold(
-      extendBodyBehindAppBar: true,
-      appBar: AppBar(
-        title: const Text('扫码', style: TextStyle(color: Colors.white)),
-        centerTitle: true,
-        backgroundColor: Colors.transparent,
-        elevation: 0,
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios, color: Colors.white),
-          onPressed: () => Get.back(),
-        ),
-        actions: [
-          TextButton(
-            onPressed: controller.requestPhotoPermission,
-            child: const Text('相册', style: TextStyle(color: Colors.white, fontSize: 16)),
+    return GetBuilder<QrCodeController>(
+      init: QrCodeController(),
+      id: 'qrcode',
+      builder: (controller) {
+        return Scaffold(
+          appBar: AppBar(
+            title: const Text('绑定车辆'),
+            centerTitle: true,
+            elevation: 0,
           ),
-        ],
-      ),
-      body: Obx(() { // 1. 使用 Obx 包裹整个 body
-        // 根据权限状态来决定显示什么
-        if (controller.hasPermission.value) {
-          // 如果有权限，显示扫描器
-          return _buildScannerView(context);
-        } else {
-          // 如果没有权限，显示引导界面
-          return _buildPermissionDeniedView();
-        }
-      }),
-    );
-  }
-  Widget _buildScannerView(BuildContext context){
-    if (!controller.animationController.isAnimating) {
-      controller.animationController.repeat(reverse: false);
-    }
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        // 使用 MobileScanner 作为扫描视图
-        MobileScanner(
-          controller: controller.scannerController,
-          onDetect: controller.onDetect,
-          // 您可以自定义扫描框的样式
-          scanWindow: Rect.fromCenter(
-            center: Offset(
-              MediaQuery.of(context).size.width / 2,
-              MediaQuery.of(context).size.height / 2 - 50,
-            ),
-            width: 250,
-            height: 250,
-          ),
-        ),
-        // 扫描动画和覆盖层
-        _buildScannerOverlay(context),
-        // 底部的功能按钮
-        Positioned(bottom: 80, left: 0, right: 0, child: _buildActionButtons()),
-      ],
-    );
-  }
+          body: Container(
+            width: double.infinity,
+            padding: const EdgeInsets.symmetric(horizontal: 24.0),
+            child: SingleChildScrollView(child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const SizedBox(height: 24),
+                Icon(
+                  Icons.directions_car_rounded,
+                  size: 100,
+                  color: Theme.of(context).primaryColor.withOpacity(0.1),
+                ),
+                const SizedBox(height: 24),
+                const Text(
+                  "请选择绑定方式",
+                  style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+                ),
+                const SizedBox(height: 8),
+                const Text(
+                  "您可以拍摄照片自动识别，\n或手动输入车牌号进行绑定。",
+                  textAlign: TextAlign.center,
+                  style: TextStyle(fontSize: 14, color: Colors.grey),
+                ),
+                const SizedBox(height: 60),
 
-  Widget _buildPermissionDeniedView() {
-    // 确保动画是停止的
-    if (controller.animationController.isAnimating) {
-      controller.animationController.stop();
-    }
-
-    return Container(
-      color: Colors.black,
-      alignment: Alignment.center,
-      padding: const EdgeInsets.all(24.0),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const Icon(Icons.no_photography, color: Colors.white70, size: 64),
-          const SizedBox(height: 16),
-          const Text(
-            '需要相机权限',
-            style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
-          ),
-          const SizedBox(height: 8),
-          const Text(
-            '请授予相机权限以使用扫码功能。',
-            style: TextStyle(color: Colors.white70, fontSize: 14),
-            textAlign: TextAlign.center,
-          ),
-          const SizedBox(height: 24),
-          ElevatedButton(
-            onPressed: controller.requestPermission, // 点击按钮重新请求权限
-            child: const Text('授予权限'),
-          ),
-        ],
-      ),
-    );
-  }
-
-  /// 构建扫描区域的覆盖层和动画
-  Widget _buildScannerOverlay(BuildContext context) {
-    // 模拟扫描框的位置和大小
-    const double scanAreaSize = 250.0;
-    return Stack(
-      children: [
-        // 半透明的覆盖层
-        ColorFiltered(
-          colorFilter: ColorFilter.mode(Colors.black.withOpacity(0.5), BlendMode.srcOut),
-          child: Stack(
-            children: [
-              Container(decoration: const BoxDecoration(color: Colors.transparent)),
-              Align(
-                alignment: Alignment.center,
-                child: Container(
-                  margin: const EdgeInsets.only(bottom: 100), // 微调位置
-                  width: scanAreaSize,
-                  height: scanAreaSize,
-                  decoration: BoxDecoration(
-                    color: Colors.black,
-                    borderRadius: BorderRadius.circular(12),
+                // 拍照识别按钮
+                ElevatedButton.icon(
+                  onPressed: controller.takePhotoAndRecognize,
+                  icon: const Icon(Icons.camera_alt_rounded),
+                  label: const Text("拍照识别车牌"),
+                  style: ElevatedButton.styleFrom(
+                    minimumSize: const Size(double.infinity, 56),
+                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(28)),
+                    textStyle: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
                   ),
                 ),
-              ),
-            ],
-          ),
-        ),
-        // 扫描动画
-        Align(
-          alignment: Alignment.center,
-          child: Container(
-            margin: const EdgeInsets.only(bottom: 100),
-            width: scanAreaSize,
-            height: scanAreaSize,
-            child: AnimatedBuilder(
-              animation: controller.scanAnimation,
-              builder: (context, child) {
-                return CustomPaint(
-                  painter: ScannerAnimationPainter(
-                    controller.scanAnimation.value,
-                    AppTheme.themeColor,
-                  ),
-                );
-              },
-            ),
-          ),
-        ),
-      ],
-    );
-  }
+                const SizedBox(height: 20),
 
-  /// 构建底部的功能按钮（闪光灯、相册）
-  Widget _buildActionButtons() {
-      return Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const Text(
-            '将二维码/条形码放入框内，即可自动扫描',
-            style: TextStyle(color: Colors.white, fontSize: 14),
-          ),
-          const SizedBox(height: 20),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: <Widget>[
-              // 闪光灯按钮
-              _buildIconButton(
-                onPressed: controller.toggleFlash,
-                //闪光灯状态的变化
-                child: Obx(
-                      () => IconButton(
-                    icon: Icon(
-                      controller.isFlashOn.value ? Icons.flash_on : Icons.flash_off,
-                      color: Colors.white,
-                      size: 28,
-                    ),
-                    onPressed: controller.toggleFlash,
+                // 3. 手动输入按钮
+                OutlinedButton.icon(
+                  onPressed: (){
+                    controller.manualInputBind("",1);
+                  },
+                  icon: const Icon(Icons.edit_note_rounded),
+                  label: const Text("手动输入车牌"),
+                  style: OutlinedButton.styleFrom(
+                    minimumSize: const Size(double.infinity, 56),
+                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(28)),
+                    side: BorderSide(color: Theme.of(context).primaryColor, width: 1.5),
+                    textStyle: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
                   ),
                 ),
-              ),
-              // 翻转相机按钮
-              _buildIconButton(
-                onPressed: controller.flipCamera,
-                child: const Icon(
-                  Icons.flip_camera_ios,
-                  color: Colors.white,
-                  size: 28,
-                ),
-              ),
-            ],
+                const SizedBox(height: 100), // 底部留白
+              ],
+            ),),
           ),
-        ],
-      );
-    }
-
-
-  Widget _buildIconButton({required VoidCallback onPressed, required Widget child}) {
-    return Container(
-      decoration: BoxDecoration(
-        color: Colors.black.withOpacity(0.3),
-        shape: BoxShape.circle,
-      ),
-      child: IconButton(
-        onPressed: onPressed,
-        icon: child,
-        iconSize: 32, // 增大点击区域
-      ),
+        );
+      },
     );
   }
 }
-
-/// 扫描动画的绘制器
-class ScannerAnimationPainter extends CustomPainter {
-  final double value;
-  final Color borderColor;
-
-  ScannerAnimationPainter(this.value, this.borderColor);
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final paint = Paint()
-      ..color = borderColor
-      ..strokeWidth = 3
-      ..style = PaintingStyle.stroke;
-
-    final cornerLength = 20.0;
-    // 绘制四个角的边框
-    // Top-left
-    canvas.drawPath(
-      Path()
-        ..moveTo(0, cornerLength)
-        ..lineTo(0, 0)
-        ..lineTo(cornerLength, 0),
-      paint,
-    );
-    // Top-right
-    canvas.drawPath(
-      Path()
-        ..moveTo(size.width - cornerLength, 0)
-        ..lineTo(size.width, 0)
-        ..lineTo(size.width, cornerLength),
-      paint,
-    );
-    // Bottom-left
-    canvas.drawPath(
-      Path()
-        ..moveTo(0, size.height - cornerLength)
-        ..lineTo(0, size.height)
-        ..lineTo(cornerLength, size.height),
-      paint,
-    );
-    // Bottom-right
-    canvas.drawPath(
-      Path()
-        ..moveTo(size.width - cornerLength, size.height)
-        ..lineTo(size.width, size.height)
-        ..lineTo(size.width, size.height - cornerLength),
-      paint,
-    );
-
-    // 绘制扫描线
-    final linePaint = Paint()
-      ..color = borderColor.withOpacity(0.8)
-      ..strokeWidth = 2
-      ..shader = LinearGradient(
-        colors: [borderColor.withOpacity(0), borderColor, borderColor.withOpacity(0)],
-        stops: const [0.0, 0.5, 1.0],
-      ).createShader(Rect.fromLTWH(0, 0, size.width, size.height));
-
-    final y = size.height * value;
-    canvas.drawLine(Offset(0, y), Offset(size.width, y), linePaint);
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) {
-    return true;
-  }
-}

ln_jq_app/lib/storage_service.dart

@@ -142,7 +142,7 @@ class StorageService extends GetxService {
 
   void delAlias() async {
     String phoen = StorageService.to.phone ?? "";
-    var result = await _aliyunPush.removeAlias(phoen);
+    var result = await await _aliyunPush.unbindAccount();
     var code = result['code'];
     if (code == kAliyunPushSuccessCode) {
       Logger.d('删除别名$phoen成功');

ln_jq_app/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.2.1+4
+version: 1.2.3+6
 
 environment:
   sdk: ^3.9.0