From 7a1caa42ad3282ff22513785fa997953e084b188 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 16 十二月 2024 15:50:31 +0800
Subject: [PATCH] 1.修改app的Icon。 2.优化取水口加载本地数据，改为异步加载。 3.添加取水口点击后显示取水口信息。 4.美化登录界面。
---
app/src/main/assets/js/map.js | 68 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/app/src/main/assets/js/map.js b/app/src/main/assets/js/map.js
index 367686b..3df1bb6 100644
--- a/app/src/main/assets/js/map.js
+++ b/app/src/main/assets/js/map.js
@@ -18,11 +18,11 @@
mountMethodToWindow();
});
- window.onload = function () {
- console.log(window.onload); // 鎵撳嵃鏁扮粍鏁版嵁
- //鍔犺浇鍧愭爣鐐�
- window.Android.loadMarker();
- };
+ // window.onload = function () {
+ // console.log(window.onload); // 鎵撳嵃鏁扮粍鏁版嵁
+ // //鍔犺浇鍧愭爣鐐�
+ // window.Android.loadMarker();
+ // };
// 鍒濆鍖栧湴鍥�
function initMap() {
// 褰卞儚搴曞浘
@@ -170,8 +170,8 @@
window.updateLocation = updateLocation;
window.aginShowLocation = aginShowLocation;
window.cleanLocationLay = cleanLocationLay;
- window.updateInspectionLocation=updateInspectionLocation;
- window.cleanLoclLay=cleanLoclLay;
+ window.updateInspectionLocation = updateInspectionLocation;
+ window.cleanLoclLay = cleanLoclLay;
}
@@ -204,9 +204,9 @@
}
// 鐐瑰嚮鏍囨敞鐨勪簨浠�
- function addMarkerListener(data) {
+ function addMarkerListener(id,data) {
chageMarkerIcon(data);
- showWaterIntakeDetail("妯℃嫙鏁版嵁");
+ showWaterIntakeDetail(id);
}
// 淇敼鐐瑰嚮鏍囨敞鐨勫浘鏍�
@@ -244,35 +244,33 @@
return data1.lat === data2.lat && data1.lng === data2.lng;
}
//娣诲姞浠庡師鐢熶紶杩囨潵鐨勫潗鏍囧苟鏄剧ず鍦ㄥ湴鍥句笂
- function addMarker(jsonData) {
+ function addMarker(id,lng,lat,name) {
console.log("function銆嬨�嬨�嬨�嬨�媋ddMarker");
- var array = JSON.parse(jsonData);
+
var icon = new T.Icon({
iconUrl: markerBluePath,
iconSize: new T.Point(27, 27),
iconAnchor: new T.Point(10, 25)
});
- array.forEach(element => {
- let marker = new T.Marker(
- new T.LngLat(element[0], element[1]) // 鍒涘缓鏍囨敞
- , { icon: icon });
- //娣诲姞鐐瑰嚮浜嬩欢
- marker.addEventListener("click", (data) => {
- addMarkerListener(data)
- });
- map.addOverLay(marker); // 灏嗘爣娉ㄦ坊鍔犲埌鍦板浘涓�
- let label = new T.Label({
- text: element[2],
- position: marker.getLngLat(),
- offset: new T.Point(-35, 8), // 璁剧疆鏍囨敞鏂囧瓧鐨勪綅缃�
- opacity: 1, // 璁剧疆鏂囨湰鐨勬樉绀轰笉閫忔槑搴︼紙鑼冨洿0-1锛�
- });
- label.setBorderLine(0); // 璁剧疆鏂囨湰鐨勮竟妗嗙嚎瀹�
- label.setBackgroundColor("transparent"); // 璁剧疆鏂囨湰鐨勮儗鏅壊锛堥�忔槑鑹诧級
- label.setFontColor("#0000FF");
- label.setFontSize(10);
- map.addOverLay(label);
+ let marker = new T.Marker(
+ new T.LngLat(lng, lat) // 鍒涘缓鏍囨敞
+ , { icon: icon });
+ //娣诲姞鐐瑰嚮浜嬩欢
+ marker.addEventListener("click", (data) => {
+ addMarkerListener(id,data)
});
+ map.addOverLay(marker); // 灏嗘爣娉ㄦ坊鍔犲埌鍦板浘涓�
+ let label = new T.Label({
+ text: name,
+ position: marker.getLngLat(),
+ offset: new T.Point(-35, 8), // 璁剧疆鏍囨敞鏂囧瓧鐨勪綅缃�
+ opacity: 1, // 璁剧疆鏂囨湰鐨勬樉绀轰笉閫忔槑搴︼紙鑼冨洿0-1锛�
+ });
+ label.setBorderLine(0); // 璁剧疆鏂囨湰鐨勮竟妗嗙嚎瀹�
+ label.setBackgroundColor("transparent"); // 璁剧疆鏂囨湰鐨勮儗鏅壊锛堥�忔槑鑹诧級
+ label.setFontColor("#0000FF");
+ label.setFontSize(10);
+ map.addOverLay(label);
return "addMarker鍔犺浇鎴愬姛"
}
//鏇存柊瀹氫綅鍧愭爣
@@ -303,7 +301,7 @@
lineLayer.setLngLats(path);
map.addOverLay(lineLayer);
// 绉诲姩鍦板浘瑙嗚鍒版渶鍚庝竴涓綅缃�
-
+
// }, 500);
}
@@ -322,18 +320,18 @@
function cleanLocationLay() {
if (lineLayer) {
map.removeOverLay(lineLayer);
- path=[]
+ path = []
}
if (locationMarker) {
map.removeOverLay(locationMarker);
}
if (oldLineLayer) {
- aginPath=[]
+ aginPath = []
map.removeOverLay(oldLineLayer);
}
}
//娓呴櫎鏈湴瀹氫綅鍧愭爣浣嶇疆
- function cleanLoclLay(){
+ function cleanLoclLay() {
if (locationMarker) {
map.removeOverLay(locationMarker);
}
--
Gitblit v1.8.0