v1.1.0

Merge branch 'dev'
v1.1.0
2025-11-28 14:48:03 +08:00 · 2025-11-28 10:12:44 +08:00 · 2025-11-28 10:09:18 +08:00 · 2025-11-27 17:21:07 +08:00 · 2025-11-27 15:25:58 +08:00 · 2025-11-27 09:30:52 +08:00
22 changed files with 719 additions and 455 deletions
--- a/ln_jq_app/android/app/build.gradle.kts
+++ b/ln_jq_app/android/app/build.gradle.kts
@@ -21,7 +21,7 @@ android {
    defaultConfig {
        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.lnkj.ln_jq_app"
+        applicationId = "com.lingniu.driver"
        // You can update the following values to match your application needs.
        // For more information, see: https://flutter.dev/to/review-gradle-config.
        minSdk = flutter.minSdkVersion
--- a/ln_jq_app/android/app/src/main/AndroidManifest.xml
+++ b/ln_jq_app/android/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
    <application
        android:label="小羚羚"
        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/logo">
        <activity
            android:name=".MainActivity"
            android:exported="true"
--- a/ln_jq_app/android/app/src/main/res/mipmap-xhdpi/logo.png
+++ b/ln_jq_app/android/app/src/main/res/mipmap-xhdpi/logo.png
--- a/ln_jq_app/assets/html/map.html
+++ b/ln_jq_app/assets/html/map.html
@@ -1,13 +1,35 @@
 <!DOCTYPE html>
 <html>
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
-    <title>导航规划</title>
+    <title>路径规划</title>
    <style>
        html, body, #container { width: 100%; height: 100%; margin: 0; }
-        /* 搜索栏样式 */
+    <style>
        /* --- 全局样式 --- */
        html,
        body,
        #container {
            width: 100%;
            height: 100%;
            margin: 0;
            font-family: sans-serif;
        }
        /* --- 暴力隐藏高德自带的导流链接和Logo (关键) --- */
        .amap-callamap,
        .amap-lib-driving-callBtn,
        .amap-copyright,
        .amap-logo {
            display: none !important;
        }
        #panel .amap-call {
            display: none;
        }
        /* --- 搜索栏样式 --- */
        #search-box {
            position: absolute;
            top: 10px;
@@ -16,62 +38,137 @@
            z-index: 100;
            background: #fff;
            padding: 10px;
-            border-radius: 4px;
+            border-radius: 8px;
-            box-shadow: 0 2px 5px rgba(0,0,0,0.3);
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
            display: flex;
            flex-direction: column;
            gap: 8px;
        }
        .input-row { display: flex; gap: 5px; }
        input { flex: 1; padding: 8px; border: 1px solid #eee; border-radius: 4px; }
        button { padding: 0 15px; background: #3366FF; color: #fff; border: none; border-radius: 4px; font-weight: bold; }
-        /* 导航结果面板 (仿高德原生) */
+        .input-row {
            display: flex;
            gap: 8px;
            align-items: center;
        }
        input {
            flex: 1;
            padding: 10px;
            border: 1px solid #eee;
            border-radius: 4px;
            background-color: #f9f9f9;
            font-size: 14px;
        }
        button {
            padding: 0 15px;
            height: 38px;
            background: #3366FF;
            color: #fff;
            border: none;
            border-radius: 4px;
            font-weight: bold;
            font-size: 14px;
        }
        /* --- 导航结果面板 (底部弹出) --- */
        #panel {
            position: fixed;
            bottom: 0;
            left: 0;
            width: 100%;
-            height: 30%; /* 占据底部30% */
+            height: 35%;
            /* 面板高度 */
            background-color: white;
            overflow-y: auto;
-            border-top: 1px solid #ccc;
+            border-top: 1px solid #eee;
            border-top-left-radius: 12px;
            border-top-right-radius: 12px;
            box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1);
            z-index: 99;
-            display: none; /* 默认隐藏，规划成功后显示 */
+            display: none;
            /* 默认隐藏 */
        }
        /* --- 自定义定位按钮样式 --- */
        #location-btn {
            position: fixed;
            right: 10px;
            bottom: 50px;
            /* 默认位置 */
            width: 44px;
            height: 44px;
            background-color: #fff;
            border-radius: 50%;
            /* 圆形更符合现代审美 */
            box-shadow: 0 4px 10px rgba(0, 0, 0, 0.2);
            z-index: 150;
            display: flex;
            align-items: center;
            justify-content: center;
            cursor: pointer;
            transition: bottom 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94);
            /* 平滑动画 */
        }
        #location-btn:active {
            background-color: #f2f2f2;
        }
        #location-btn svg {
            width: 24px;
            height: 24px;
            fill: #555;
        }
        /* --- 关键：当 body 有 panel-active 类时，按钮上移 --- */
        body.panel-active #location-btn {
            bottom: 38%;
            /* 对应 #panel 的 height + 一点间距 */
        }
    </style>
-    <!-- 1. 必须最先配置安全密钥 -->
+    <!-- 1. 配置安全密钥 -->
    <script type="text/javascript">
        window._AMapSecurityConfig = {
            securityJsCode: '0529b72df6bf0c577ff2182cb8b1d970',
        }
    </script>
-    <!-- 2. 加载地图和插件 -->
+    <!-- 2. 加载地图和插件 (去掉了 Geolocation 插件，避免弹窗) -->
-    <!-- 注意：如果你要货车规划，需要在plugin里加上 AMap.TruckDriving -->
+    <script
-    <script src="https://webapi.amap.com/maps?v=2.0&key=2cc1d822e313307fe311c3127a1deeb5&plugin=AMap.MoveAnimation,AMap.Driving,AMap.TruckDriving,AMap.AutoComplete"></script>
+        src="https://webapi.amap.com/maps?v=2.0&key=2cc1d822e313307fe311c3127a1deeb5&plugin=AMap.MoveAnimation,AMap.Driving,AMap.TruckDriving,AMap.AutoComplete,AMap.ToolBar,AMap.Scale">
    </script>
 </head>
 <body>
-<div id="search-box">
+    <div id="search-box">
        <div class="input-row">
-        <input id="startInput" placeholder="起点: 默认使用当前位置" />
+            <input id="startInput" placeholder="起点: 请输入当前地点" />
        </div>
        <div class="input-row">
            <input id="endInput" placeholder="终点: 请输入目的地" />
            <button onclick="startRouteSearch()">路径规划</button>
        </div>
-</div>
+    </div>
-<div id="container"></div>
+    <div id="container"></div>
 <div id="panel"></div>
-<script>
+    <div id="panel"></div>
    <!-- 自定义定位按钮 -->
    <div id="location-btn" onclick="backToLocation()">
        <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
            <path
                d="M512 85.333333a426.666667 426.666667 0 1 0 0 853.333334 426.666667 426.666667 0 0 0 0-853.333334z m0 149.333334a277.333333 277.333333 0 1 1 0 554.666666 277.333333 277.333333 0 0 1 0-554.666666z m0 149.333333a128 128 0 1 0 0 256 128 128 0 0 0 0-256z"
                fill="#666666"></path>
        </svg>
    </div>
    <script>
        var map, marker, driving, truckDriving;
        var currentLat, currentLng;
    // 标记是否使用货车模式 (true: 货车, false: 轿车)
        var isTruckMode = false;
        function initMap() {
@@ -81,21 +178,38 @@
                viewMode: '3D'
            });
            // 通知 Flutter 地图加载完毕
            map.on('complete', function () {
                console.log("JS->: Map is ready.");
                if (window.flutter_inappwebview) {
                    window.flutter_inappwebview.callHandler('mapReady');
                }
            });
            // 添加基础控件
            map.addControl(new AMap.Scale());
            map.addControl(new AMap.ToolBar({
                visible: true,
                position: {
                    top: '200px',
                    right: '10px'
                } // 稍微避开定位按钮
            }));
            // --- 初始化轿车规划 ---
            driving = new AMap.Driving({
                map: map,
-            panel: "panel", // 结果显示在 panel div 中
+                panel: "panel",
                policy: AMap.DrivingPolicy.LEAST_TIME
            });
-        // --- 初始化货车规划 (按需开启) ---
+            // --- 初始化货车规划 ---
-        // 货车需要设置 size (1:微型, 2:轻型, 3:中型, 4:重型)
+            if (AMap.TruckDriving) {
        if(AMap.TruckDriving) {
                truckDriving = new AMap.TruckDriving({
                    map: map,
                    panel: "panel",
                    size: 2,
-                policy: 0, // 0: 躲避拥堵
+                    policy: 0,
                    width: 2.5,
                    height: 2,
                    load: 1,
@@ -104,16 +218,31 @@
                });
            }
-        // --- 输入提示 (自动补全) ---
+            // --- 输入提示 ---
-        new AMap.AutoComplete({ input: "startInput" });
+            new AMap.AutoComplete({
-        new AMap.AutoComplete({ input: "endInput" });
+                input: "startInput"
            });
            new AMap.AutoComplete({
                input: "endInput"
            });
        }
-    // --- 被动接收 Flutter 传来的定位 ---
+        /**
         * 核心功能 1: 接收 Flutter 传来的定位数据
         * Flutter 端调用: webViewController.evaluateJavascript("updateMyLocation(...)")
         */
        function updateMyLocation(lat, lng, angle) {
-        currentLat = lat;
+            var rawLat = parseFloat(lat);
-        currentLng = lng;
+            var rawLng = parseFloat(lng);
-        var position = [lng, lat];
+            var rawAngle = parseFloat(angle);
            var gps = [rawLng, rawLat];
            AMap.convertFrom(gps, 'gps', function (status, result) {
                if (result.info === 'ok') {
                    var mPoint = result.locations[0];
                    currentLng = mPoint.lng;
                    currentLat = mPoint.lat;
                    var position = [currentLng, currentLat];
                    if (!marker) {
                        marker = new AMap.Marker({
@@ -122,89 +251,114 @@
                            icon: "https://webapi.amap.com/images/car.png",
                            offset: new AMap.Pixel(-26, -13),
                            autoRotation: true,
-                angle: angle || 0,
+                            angle: isNaN(rawAngle) ? 0 : rawAngle,
                        });
            // 第一次定位移动中心
                        map.setCenter(position);
                    } else {
-            marker.setPosition(position);
+                        marker.moveTo(position, {
-            if (angle) marker.setAngle(angle);
+                            duration: 1000,
                            autoRotation: true
                        });
                        if (!isNaN(rawAngle)) marker.setAngle(rawAngle);
                    }
                }
            });
        }
        /**
         * 核心功能 2: 点击按钮回到当前位置
         */
        function backToLocation() {
            if (currentLng && currentLat) {
                map.panTo([currentLng, currentLat]);
                map.setZoom(17);
                console.log("JS: 已回到当前位置");
            } else {
                console.log("JS: 暂无定位数据，向 Flutter 请求...");
                if (window.flutter_inappwebview) {
                    window.flutter_inappwebview.callHandler('requestLocation');
                }
            }
        }
-    // --- 核心：规划路线 ---
+        /**
         * 核心功能 3: 路径规划
         */
        function startRouteSearch() {
            // 获取输入框的文字
            var startKw = document.getElementById('startInput').value;
            var endKw = document.getElementById('endInput').value;
-        if(!endKw) {
+            if (!startKw) {
-            console.log("FlutterLog: 终点不能为空");
+                alert("请输入起点");
                return;
            }
-        console.log("FlutterLog: 开始规划..." + (isTruckMode ? "货车" : "轿车"));
+            if (!endKw) {
-
+                alert("请输入终点");
        // 清除之前的路线
        if(driving) driving.clear();
        if(truckDriving) truckDriving.clear();
        // 构造起点和终点参数
        // 高德API Search方法支持点对象数组：[{keyword: '名字', city: '城市'}, {keyword: '...'}]
        var points = [];
        // 1. 处理起点
        if (startKw) {
            // 如果用户输入了文字
            points.push({ keyword: startKw });
        } else {
            // 如果用户没输入，使用当前定位
            if (currentLng && currentLat) {
                // 关键点：当混合使用坐标和关键字时，必须构建 LngLat 对象
                points.push({
                    keyword: '我的位置',
                    location: new AMap.LngLat(currentLng, currentLat)
                });
            } else {
                console.log("FlutterLog: 无定位数据且无输入");
                alert("未获取到定位，请输入起点");
                return;
            }
        }
        // 2. 处理终点
        points.push({ keyword: endKw });
        // 显示底部面板
        document.getElementById('panel').style.display = 'block';
        // 3. 发起请求
        if (isTruckMode && truckDriving) {
            // 货车接口略有不同，需要传入 path 数组
            // truckDriving.search(path, callback)
            // 这里为了简化，我们先演示轿车。货车通常需要具体的经纬度，建议先通过 Geocoder 把 endKw 转成经纬度再传给货车接口
            console.log("FlutterLog: 货车API需要更严格的经纬度参数，建议先使用轿车演示");
        }
        // 默认使用轿车规划 (支持 keyword + location 混合)
        driving.search(points, function(status, result) {
            if (status === 'complete') {
                console.log('FlutterLog: 规划成功');
            } else {
                console.log('FlutterLog: 规划失败: ' + result);
                // 常见错误： "USER_DAILY_QUERY_OVER_LIMIT" (Key额度超限)
                // "INVALID_USER_KEY" (Key错误)
                // "no_data" (地点没找到)
            }
        });
    }
    // --- 绘制自定义路径 (保持原有功能) ---
    function drawCustomRoute(pointsJsonString) {
        // 如果是从Flutter传来的JSON字符串，需要Parse，如果是对象则直接用
        var path = typeof pointsJsonString === 'string' ? JSON.parse(pointsJsonString) : pointsJsonString;
            // 清除旧路线
            if (driving) driving.clear();
            // 收起键盘
            document.getElementById('startInput').blur();
            document.getElementById('endInput').blur();
            // --- 构造路径规划的点 (使用数组方式，更灵活) ---
            var points = [];
            // 1. 处理起点逻辑
            // 如果输入框是空的，或者写着 "我的位置"，则使用 GPS 坐标
            if (!startKw || startKw === '我的位置') {
                if (!currentLng || !currentLat) {
                    // 如果还没获取到定位
                    if (window.flutter_inappwebview) {
                        window.flutter_inappwebview.callHandler('requestLocation');
                    }
                    alert("正在获取定位，请稍后...");
                    return;
                }
                // 使用精准坐标对象 (避免高德去猜 '我的位置' 关键词)
                points.push({
                    keyword: '我的位置', // 用于显示的名字
                    location: new AMap.LngLat(currentLng, currentLat) // 实际导航用的坐标
                });
            } else {
                // 如果用户手动输入了地点 (例如 "北京南站")
                // 直接存入关键词，让高德自己去搜
                points.push({
                    keyword: startKw
                });
            }
            // 2. 处理终点逻辑 (通常是关键词)
            points.push({
                keyword: endKw
            });
            // 3. 发起搜索
            // points 数组里现在是一个起点对象和一个终点对象
            driving.search(points, function (status, result) {
                if (status === 'complete') {
                    console.log('JS: 规划成功');
                    var panel = document.getElementById('panel');
                    panel.style.display = 'block';
                    document.body.classList.add('panel-active');
                } else {
                    console.log('JS: 规划失败', result);
                    alert("规划失败，请检查起终点名称");
                }
            });
        }
        // 辅助功能：手动绘制路线 (Flutter 可能用到)
        function drawCustomRoute(pointsJsonString) {
            var path = typeof pointsJsonString === 'string' ? JSON.parse(pointsJsonString) : pointsJsonString;
            if (driving) driving.clear();
            var polyline = new AMap.Polyline({
                path: path,
                isOutline: true,
@@ -219,6 +373,7 @@
        }
        window.onload = initMap;
-</script>
+    </script>
 </body>
 </html>
--- a/ln_jq_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/ln_jq_app/ios/Runner.xcodeproj/project.pbxproj
@@ -294,10 +294,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			inputPaths = (
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -370,10 +374,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			inputPaths = (
 			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -487,7 +495,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 2228B9MS38;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -495,7 +503,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lnkj.lnJqApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -674,7 +682,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 2228B9MS38;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -682,7 +690,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lnkj.lnJqApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -698,7 +706,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 2228B9MS38;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -706,7 +714,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lnkj.lnJqApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,122 @@
 {
  "images" : [
    {
      "size" : "20x20",
      "idiom" : "iphone",
      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom" : "iphone",
      "scale" : "2x",
      "size" : "20x20"
    },
    {
      "size" : "20x20",
      "idiom" : "iphone",
      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "idiom" : "iphone",
      "scale" : "3x",
      "size" : "20x20"
    },
    {
      "size" : "29x29",
      "idiom" : "iphone",
      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom" : "iphone",
      "scale" : "1x",
      "size" : "29x29"
    },
    {
      "size" : "29x29",
      "idiom" : "iphone",
      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom" : "iphone",
      "scale" : "2x",
      "size" : "29x29"
    },
    {
      "size" : "29x29",
      "idiom" : "iphone",
      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
+      "idiom" : "iphone",
      "scale" : "3x",
      "size" : "29x29"
    },
    {
      "size" : "40x40",
      "idiom" : "iphone",
      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "idiom" : "iphone",
      "scale" : "2x",
      "size" : "40x40"
    },
    {
      "size" : "40x40",
      "idiom" : "iphone",
      "filename" : "Icon-App-40x40@3x.png",
      "scale" : "3x"
    },
    {
      "size" : "60x60",
      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
+      "scale" : "3x",
-      "scale" : "2x"
+      "size" : "40x40"
    },
    {
-      "size" : "60x60",
+      "filename" : "icon 1.png",
      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
+      "scale" : "2x",
-      "scale" : "3x"
+      "size" : "60x60"
    },
    {
      "filename" : "icon.png",
      "idiom" : "iphone",
      "scale" : "3x",
      "size" : "60x60"
    },
    {
      "size" : "20x20",
      "idiom" : "ipad",
      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
      "scale" : "1x",
      "size" : "20x20"
    },
    {
      "size" : "20x20",
      "idiom" : "ipad",
      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
      "scale" : "2x",
      "size" : "20x20"
    },
    {
      "size" : "29x29",
      "idiom" : "ipad",
      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
      "scale" : "1x",
      "size" : "29x29"
    },
    {
      "size" : "29x29",
      "idiom" : "ipad",
      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
      "scale" : "2x",
      "size" : "29x29"
    },
    {
      "size" : "40x40",
      "idiom" : "ipad",
      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
      "scale" : "1x",
      "size" : "40x40"
    },
    {
      "size" : "40x40",
      "idiom" : "ipad",
      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
      "scale" : "2x",
      "size" : "40x40"
    },
    {
      "size" : "76x76",
      "idiom" : "ipad",
      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
      "scale" : "1x",
      "size" : "76x76"
    },
    {
      "size" : "76x76",
      "idiom" : "ipad",
      "filename" : "Icon-App-76x76@2x.png",
      "scale" : "2x"
    },
    {
      "size" : "83.5x83.5",
      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale" : "2x",
-      "scale" : "2x"
+      "size" : "76x76"
    },
    {
      "filename" : "Icon-App-83.5x83.5@2x.png",
      "idiom" : "ipad",
      "scale" : "2x",
      "size" : "83.5x83.5"
    },
    {
      "size" : "1024x1024",
      "idiom" : "ios-marketing",
      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "idiom" : "ios-marketing",
      "scale" : "1x",
      "size" : "1024x1024"
    }
  ],
  "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
  }
 }
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon
--- a/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon.png
+++ b/ln_jq_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon.png
--- a/ln_jq_app/lib/main.dart
+++ b/ln_jq_app/lib/main.dart
@@ -14,7 +14,7 @@ void main() async {
  WidgetsFlutterBinding.ensureInitialized();
  WidgetsBinding widgetsBinding = await init(
-    isDebug: true,
+    isDebug: false,
    logTag: '小羚羚',
    supportedLocales: [Locale('zh', 'CN')],
  );
--- a/ln_jq_app/lib/pages/b_page/base_widgets/view.dart
+++ b/ln_jq_app/lib/pages/b_page/base_widgets/view.dart
@@ -45,8 +45,6 @@ class B_BaseWidgetsPage extends GetView<B_BaseWidgetsController> {
          label: '加氢预约',
          icon: AntdIcon.orderedlist,
          selectedIcon: AntdIcon.calendar_fill,
          badge: '99+',
          dot: true,
        ),
        NavigationItemModel(
          label: '站点信息',
--- a/ln_jq_app/lib/pages/b_page/reservation/view.dart
+++ b/ln_jq_app/lib/pages/b_page/reservation/view.dart
@@ -71,7 +71,7 @@ class ReservationPage extends GetView<ReservationController> {
            child: Row(
              mainAxisAlignment: MainAxisAlignment.spaceAround,
              children: [
-                _buildHeaderStat(controller.costPrice, '氢气价格'),
+                _buildHeaderStat(controller.customerPrice, '氢气价格'),
                _buildHeaderStat(controller.timeStr, '营业时间'),
                _buildHeaderStat('98%', '设备状态'),
              ],
@@ -119,7 +119,7 @@ class ReservationPage extends GetView<ReservationController> {
            // --- 价格信息 ---
            _buildSectionTitle('价格信息'),
-            _buildDisplayField(label: '氢气价格 (元/kg)', value: controller.costPrice),
+            // _buildDisplayField(label: '氢气价格 (元/kg)', value: controller.costPrice),
            _buildDisplayField(label: '官方价格 (元/kg)', value: controller.customerPrice),
            const SizedBox(height: 16),
--- a/ln_jq_app/lib/pages/c_page/base_widgets/view.dart
+++ b/ln_jq_app/lib/pages/c_page/base_widgets/view.dart
@@ -51,14 +51,11 @@ class BaseWidgetsPage extends GetView<BaseWidgetsController> {
          label: '地图',
          icon: AntdIcon.location,
          selectedIcon: AntdIcon.location_fill,
          dot: false,
        ),
        NavigationItemModel(
          label: '加氢预约',
          icon: AntdIcon.orderedlist,
          selectedIcon: AntdIcon.calendar_fill,
          badge: '99+',
          dot: true,
        ),
        NavigationItemModel(
          label: '车辆信息',
--- a/ln_jq_app/lib/pages/c_page/car_info/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/controller.dart
@@ -2,6 +2,7 @@ import 'package:get/get.dart';
 import 'package:getx_scaffold/getx_scaffold.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/pages/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
 import 'certificate_viewer_page.dart';
@@ -27,6 +28,33 @@ class CarInfoController extends GetxController with BaseControllerMixin {
    super.onInit();
    getUserBindCarInfo();
  }
  @override
  void onReady() {
    super.onReady();
    // 如果未绑定车辆，且本次会话尚未提示过，则弹出提示
    if (!StorageService.to.hasShownBindVehicleDialog) {
      Future.delayed(const Duration(milliseconds: 500), () {
        DialogX.to.showConfirmDialog(
          title: '当前尚未绑定车辆',
          confirmText: "去绑定",
          cancelText: "稍后",
          onConfirm: () {
            doQrCode();
          },
        );
        // 标记为已显示，本次会话不再提示
        StorageService.to.markBindVehicleDialogAsShown();
      });
    }
  }
  void doQrCode() async {
    var scanResult = await Get.to(() => const QrCodePage());
    if (scanResult == true) {
      getUserBindCarInfo();
      refreshAppui();
    }
  }
  void getUserBindCarInfo() async {
    if (StorageService.to.hasVehicleInfo) {
--- a/ln_jq_app/lib/pages/c_page/car_info/view.dart
+++ b/ln_jq_app/lib/pages/c_page/car_info/view.dart
@@ -173,12 +173,7 @@ class CarInfoPage extends GetView<CarInfoController> {
        isButton
            ? GestureDetector(
                onTap: () async {
-                  //判断是否绑定成功
+                  controller.doQrCode();
                  var scanResult = await Get.to(() => const QrCodePage());
                  if (scanResult == true) {
                    controller.getUserBindCarInfo();
                    refreshAppui();
                  }
                },
                child: Container(
                  margin: EdgeInsetsGeometry.only(left: 10.w),
--- a/ln_jq_app/lib/pages/c_page/map/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/map/controller.dart
@@ -4,124 +4,133 @@ import 'dart:convert';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
-import 'package:permission_handler/permission_handler.dart'; // 确保引用这个做权限请求
+import 'package:permission_handler/permission_handler.dart';
-class MapController extends GetxController with BaseControllerMixin {
+class MapController extends GetxController with BaseControllerMixin ,WidgetsBindingObserver{
  @override
  String get builderId => 'map';
  InAppWebViewController? webViewController;
  StreamSubscription<Position>? positionStream;
  final RxBool isLocationPermissionGranted = false.obs;
-  // 缓存最后一次的位置，防止 WebView 加载慢于定位
+  // --- 状态标志 ---
  final RxBool isLocationPermissionGranted = false.obs;
  final RxBool isMapReady = false.obs; // 跟踪地图是否加载完成
  Position? _lastKnownPosition;
  // 是否已经初始化过地图中心
  bool _hasInitializedMapCenter = false;
  @override
  void onInit() {
    super.onInit();
    WidgetsBinding.instance.addObserver(this); // 注册监听
    requestLocationPermission();
  }
  @override
  void onClose() {
    WidgetsBinding.instance.removeObserver(this); // 移除监听
    positionStream?.cancel();
    super.onClose();
  }
-  // 请求权限
+  @override
-  void requestLocationPermission() async {
+  void didChangeAppLifecycleState(AppLifecycleState state) {
-    var status = await Permission.locationWhenInUse.request();
+    if (state == AppLifecycleState.resumed) {
      // 回到前台，如果之前有权限且开启过，恢复定位
      if(isLocationPermissionGranted.value) _startLocationTracking();
    } else if (state == AppLifecycleState.paused) {
      // 切到后台，取消定位流
      positionStream?.cancel();
    }
  }
-    print("权限状态: $status"); // 在控制台看这个输出
+  /// WebView 创建完成时调用
-
+  void onWebViewCreated(InAppWebViewController controller) {
-    if (status.isGranted) {
+    webViewController = controller;
-      isLocationPermissionGranted.value = true;
+    // 添加 JS Handler 来监听来自网页的 'mapReady' 事件
-      showToast('定位权限已获取');
+    controller.addJavaScriptHandler(
      handlerName: 'mapReady',
      callback: (args) {
        print("Flutter<-JS: Map is ready, starting location tracking.");
        isMapReady.value = true;
        // 地图就绪后，如果已有权限和缓存的定位，则开始定位
        if (isLocationPermissionGranted.value) {
          _startLocationTracking();
        }
-    else if (status.isPermanentlyDenied) {
+      },
-      // iOS 特性：如果你之前点过“不允许”，之后再请求都会直接进这里
+    );
      isLocationPermissionGranted.value = false;
      // 引导用户去设置页面开启
      openAppSettings();
    }
    else {
      // 第一次被拒绝，或者其他情况
      isLocationPermissionGranted.value = false;
      showErrorToast('需要定位权限才能显示您的位置');
  }
-  }
+  /// 优化后的权限请求函数
-
+  void requestLocationPermission() async {
  // 开启定位监听
  void _startLocationTracking() async {
    // 再次检查服务是否开启
    bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
    if (!serviceEnabled) {
      showErrorToast('请开启手机的定位服务');
      return;
    }
    var status = await Permission.locationWhenInUse.request();
    switch (status) {
      case PermissionStatus.granted:
        isLocationPermissionGranted.value = true;
        // 权限已获取，如果地图也已就绪，则开始定位
        if (isMapReady.value) {
          _startLocationTracking();
        }
        break;
      case PermissionStatus.denied:
        showErrorToast('需要定位权限才能显示您的位置');
        break;
      case PermissionStatus.permanentlyDenied:
        showErrorToast('定位权限已被永久拒绝，请到设置中手动开启');
        openAppSettings();
        break;
      default:
        showErrorToast('获取定位权限时发生未知错误');
        break;
    }
  }
  /// 开始定位监听 (不再需要 delay)
  void _startLocationTracking() async {
    if (!isLocationPermissionGranted.value ||
        !await Geolocator.isLocationServiceEnabled()) {
      return;
    }
    const LocationSettings locationSettings = LocationSettings(
      accuracy: LocationAccuracy.high,
-      distanceFilter: 50, // 移动更新范围
+      distanceFilter: 10,
    );
-    // 先获取一次当前位置，用于快速初始化中心
+    // 立即获取一次当前位置，用于快速初始化
-    Geolocator.getCurrentPosition().then((position) {
+    try {
      Position position = await Geolocator.getCurrentPosition();
      _lastKnownPosition = position;
-      _syncLocationToMap(position, isInit: true);
+      _syncLocationToMap(position);
-    });
+    } catch (e) {
      print("Error getting initial position: $e");
    }
-    // 持续监听
+    // 持续监听位置变化
    positionStream?.cancel(); // 先取消旧的监听
    positionStream = Geolocator.getPositionStream(locationSettings: locationSettings)
        .listen((Position position) {
          _lastKnownPosition = position;
-      _syncLocationToMap(position, isInit: false);
+          _syncLocationToMap(position);
        });
  }
-  // 将位置同步给 JS
+  // 将 Flutter 的定位数据同步给 JS
-  void _syncLocationToMap(Position position, {required bool isInit}) {
+  void _syncLocationToMap(Position position) {
-    if (webViewController == null) return;
+    if (webViewController == null || !isMapReady.value) return;
    // 只有当 heading 有效且大于 0 时才传给 JS，否则传 null，让 JS 保持上一次的角度
    String headingVal = (position.heading > 0) ? "${position.heading}" : "null";
    // 如果是第一次定位，或者 WebView 刚加载完且从未设置过中心
    if (isInit || !_hasInitializedMapCenter) {
    webViewController!.evaluateJavascript(
-          source: "initLocation(${position.latitude}, ${position.longitude})"
+      source:
          "updateMyLocation(${position.latitude}, ${position.longitude}, ${position.heading})",
    );
      _hasInitializedMapCenter = true;
    } else {
      // 后续只更新图标位置，不强行移动地图中心（防止用户拖动地图看别处时被拉回）
      webViewController!.evaluateJavascript(
          source: "updateMyLocation(${position.latitude}, ${position.longitude}, ${position.heading})"
      );
    }
  }
  // WebView 加载完成回调
  void onWebViewLoadStop() {
    // 页面加载完了，如果我们已经拿到了定位数据，立刻设置地图中心
    if (_lastKnownPosition != null) {
      _syncLocationToMap(_lastKnownPosition!, isInit: true);
    }
    // 如果业务需要，可以在这里加载默认的推荐路径
    // loadRecommendedRoute();
  }
  // 模拟：获取你的后台推荐路径
  void loadRecommendedRoute() {
    // 示例数据
    List<List<double>> routePoints = [
      [116.397428, 39.90923],
      [116.398000, 39.90950],
      [116.400000, 39.91000],
    ];
    String jsonPoints = jsonEncode(routePoints);
    webViewController?.evaluateJavascript(source: "drawCustomRoute($jsonPoints)");
  }
 }
--- a/ln_jq_app/lib/pages/c_page/map/view.dart
+++ b/ln_jq_app/lib/pages/c_page/map/view.dart
@@ -1,3 +1,4 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:getx_scaffold/getx_scaffold.dart';
@@ -10,23 +11,21 @@ class MapPage extends GetView<MapController> {
    return Stack(
      children: [
        InAppWebView(
          // 确保 pubspec.yaml 中声明了 assets/html/map.html
          initialFile: 'assets/html/map.html',
          initialSettings: InAppWebViewSettings(
            isInspectable: true,
-            geolocationEnabled: true,
+            // 既然完全依赖 Flutter 定位，建议把 WebView 的定位彻底关掉，防止 JS 意外触发
-            // 允许 JS 弹窗 (Alert) 用于调试
+            geolocationEnabled: false,
-            javaScriptCanOpenWindowsAutomatically: true,
+            javaScriptEnabled: true,
            // Android 混合开发推荐配置
            useHybridComposition: true, // 提升地图渲染性能（重要）
            allowFileAccessFromFileURLs: true, // 允许本地 html 访问本地资源
            allowUniversalAccessFromFileURLs: true,
          ),
-          onWebViewCreated: (c) {
+          // 当 WebView 创建完成后，将 controller 实例传递给我们的 MapController
-            controller.webViewController = c;
+          onWebViewCreated: controller.onWebViewCreated,
          },
          onLoadStop: (c, url) {
            // 通知 Controller 页面加载完毕
            controller.onWebViewLoadStop();
          },
          onConsoleMessage: (controller, consoleMessage) {
-            // 方便在 Flutter 控制台看 JS 日志
+            // 方便在 Flutter 控制台查看来自 JS 的日志
            print("JS Log: ${consoleMessage.message}");
          },
        ),
--- a/ln_jq_app/lib/pages/c_page/reservation/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/controller.dart
@@ -9,6 +9,7 @@ import 'package:ln_jq_app/common/model/base_model.dart';
 import 'package:ln_jq_app/common/model/station_model.dart';
 import 'package:ln_jq_app/common/model/vehicle_info.dart';
 import 'package:ln_jq_app/pages/b_page/site/controller.dart';
 import 'package:ln_jq_app/pages/qr_code/view.dart';
 import 'package:ln_jq_app/storage_service.dart';
 import '../../../common/styles/theme.dart';
@@ -118,68 +119,55 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
  }
  void pickTime(BuildContext context, bool isStartTime) {
-    //  确定当前操作的时间和初始值
+    // 1. 确定当前操作的时间和初始值
    TimeOfDay initialTime = isStartTime ? startTime.value : endTime.value;
    DateTime now = DateTime.now();
-    // 计算最小可选时间
+    // 2. 准备小时和分钟的数据源
-    DateTime? minimumDateTime; // 默认为 null，即可选任意时间
+    List<int> hours = List<int>.generate(24, (index) => index);
    List<int> minutes = [0, 30];
-    // 获取当前选择的日期（年月日）
+    // 3. 计算初始选中的索引
-    final selectedDay = DateTime(
+    int initialHour = initialTime.hour;
-      selectedDate.value.year,
+    // 将初始分钟校准到0或30，并找到对应的索引
-      selectedDate.value.month,
+    int initialMinute = initialTime.minute;
-      selectedDate.value.day,
+    int minuteIndex = initialMinute < 30 ? 0 : 1;
-    );
+    initialMinute = minutes[minuteIndex]; // 校准后的分钟
-    // 获取今天的日期（年月日）
+    // 如果校准后导致时间早于当前时间，需要向上调整
    final selectedDay = DateTime(selectedDate.value.year, selectedDate.value.month, selectedDate.value.day);
    final today = DateTime(now.year, now.month, now.day);
    if (isStartTime) {
      // 如果是选择开始时间并且日期是 今天
    if (selectedDay.isAtSameMomentAs(today)) {
-        minimumDateTime = now; // 最小可选时间就是现在
+      if (initialHour < now.hour || (initialHour == now.hour && initialMinute < now.minute)) {
-      }
+        initialHour = now.hour;
        if (now.minute > 30) {
          // 如果当前分钟>30, 则进位到下一小时的0分
          initialHour = (now.hour + 1) % 24;
          initialMinute = 0;
        } else {
-      // 如果是选择结束时间
+          // 否则，取30分
-      // 将开始时间转换为 DateTime 对象
+          initialMinute = 30;
-      final startDateTime = DateTime(
+        }
        selectedDate.value.year,
        selectedDate.value.month,
        selectedDate.value.day,
        startTime.value.hour,
        startTime.value.minute,
      );
      // 结束时间的最小值必须晚于开始时间
      minimumDateTime = startDateTime;
      // 如果日期是今天，并且开始时间早于现在，那么结束时间的最小值也应该是现在
      if (selectedDay.isAtSameMomentAs(today) && startDateTime.isBefore(now)) {
        minimumDateTime = now;
      }
    }
-    // 初始显示时间
+    // 重新获取校准后的索引
-    DateTime initialDateTime = DateTime(
+    minuteIndex = minutes.indexOf(initialMinute);
      selectedDate.value.year,
      selectedDate.value.month,
      selectedDate.value.day,
      initialTime.hour,
      initialTime.minute,
    );
    // 确保初始时间不早于最小时间
    if (minimumDateTime != null && initialDateTime.isBefore(minimumDateTime)) {
      initialDateTime = minimumDateTime;
    }
-    DateTime tempTime = initialDateTime;
+    // 4. 创建 FixedExtentScrollController 来控制滚轮的初始位置
    final FixedExtentScrollController hourController =
    FixedExtentScrollController(initialItem: hours.indexOf(initialHour));
    final FixedExtentScrollController minuteController =
    FixedExtentScrollController(initialItem: minuteIndex);
    // 5. 存储临时选择的值
    int tempHour = initialHour;
    int tempMinute = initialMinute;
    Get.bottomSheet(
      Container(
        height: 300,
        padding: const EdgeInsets.only(top: 6.0),
        decoration: const BoxDecoration(
          color: Colors.white,
          borderRadius: BorderRadius.only(
@@ -196,75 +184,55 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
                children: [
                  CupertinoButton(
                    onPressed: () => Get.back(),
-                    child: const Text(
+                    child: const Text('取消', style: TextStyle(color: CupertinoColors.systemGrey)),
                      '取消',
                      style: TextStyle(color: CupertinoColors.systemGrey),
                    ),
                  ),
                  CupertinoButton(
                    onPressed: () {
-                      final pickedTempTime = TimeOfDay.fromDateTime(tempTime);
+                      final pickedTempTime = TimeOfDay(hour: tempHour, minute: tempMinute);
                      final now = DateTime.now();
-                      // 验证条件1：不能选择过去的时间
+                      // --- 合并和简化校验逻辑 ---
-                      // 这个验证只在选择【今天】的【开始时间】或【结束时间】时有意义
+                      final selectedDateTime = DateTime(
                      final selectedDay = DateTime(
                        selectedDate.value.year,
                        selectedDate.value.month,
                        selectedDate.value.day,
-                      );
+                        pickedTempTime.hour,
-                      final today = DateTime(
+                        pickedTempTime.minute,
                        DateTime.now().year,
                        DateTime.now().month,
                        DateTime.now().day,
                      );
-                      if (selectedDay.isAtSameMomentAs(today) &&
+                      // 验证1: 不能选择过去的时间（留出一分钟缓冲）
-                          tempTime.isBefore(DateTime.now())) {
+                      if (selectedDateTime.isBefore(now.subtract(const Duration(minutes: 1)))) {
                        showToast('不能选择过去的时间');
-                        return; // 中断执行，不关闭弹窗
+                        return;
                      }
-                      //结束时间必须晚于开始时间
+                      // 验证2: 结束时间必须晚于开始时间
                      if (isStartTime) {
                        // 已有的结束时间 比较
                        final pickedStartInMinutes =
                            pickedTempTime.hour * 60 + pickedTempTime.minute;
                        final endInMinutes =
                            endTime.value.hour * 60 + endTime.value.minute;
                        if (pickedStartInMinutes >= endInMinutes) {
                          // 整结束时间
                        startTime.value = pickedTempTime;
-                          final newEndDateTime = tempTime.add(
+                        final startInMinutes = pickedTempTime.hour * 60 + pickedTempTime.minute;
-                            const Duration(minutes: 30),
+                        final endInMinutes = endTime.value.hour * 60 + endTime.value.minute;
-                          );
+
                        // 如果新的开始时间大于等于结束时间，自动将结束时间设置为开始时间+30分钟
                        if (startInMinutes >= endInMinutes) {
                          final newEndDateTime = selectedDateTime.add(const Duration(minutes: 30));
                          endTime.value = TimeOfDay.fromDateTime(newEndDateTime);
                        } else {
                          //设置开始时间
                          startTime.value = pickedTempTime;
                        }
-                      } else {
+                      } else { // 正在设置结束时间
-                        // 如果当前正在设置结束时间，我们来和已有的开始时间比较
+                        final startInMinutes = startTime.value.hour * 60 + startTime.value.minute;
-                        final pickedEndInMinutes =
+                        final endInMinutes = pickedTempTime.hour * 60 + pickedTempTime.minute;
                            pickedTempTime.hour * 60 + pickedTempTime.minute;
                        final startInMinutes =
                            startTime.value.hour * 60 + startTime.value.minute;
-                        if (pickedEndInMinutes <= startInMinutes) {
+                        if (endInMinutes <= startInMinutes) {
                          showToast('结束时间必须晚于开始时间');
-                          return; // 中断执行，不关闭弹窗
+                          return;
-                        } else {
+                        }
                        endTime.value = pickedTempTime;
                      }
-                      }
+
                      Get.back();
                    },
                    child: const Text(
                      '确认',
-                      style: TextStyle(
+                      style: TextStyle(color: AppTheme.themeColor, fontWeight: FontWeight.bold),
                        color: AppTheme.themeColor,
                        fontWeight: FontWeight.bold,
                      ),
                    ),
                  ),
                ],
@@ -272,14 +240,36 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
            ),
            const Divider(height: 1, color: Color(0xFFE5E5E5)),
            Expanded(
-              child: CupertinoDatePicker(
+              child: Row(
-                mode: CupertinoDatePickerMode.time,
+                mainAxisAlignment: MainAxisAlignment.center,
-                use24hFormat: true,
+                children: [
-                initialDateTime: initialDateTime,
+                  // 小时选择器
-                minimumDate: minimumDateTime,
+                  Expanded(
-                onDateTimeChanged: (DateTime newTime) {
+                    child: CupertinoPicker(
-                  tempTime = newTime;
+                      scrollController: hourController,
                      itemExtent: 32.0,
                      onSelectedItemChanged: (index) {
                        tempHour = hours[index];
                      },
                      children: hours
                          .map((h) => Center(child: Text(h.toString().padLeft(2, '0'))))
                          .toList(),
                    ),
                  ),
                  // 分钟选择器
                  Expanded(
                    child: CupertinoPicker(
                      scrollController: minuteController,
                      itemExtent: 32.0,
                      onSelectedItemChanged: (index) {
                        tempMinute = minutes[index];
                      },
                      children: minutes
                          .map((m) => Center(child: Text(m.toString().padLeft(2, '0'))))
                          .toList(),
                    ),
                  ),
                ],
              ),
            ),
          ],
@@ -289,6 +279,11 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    );
  }
  // 用于存储上一次成功预约的信息
  ReservationModel? lastSuccessfulReservation;
  /// 提交预约
  void submitReservation() async {
    if (plateNumber.isEmpty) {
@@ -300,10 +295,30 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      showToast("请输入需要预约的氢量");
      return;
    }
    double ampuntDouble = (double.tryParse(ampuntStr) ?? 0.0);
    if (ampuntDouble == 0) {
      showToast("请输入需要预约的氢量");
      return;
    }
    if (ampuntDouble > (double.tryParse(difference) ?? 0.0)) {
      showToast('当前最大可预约氢量为${difference}(KG)');
      return;
    }
    if (selectedStationId.value == null || selectedStationId.value!.isEmpty) {
      showToast("请先选择加氢站");
      return;
    }
    final dateStr = formattedDate;
    final startTimeStr = '$dateStr ${formattedStartTime}:00';
    if (lastSuccessfulReservation != null &&
        lastSuccessfulReservation!.id == selectedStationId.value &&
        lastSuccessfulReservation!.startTime == startTimeStr) {
      showToast("请勿重复提交相同的预约");
      return;
    }
    // 将选择的日期和时间组合成一个完整的 DateTime 对象
    final reservationStartDateTime = DateTime(
      selectedDate.value.year,
@@ -353,6 +368,32 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      var result = BaseModel.fromJson(responseData.data);
      if (result.code == 0) {
        showSuccessToast("预约成功");
        // 预约成功后，保存当前预约信息
        lastSuccessfulReservation = ReservationModel(
          id: selectedStationId.value!,
          hydAmount: ampuntStr,
          startTime: startTimeStr,
          endTime: endTimeStr,
          stationName: selectedStation.name,
          plateNumber: '',
          amount: '',
          time: '',
          contactPerson: '',
          contactPhone: '',
          contacts: '',
          phone: '',
          date: '',
          state: '',
          stateName: '',
          addStatus: '',
          addStatusName: '',
        );
        //打开预约列表
        Future.delayed(const Duration(milliseconds: 800), () {
          getReservationList();
        });
      } else {
        showErrorToast(result.message);
      }
@@ -575,12 +616,14 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
    );
  }
  String leftHydrogen = "0";
  String workEfficiency = "0";
  String fillingWeight = "0";
  String fillingTimes = "0";
  String plateNumber = "";
  String vin = "";
  String leftHydrogen = "0";
  num maxHydrogen = 0;
  String difference = "";
  @override
  bool get listenLifecycleEvent => true;
@@ -601,11 +644,20 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      plateNumber = bean.plateNumber;
      vin = bean.vin;
      plateNumberController = TextEditingController(text: plateNumber);
      maxHydrogen = bean.maxHydrogen;
      getCatinfo();
      getJqinfo();
    }
  }
  void doQrCode() async {
    var scanResult = await Get.to(() => const QrCodePage());
    if (scanResult == true) {
      getUserBindCarInfo();
      refreshAppui();
    }
  }
  void getJqinfo() async {
    try {
      HttpService.to.setBaseUrl(AppTheme.test_service_url);
@@ -651,6 +703,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      leftHydrogen = result.data["leftHydrogen"].toString();
      workEfficiency = result.data["workEfficiency"].toString();
      final leftHydrogenNum = double.tryParse(leftHydrogen) ?? 0.0;
      difference = (maxHydrogen - leftHydrogenNum).toStringAsFixed(2);
      updateUi();
    } catch (e) {
    } finally {
@@ -707,6 +762,22 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
      dismissLoading();
      HttpService.to.setBaseUrl(AppTheme.test_service_url);
      HttpService.to.dio.options.headers = originalHeaders;
      // 如果未绑定车辆，且本次会话尚未提示过，则弹出提示
      if (!StorageService.to.hasShownBindVehicleDialog) {
        Future.delayed(const Duration(milliseconds: 500), () {
          DialogX.to.showConfirmDialog(
            title: '当前尚未绑定车辆',
            confirmText: "去绑定",
            cancelText: "稍后",
            onConfirm: () {
              doQrCode();
            },
          );
          // 标记为已显示，本次会话不再提示
          StorageService.to.markBindVehicleDialogAsShown();
        });
      }
    }
  }
--- a/ln_jq_app/lib/pages/c_page/reservation/view.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/view.dart
@@ -201,12 +201,7 @@ class ReservationPage extends GetView<C_ReservationController> {
        isButton
            ? GestureDetector(
                onTap: () async {
-                  //判断是否绑定成功
+                  controller.doQrCode();
                  var scanResult = await Get.to(() => const QrCodePage());
                  if (scanResult == true) {
                    controller.getUserBindCarInfo();
                    refreshAppui();
                  }
                },
                child: Container(
                  margin: EdgeInsetsGeometry.only(left: 10.w),
@@ -275,9 +270,9 @@ class ReservationPage extends GetView<C_ReservationController> {
                onTap: () => controller.pickTime(context, false),
              ),
              _buildTextField(
-                label: '预约氢量(kg)',
+                label: '预约氢量(KG)',
                controller: controller.amountController,
-                hint: '请输入氢量(kg)',
+                hint: '当前最大可预约氢量${controller.difference}(KG)',
                keyboardType: TextInputType.number,
              ),
              _buildTextField(
--- a/ln_jq_app/lib/storage_service.dart
+++ b/ln_jq_app/lib/storage_service.dart
@@ -20,9 +20,10 @@ class StorageService extends GetxService {
  static const String _phoneKey = 'user_phone';
  static const String _idCardKey = 'user_id_card';
  static const String _vehicleInfoKey = 'vehicle_info';
  // 加氢站登录凭证的键名
  static const String _stationAccountKey = 'station_account';
  static const String _stationPasswordKey = 'station_password';
  // 新增：用于标记“绑定车辆”弹窗是否已在本会话中显示过
  static const String _bindDialogShownKey = 'bind_vehicle_dialog_shown';
  static StorageService get to => Get.find();
@@ -41,10 +42,13 @@ class StorageService extends GetxService {
  String? get idCard => _box.read<String?>(_idCardKey);
  bool get hasVehicleInfo => _box.hasData(_vehicleInfoKey);
  // 记住密码：获取加氢站账号和密码
  String? get stationAccount => _box.read<String?>(_stationAccountKey);
  String? get stationPassword => _box.read<String?>(_stationPasswordKey);
  // 新增：获取“绑定车辆”弹窗是否已显示的标志
  bool get hasShownBindVehicleDialog => _box.read<bool>(_bindDialogShownKey) ?? false;
  VehicleInfo? get vehicleInfo {
    final vehicleJson = _box.read<String?>(_vehicleInfoKey);
    if (vehicleJson != null) {
@@ -84,17 +88,21 @@ class StorageService extends GetxService {
    await _box.write(_vehicleInfoKey, vehicleInfoToJson(data));
  }
  // 保存加氢站登录凭证
  Future<void> saveStationCredentials(String account, String password) async {
    await _box.write(_stationAccountKey, account);
    await _box.write(_stationPasswordKey, password);
  }
  // 新增：标记“绑定车辆”弹窗已显示
  Future<void> markBindVehicleDialogAsShown() async {
    await _box.write(_bindDialogShownKey, true);
  }
  Future<void> clearVehicleInfo() async {
    await _box.remove(_vehicleInfoKey);
  }
  // 清除加氢站登录凭证
  Future<void> clearStationCredentials() async {
    await _box.remove(_stationAccountKey);
    await _box.remove(_stationPasswordKey);
@@ -108,6 +116,7 @@ class StorageService extends GetxService {
    await _box.remove(_phoneKey);
    await _box.remove(_idCardKey);
    await clearVehicleInfo();
-    // 注意：登出时我们不清除“记住的密码”，以便下次用户登录时仍然可以回填
+    // 登出时，清除“绑定车辆”弹窗的显示记录，以便下次登录时可以再次弹出
    await _box.remove(_bindDialogShownKey);
  }
 }
--- a/ln_jq_app/pubspec.yaml
+++ b/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.0.0+1
+version: 1.1.0+1
 environment:
  sdk: ^3.9.0
Author	SHA1	Message	Date
userGyl	93a39e440a	v1.1.0	2025-11-28 14:48:03 +08:00
userGyl	ec1c554eb3	Merge branch 'dev' v1.1.0	2025-11-28 10:12:44 +08:00
userGyl	d3b7ab8fbe	先限制输入起点	2025-11-28 10:09:18 +08:00
userGyl	5609594439	地图修改	2025-11-27 17:21:07 +08:00
userGyl	da4149ec60	调整地图样式	2025-11-27 15:25:58 +08:00
userGyl	aa30d13b91	更新插件	2025-11-27 09:30:52 +08:00
userGyl	b854d295f9	调整预约时间格式	2025-11-26 17:33:04 +08:00
userGyl	26a24efeb8	限制条件	2025-11-26 13:44:00 +08:00
userGyl	496d77482d	logo 预约弹出列表车辆无绑定弹窗	2025-11-26 09:20:42 +08:00