From 240e010745f58a6b2e04f558c72fe9c0c3106cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E5=BE=AE=E4=B8=80=E7=AC=91?= <709648985@qq.com>
Date: Sat, 2 Aug 2025 16:38:54 +0800
Subject: [PATCH] =?UTF-8?q?ios=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                   |   2 +-
 manifest.json                            |   9 +-
 package-lock.json                        |   6 +
 package.json                             |   1 +
 pages/common/map/index.vue               | 302 ++++++-----------------
 static/native-res/raw/mapstyle_grey.json |  44 ++++
 yarn.lock                                |   5 +
 7 files changed, 136 insertions(+), 233 deletions(-)
 create mode 100644 static/native-res/raw/mapstyle_grey.json

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index e5a582a..e905fe3 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-ios"
         },
         {
diff --git a/manifest.json b/manifest.json
index d4a5a53..145f9d9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__A21EF43",
     "description" : "设备管控",
     "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -62,7 +62,9 @@
                 "appid" : "uni.app.UNIA21EF43",
                 "privacyDescription" : {
                     "NSBluetoothPeripheralUsageDescription" : "需要蓝牙访问权限，用于设备通信",
-                    "NSBluetoothAlwaysUsageDescription" : "需要蓝牙访问权限，用于设备通信"
+                    "NSBluetoothAlwaysUsageDescription" : "需要蓝牙访问权限，用于设备通信",
+                    "NSLocationWhenInUseUsageDescription" : "用于地图定位服务",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "用于地图定位服务"
                 },
                 "dSYMs" : false
             },
@@ -80,7 +82,8 @@
                     "amap" : {
                         "name" : "amapHG8nIFW5",
                         "appkey_ios" : "065c43f02c7b627a74ad7dd23b16bb4f",
-                        "appkey_android" : "d7d852dbda2b95f6f796fb9a711a9fee"
+                        "appkey_android" : "d7d852dbda2b95f6f796fb9a711a9fee",
+                        "style" : "enable"
                     }
                 },
                 "oauth" : {},
diff --git a/package-lock.json b/package-lock.json
index 6165a5b..0487a1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
+        "@amap/amap-jsapi-loader": "^1.0.1",
         "axios": "^1.9.0",
         "cordova-sqlite-storage": "^7.0.0",
         "iconv-lite": "^0.6.3",
@@ -13,6 +14,11 @@
         "vk-uview-ui": "^1.5.2"
       }
     },
+    "node_modules/@amap/amap-jsapi-loader": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
+      "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
diff --git a/package.json b/package.json
index 0ded30f..2d22a88 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "axios": "^1.9.0",
     "cordova-sqlite-storage": "^7.0.0",
     "iconv-lite": "^0.6.3",
diff --git a/pages/common/map/index.vue b/pages/common/map/index.vue
index bf29939..cf0799e 100644
--- a/pages/common/map/index.vue
+++ b/pages/common/map/index.vue
@@ -1,12 +1,8 @@
 <template>
 	<view class="map-container">
-		<!-- 背景保护层 -->
-		<view class="map-background"></view>
-		<view id="mapWrapper" ref="mapRef" class="map-wrapper"></view>
-		<!-- 加载提示 -->
-		<view v-if="loading" class="loading-mask">
-			<view class="loading-content">地图加载中...</view>
-		</view>
+		<map id="map" :style="{ width: '100%', height: '100vh' }" :latitude="latitude" :longitude="longitude" :zoom="13"
+			:markers="markers" :custom-style-file="customStyleFile" @markertap="onMarkerTap" @callouttap="onCalloutTap">
+		</map>
 	</view>
 </template>
 
@@ -14,239 +10,87 @@
 	export default {
 		data() {
 			return {
-				loading: true
-			}
-		},
-		methods: {
-			hideLoading() {
-				this.loading = false
-			}
-		}
-	}
-</script>
-
-<script module="amap" lang="renderjs">
-	export default {
-		data() {
-			return {
+				latitude: 30.592,
+				longitude: 114.305,
 				markers: [],
-				customPopup: null
+				// 为自定义基座提供样式文件路径
+				customStyleFile: ''
 			}
 		},
-		mounted() {
-			// 初始设置背景色
-			const container = document.getElementById('mapWrapper')
-			container.style.backgroundColor = '#121212'
-			container.style.transition = 'background 0.5s'
-
-			this.initMap()
-		},
-		methods: {
-			async loadScript(url) {
-				return new Promise((resolve) => {
-					const script = document.createElement('script')
-					script.src = url
-					script.onload = resolve
-					document.head.appendChild(script)
-				})
-			},
-
-			async initMap() {
-				try {
-					// 动态加载SDK
-					if (!window.AMap) {
-						await this.loadScript(
-							'https://webapi.amap.com/maps?v=2.0&key=90bc158992feb8ccd0145e168cab1307'
-						)
-					}
-
-					const container = document.getElementById('mapWrapper')
-					container.innerHTML = `
-          <div id="amapContainer" style="
-            width:100%;
-            height:100%;
-            opacity:0;
-            transition:opacity 0.8s ease-out;
-            background:#121212;
-          "></div>
-        `
-
-					// 初始化地图
-					this.map = new AMap.Map('amapContainer', {
-						viewMode: '3D',
-						zoom: 13,
-						center: [114.305, 30.592],
-						mapStyle: 'amap://styles/grey'
-					})
-
-					// 地图加载完成后淡入
-					this.map.on('complete', () => {
-						document.getElementById('amapContainer').style.opacity = 1
-						this.$ownerInstance.callMethod('hideLoading')
-						// 添加标记点
-						const wuhanPoints = [{
-								lnglat: [114.404, 30.507],
-								name: "华中科技大学"
-							},
-							{
-								lnglat: [114.428, 30.476],
-								name: "光谷金融港"
-							},
-							{
-								lnglat: [114.433, 30.504],
-								name: "武汉东站"
-							}
-						]
-						wuhanPoints.forEach(point => {
-							this.addMarker(point.lnglat, point.name)
-						})
-					})
-					// 创建自定义弹窗
-					this.createCustomPopup()
-				} catch (e) {
-					console.error('初始化失败:', e)
-					this.$ownerInstance.callMethod('hideLoading')
-				}
-			},
-
-			createCustomPopup() {
-				this.customPopup = document.createElement('div')
-				this.customPopup.className = 'custom-map-popup'
-				this.customPopup.innerHTML = `
-        <div class="popup-content">
-          <div class="popup-title"></div>
-        </div>
-      `
-				this.customPopup.style.display = 'none'
-				document.getElementById('amapContainer').appendChild(this.customPopup)
-			},
-
-			addMarker(position, title) {
-				const marker = new AMap.Marker({
-					position: new AMap.LngLat(...position),
-					map: this.map,
-					icon: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_b.png',
-				})
-				marker.on('click', () => {
-					this.showCustomPopup(position, title)
-				})
-				this.markers.push(marker)
-				return marker
-			},
-
-			showCustomPopup(position, title) {
-				const pixel = this.map.lngLatToContainer(position)
-				this.customPopup.querySelector('.popup-title').textContent = title
-				this.customPopup.style.display = 'block'
-				this.customPopup.style.left = `${pixel.x}px`
-				this.customPopup.style.top = `${pixel.y}px`
-				this.map.on('click', this.hideCustomPopup)
-			},
-
-			hideCustomPopup() {
-				if (this.customPopup) {
-					this.customPopup.style.display = 'none'
-				}
-				this.map.off('click', this.hideCustomPopup)
-			}
-		},
-		onLoad(options) {
-			console.log(options,'optionsoptions');
+		onLoad() {
+			// #ifdef APP-PLUS
+			this.customStyleFile = plus.io.convertLocalFileSystemURL("_www/static/native-res/raw/mapstyle_grey.json");
+			// #endif
 			const eventChannel = this.getOpenerEventChannel();
 			eventChannel.on('MapData', (data) => {
-				console.log(data, 'data');
-			})
+				if (data && data.points) {
+					this.processMapData(data.points);
+				} else {
+					this.addDefaultMarkers();
+				}
+			});
+			// In case no data is received
+			setTimeout(() => {
+				if (this.markers.length === 0) {
+					this.addDefaultMarkers();
+				}
+			}, 1000);
+		},
+		methods: {
+			processMapData(points) {
+				const newMarkers = points.map((point, index) => ({
+					id: index,
+					latitude: point.lnglat[1],
+					longitude: point.lnglat[0],
+					iconPath: '/static/images/biao.png',
+					width: 30,
+					height: 30,
+					callout: {
+						content: point.name,
+						color: '#ffffff',
+						fontSize: 14,
+						borderRadius: 10,
+						bgColor: '#000000',
+						padding: 10,
+						display: 'BYCLICK'
+					}
+				}));
+
+				if (newMarkers.length > 0) {
+					this.latitude = newMarkers[0].latitude;
+					this.longitude = newMarkers[0].longitude;
+					this.markers = newMarkers;
+				}
+			},
+			addDefaultMarkers() {
+				const wuhanPoints = [{
+						lnglat: [114.404, 30.507],
+						name: "华中科技大学"
+					},
+					{
+						lnglat: [114.428, 30.476],
+						name: "光谷金融港"
+					},
+					{
+						lnglat: [114.433, 30.504],
+						name: "武汉东站"
+					}
+				];
+				this.processMapData(wuhanPoints)
+			},
+			onMarkerTap(e) {
+				console.log('marker tapped', e.detail.markerId);
+			},
+			onCalloutTap(e) {
+				console.log('callout tapped', e.detail.markerId);
+			}
 		}
 	}
 </script>
 
 <style>
-	/* 基础样式 */
 	.map-container {
 		width: 100%;
 		height: 100vh;
-		position: relative;
-		overflow: hidden;
 	}
-
-	.map-background {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		background: #121212;
-		z-index: 1;
-	}
-
-	.map-wrapper {
-		width: 100%;
-		height: 100%;
-		position: relative;
-		z-index: 2;
-	}
-
-	/* 加载提示 */
-	.loading-mask {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: #121212;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		z-index: 999;
-	}
-
-	.loading-content {
-		color: rgba(255, 255, 255, 0.9);
-		font-size: 16px;
-		padding: 12px 24px;
-		background: rgba(0, 0, 0, 0.7);
-		border-radius: 8px;
-	}
-
-	/* 弹窗样式 */
-	.custom-map-popup {
-		position: absolute;
-		z-index: 9999;
-		transform: translate(-50%, -100%);
-		min-width: 200rpx;
-		pointer-events: none;
-		animation: popupFadeIn 0.3s ease-out;
-	}
-
-	.popup-content {
-		background: rgba(18, 45, 74, 0.95);
-		border-radius: 16rpx;
-		padding: 12rpx 24rpx;
-		color: #fff;
-		font-size: 14px;
-		text-align: center;
-		box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
-		border: 1px solid rgba(255, 255, 255, 0.1);
-	}
-
-	.popup-content:after {
-		content: '';
-		position: absolute;
-		bottom: -8px;
-		left: 50%;
-		transform: translateX(-50%);
-		border-width: 8px 8px 0;
-		border-style: solid;
-		border-color: rgba(18, 45, 74, 0.95) transparent transparent;
-	}
-
-	@keyframes popupFadeIn {
-		from {
-			opacity: 0;
-			transform: translate(-50%, -90%);
-		}
-
-		to {
-			opacity: 1;
-			transform: translate(-50%, -100%);
-		}
-	}
-</style>
\ No newline at end of file
+</style>
diff --git a/static/native-res/raw/mapstyle_grey.json b/static/native-res/raw/mapstyle_grey.json
new file mode 100644
index 0000000..0f60976
--- /dev/null
+++ b/static/native-res/raw/mapstyle_grey.json
@@ -0,0 +1,44 @@
+[
+  {
+    "featureType": "water",
+    "elementType": "geometry",
+    "stylers": {
+      "color": "#ff0000"
+    }
+  },
+  {
+    "featureType": "land",
+    "elementType": "geometry",
+    "stylers": {
+      "color": "#000000"
+    }
+  },
+  {
+    "featureType": "road",
+    "elementType": "all",
+    "stylers": {
+      "color": "#555555"
+    }
+  },
+  {
+    "featureType": "building",
+    "elementType": "all",
+    "stylers": {
+      "color": "#222222"
+    }
+  },
+    {
+    "featureType": "all",
+    "elementType": "labels.text.fill",
+    "stylers": {
+      "color": "#ffffff"
+    }
+  },
+  {
+    "featureType": "all",
+    "elementType": "labels.text.stroke",
+    "stylers": {
+      "color": "#000000"
+    }
+  }
+]
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index e7090f5..cffe648 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@amap/amap-jsapi-loader@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz"
+  integrity sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"