new

selfdrive/frogpilot/fleetmanager/fleet_manager.py

@@ -586,56 +586,22 @@ def carinfo():
         traceback.print_exc()
         return render_template("carinfo.html", car_info={"error": f"Error getting vehicle information: {str(e)}"})
 
-@app.route("/amap_addr", methods=["GET", "POST"])
-def amap_addr():
-    # 直接使用硬编码的 key
-    amap_key = "faf2f8ab406a8da1231ef7e10d501b65"
-    amap_key_2 = "fc2724b3c96a7f244b2211f05c5264be"
-
-    # 获取当前位置
+@app.route("/amap_nav")
+def amap_nav():
+    """高德地图导航页面"""
     try:
+        # 获取当前位置
         location = get_current_location()  # 假设这个函数已存在
-        lat = location.get("lat", 31.2304)  # 默认上海坐标
-        lon = location.get("lon", 121.4737)
-    except:
-        lat = 31.2304  # 默认上海坐标
-        lon = 121.4737
+        lat = location.get('lat', 39.9042)  # 默认北京位置
+        lon = location.get('lon', 116.4074)
 
-    if request.method == "POST":
-        # 处理导航请求
-        lat = request.form.get("lat")
-        lon = request.form.get("lon")
-        save_type = request.form.get("save_type", "recent")
-        name = request.form.get("name", "")
-
-        # 保存目的地
-        save_destination(save_type, name, lat, lon)  # 假设这个函数已存在
-
-        # 生成导航路线
-        generate_route(lat, lon)  # 假设这个函数已存在
-
-        # 重定向到导航页面
-        return redirect("/prime")
-
-    # 获取保存的地址
-    home = get_saved_location("home")  # 假设这个函数已存在
-    work = get_saved_location("work")
-    fav1 = get_saved_location("fav1")
-    fav2 = get_saved_location("fav2")
-    fav3 = get_saved_location("fav3")
-
-    return render_template(
-        "amap_addr_input.html",
-        amap_key=amap_key,
-        amap_key_2=amap_key_2,
-        lat=lat,
-        lon=lon,
-        home=home,
-        work=work,
-        fav1=fav1,
-        fav2=fav2,
-        fav3=fav3
-    )
+        return render_template(
+            "amap_addr_input.html",
+            lat=lat,
+            lon=lon
+        )
+    except Exception as e:
+        return render_template("error.html", error=str(e))
 
 def main():
   try:

selfdrive/frogpilot/fleetmanager/templates/amap_addr_input.html

@@ -14,13 +14,13 @@
       <!-- UIkit JS -->
       <script src="https://cdn.jsdelivr.net/npm/uikit@3.9.2/dist/js/uikit.min.js"></script>
       <script src="https://cdn.jsdelivr.net/npm/uikit@3.9.2/dist/js/uikit-icons.min.js"></script>
-  
+
       <script type="text/javascript">
         window._AMapSecurityConfig = {
-            securityJsCode:'{{amap_key_2}}',
+            securityJsCode:'fc2724b3c96a7f244b2211f05c5264be',
         }
       </script>
-  
+
       <style type="text/css">
           body {
               margin: 0;
@@ -28,7 +28,7 @@
               width: 100%;
               position: absolute;
           }
-  
+
           #mapContainer {
               top: 0;
               left: 0;
@@ -41,7 +41,7 @@
           #amap-container {
               height: 400px; /* Adjust height as needed */
           }
-  
+
           .button-group {
               position: absolute;
               bottom: 20px;
@@ -49,7 +49,7 @@
               font-size: 12px;
               padding: 10px;
           }
-  
+
           .button-group .button {
               height: 28px;
               line-height: 28px;
@@ -63,15 +63,15 @@
               margin-bottom: 4px;
               cursor: pointer;
           }
-  
+
           .amap-info-content {
               font-size: 12px;
           }
       </style>
-  
+
       <script type="text/javascript"
-          src="https://webapi.amap.com/maps?v=1.4.2&key={{amap_key}}"></script>
-  
+          src="https://webapi.amap.com/maps?v=1.4.2&key=faf2f8ab406a8da1231ef7e10d501b65"></script>
+
       <!-- Rest of the HTML body content -->
       <div class="uk-grid-match uk-grid-small uk-text-center" uk-grid>
           <div class="uk-width-1-3@m">

selfdrive/frogpilot/fleetmanager/templates/index.html

@@ -13,6 +13,6 @@
     <br><a href='/preserved'>Access Preserved Footage</a><br>
     <br><a href='/screenrecords'>View Screen Recordings</a><br>
     <br><a href='/error_logs'>Access Error Logs</a><br>
-    <br><a href='/amap_addr'>高德地图导航</a><br>
     <br><a href='/about'>About Fleet Manager</a><br>
+    <br><a href='/amap_nav'>高德地图导航</a><br>
 {% endblock %}

selfdrive/frogpilot/fleetmanager/templates/layout.html

@@ -67,9 +67,6 @@
           <li class="nav-item active">
             <a href="/tools" class="nav-link">Tools</a>
           </li>
-          <li class="nav-item active">
-            <a href="/amap_addr" class="nav-link">高德导航</a>
-          </li>
         </ul>
       </div>
     </div>