From 9032462238327b971df1a5f72ef343200a5e0103 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 11 十二月 2024 18:13:44 +0800
Subject: [PATCH] 1.问题上报相关 2.问题上报列表相关 3.添加图片上传中断功能 4.图片添加的bug
---
app/src/main/assets/js/map.js | 98 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 76 insertions(+), 22 deletions(-)
diff --git a/app/src/main/assets/js/map.js b/app/src/main/assets/js/map.js
index 760cee6..367686b 100644
--- a/app/src/main/assets/js/map.js
+++ b/app/src/main/assets/js/map.js
@@ -19,6 +19,7 @@
});
window.onload = function () {
+ console.log(window.onload); // 鎵撳嵃鏁扮粍鏁版嵁
//鍔犺浇鍧愭爣鐐�
window.Android.loadMarker();
};
@@ -30,12 +31,12 @@
"&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=d8beed89b43160a9a185e5aff431f85d";
//鍒涘缓鑷畾涔夊浘灞傚璞�
//褰卞儚娉ㄨ锛堝湴鍥句笂鐨勫湴鍧�锛�
- var imgURL2 ="http://t0.tianditu.gov.cn/cia_w/wmts?" +"SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cia&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
- "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}" +
- "&tk=d8beed89b43160a9a185e5aff431f85d";
+ var imgURL2 = "http://t0.tianditu.gov.cn/cia_w/wmts?" + "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cia&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+ "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}" +
+ "&tk=d8beed89b43160a9a185e5aff431f85d";
var lay = new T.TileLayer(imageURL, { minZoom: 6, maxZoom: 18 });
var lay2 = new T.TileLayer(imgURL2, { minZoom: 6, maxZoom: 18 });
- var config = { layers: [lay,lay2] };
+ var config = { layers: [lay, lay2] };
map = new T.Map("mapDiv", config);
var scale = new T.Control.Scale();
//娣诲姞姣斾緥灏烘帶浠�
@@ -47,7 +48,7 @@
// 鍦板浘鐐瑰嚮鍚庤幏鍙栫粡绾害
function getLngLat(lnglat) {
console.log(lnglat.lng.toFixed(6) + "," + lnglat.lat.toFixed(6));
- addClickOverLay(lnglat);
+ // addClickOverLay(lnglat);
}
// 鐐瑰嚮鍚庢坊鍔犲潗鏍囩偣
@@ -153,8 +154,8 @@
//璁剧疆鍦板浘涓績鐐�
- function setCenterAndZoom(lng, lat,thiszoom) {
- zoom=thiszoom;
+ function setCenterAndZoom(lng, lat, thiszoom) {
+ zoom = thiszoom;
console.log("function銆嬨�嬨�嬨�嬨�媠etCenterAndZoom>>>>lng:" + lng + ",lat:" + lat);
map.centerAndZoom(new T.LngLat(lng, lat), zoom);
}
@@ -166,7 +167,12 @@
window.showToast = showToast;
window.addMarker = addMarker;
window.setCenterAndZoom = setCenterAndZoom;
- window.updateLocation=updateLocation;
+ window.updateLocation = updateLocation;
+ window.aginShowLocation = aginShowLocation;
+ window.cleanLocationLay = cleanLocationLay;
+ window.updateInspectionLocation=updateInspectionLocation;
+ window.cleanLoclLay=cleanLoclLay;
+
}
// 璋冪敤鍘熺敓瀹夊崜鏂规硶鏄剧ず鍙栨按鍙ｈ鎯�
@@ -260,7 +266,7 @@
position: marker.getLngLat(),
offset: new T.Point(-35, 8), // 璁剧疆鏍囨敞鏂囧瓧鐨勪綅缃�
opacity: 1, // 璁剧疆鏂囨湰鐨勬樉绀轰笉閫忔槑搴︼紙鑼冨洿0-1锛�
- });
+ });
label.setBorderLine(0); // 璁剧疆鏂囨湰鐨勮竟妗嗙嚎瀹�
label.setBackgroundColor("transparent"); // 璁剧疆鏂囨湰鐨勮儗鏅壊锛堥�忔槑鑹诧級
label.setFontColor("#0000FF");
@@ -269,20 +275,68 @@
});
return "addMarker鍔犺浇鎴愬姛"
}
- //淇濆瓨瀹氫綅鍧愭爣鐢熸垚杞ㄨ抗
- var path=[];
- function updateLocation(lat,log){
- var newPoint = new T.LatLng(latitude, longitude);
- path.push(newPoint);
- var polyline = new T.Polyline({
- path: path, // 杞ㄨ抗鍧愭爣
- strokeColor: "#FF0000", // 杞ㄨ抗棰滆壊
- strokeWeight: 6, // 杞ㄨ抗绾垮
- strokeOpacity: 0.7 // 杞ㄨ抗閫忔槑搴�
+ //鏇存柊瀹氫綅鍧愭爣
+ function updateLocation(log, lat) {
+ let icon = new T.Icon({
+ iconUrl: locationIMGPath,
+ iconSize: new T.Point(20, 20),
+ iconAnchor: new T.Point(10, 10)
});
- map.addOverlay(polyline);
- // 绉诲姩鍦板浘瑙嗚鍒版渶鍚庝竴涓綅缃�
- map.panTo(newPoint);
+ if (locationMarker) {
+ map.removeOverLay(locationMarker);
+ }
+ var newPoint = new T.LngLat(log, lat);
+ locationMarker = new T.Marker(newPoint, { icon: icon });
+ map.addOverLay(locationMarker);
+ map.panTo(newPoint);
+ }
+ //淇濆瓨瀹氫綅鍧愭爣鐢熸垚杞ㄨ抗
+ var path = [];
+ var lineLayer = new T.Polyline([], { color: '#ff4500', weight: 3, opacity: 0.8 });
+ let locationMarker;
+ function updateInspectionLocation(log, lat) {
+ var lastLat = lat;
+ // const intervalId = setInterval(() => {
+ // lastLat=lastLat+0.0001;
+ var newPoint = new T.LngLat(log, lastLat);
+ path.push(newPoint);
+ lineLayer.setLngLats(path);
+ map.addOverLay(lineLayer);
+ // 绉诲姩鍦板浘瑙嗚鍒版渶鍚庝竴涓綅缃�
+
+ // }, 500);
+ }
+
+ var aginPath = [];
+ var oldLineLayer = new T.Polyline([], { color: '#ff4500', weight: 3, opacity: 0.8 });
+ //鏄剧ず鍥犲紓甯稿叧闂殑宸℃璁板綍
+ function aginShowLocation(lng, lat) {
+ // 璋冪敤 Android 鎻愪緵鐨勬帴鍙ｏ紝鑾峰彇鏁版嵁
+ console.log("aginShowLocation>>lng:" + lng + ">>>lat:" + lat);
+ var newPoint = new T.LngLat(lng, lat);
+ aginPath.push(newPoint);
+ oldLineLayer.setLngLats(aginPath);
+ map.addOverLay(oldLineLayer);
+ }
+ //娓呴櫎宸℃璁板綍杞ㄨ抗
+ function cleanLocationLay() {
+ if (lineLayer) {
+ map.removeOverLay(lineLayer);
+ path=[]
+ }
+ if (locationMarker) {
+ map.removeOverLay(locationMarker);
+ }
+ if (oldLineLayer) {
+ aginPath=[]
+ map.removeOverLay(oldLineLayer);
+ }
+ }
+ //娓呴櫎鏈湴瀹氫綅鍧愭爣浣嶇疆
+ function cleanLoclLay(){
+ if (locationMarker) {
+ map.removeOverLay(locationMarker);
+ }
}
--
Gitblit v1.8.0