From e923f06d572c9a0e3b1eb2c54471af02c9d95bcf Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 10:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt b/src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt
index a5deec6..7c134be 100644
--- a/src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt
+++ b/src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt
@@ -40,8 +40,12 @@
val streetNumber: String,
// 澶勪簬璇ラ棬鐗屽彿鐨勬柟鍚�
val direction:String,
- // 鎵�澶勬渶杩戜氦鍙夎矾鍙ｇ殑鏂瑰悜鍜岃窛绂�
- val roadinter: String,
+ // 澶勪簬璇ラ棬鐗屽彿鐨勬柟鍚戣窛绂�
+ val distance:String,
+ // 鎵�澶勬渶杩戜氦鍙夎矾鍙ｇ殑鏂瑰悜
+ val roadinter: String?,
+ // 鎵�澶勬渶杩戜氦鍙夎矾鍙ｇ殑璺濈
+ val distance2: String?,
)
data class AMapDirection(
@@ -126,9 +130,10 @@
getJsonString(streetNumber["street"]),
getJsonString(streetNumber["number"]),
getJsonString(streetNumber["direction"]),
-// + streetNumber["distance"].asDouble.toInt() + "绫�",
- if(roadinter == null) "" else getJsonString(roadinter.get("first_name")) +"鍜�" + getJsonString(roadinter.get("second_name")) + "浜ゅ弶鍙�"
- + getJsonString(roadinter.get("direction")) + getJsonString(roadinter.get("distance")) + "绫�",
+ getJsonString(streetNumber["distance"]),
+ if(roadinter == null) null else getJsonString(roadinter.get("first_name")) +"鍜�" + getJsonString(roadinter.get("second_name")) + "浜ゅ弶鍙�"
+ + getJsonString(roadinter.get("direction")),
+ if(roadinter == null) null else getJsonString(roadinter["distance"])
)
} catch (e: Exception) {
val regeocode = obj["regeocode"].asJsonObject
--
Gitblit v1.9.3