v1.0.6

grpc/app_api

@@ -1 +1 @@
-Subproject commit 953c4f0deb25c72123537679967faba74442dead
+Subproject commit 008439ca46a165b39d9d1e696246df37dbe03524

pages/AO/mapShow.vue

@@ -11,16 +11,6 @@
 			<scroll-view :scroll-top="0" scroll-y="true"
 				:style="{ height: popupHeight + 'px', width: popupWidth + 'px' }" class="scroll-Y">
 				<uni-list v-for="(item, index) in players" :key="index" :border="true" class="list">
-
-					<!-- <uni-list-item :show-extra-icon="true" :extra-icon="{color: '#4cd964', size: '22', type: 'spinner'}"
-						:title="'(' + (index+1) + ') ' + item.name + ' 打点: ' + item.effectivenum + ' / ' + item.totalcontrolnum + ' 距离: ' + item.distance + '米 配速: ' + item.pace"
-						:note="'平均心率: ' + item.avghr + ' 最大心率: ' + item.maxhr + ' CAL: ' + item.calorie + ' Ck: ' + item.ck + ' Ei: ' + item.ei"
-						:clickable="true" @click="onPlayerListItemClick(item)" :class="{ 
-							'list-item': focusPlayerId != item.id,
-							'list-item-focus': focusPlayerId == item.id 
-							}">
-					</uni-list-item> -->
-
 					<uni-list-item :clickable="true" @click="onPlayerListItemClick(item)" class="list-item" :class="{ 
 							'list-item-focus': focusPlayerId == item.id 
 							}">
@@ -80,9 +70,9 @@
 				popupType: 'bottom',
 				popupShow: false,
 				extraIcon: {
-					color: '#4cd964',
-					size: '22',
-					type: 'gear-filled'
+					// color: '#4cd964',
+					// size: '22',
+					// type: 'gear-filled'
 				},
 
 				actionId: 2,
@@ -208,6 +198,7 @@
 			},
 			popupToggle() {
 				this.popupShow = !this.popupShow
+				window.focus()
 			},
 			fullScreenToggle() {
 				this.fullscreen()
@@ -452,10 +443,16 @@
 
 <style lang="scss" scoped>
 	.page {
-		// background-color: red;
 		display: flex;
+		// margin: 0px;
+		// padding: 0px;
 	}
 
+	// 勿删，解决map控件获得焦点后出现边框颜色的问题
+	:focus-visible {
+		outline: none;
+	}
+	
 	.map {
 		flex: 1 1 auto;
 		background-color: white;
@@ -466,7 +463,8 @@
 	}
 
 	.popup {
-		// height: 200px;
+		background-color: #f5f5f5;
+		// border-left: #ff0000 solid 5px;
 		// overflow: hidden;
 	}
 
@@ -474,7 +472,9 @@
 		// height: 100vh;
 	}
 
-	.list {}
+	.list {
+		margin-left: 2px;
+	}
 
 	.list-item {
 		/* #ifndef APP-NVUE */

utils/map/leafletHelper.js

@@ -84,7 +84,7 @@ export default {
 			checkPoint.onZoomEnd(e)
 			route.onZoomEnd(e)
 		});
-
+		
 		// global.map.on('zoomanim', (e) => {
 		// 	console.log("地图缩放中...", e)
 		// 	// player.onZoomEnd(e)

utils/map/sub/player.js

@@ -295,6 +295,7 @@ export default {
 				var curPoint = [player_position.latitude, player_position.longitude]
 				// console.log('[drawOnePlayer] 更新玩家的标记位置', storePlayer.marker, curPoint)
 				marker.setLatLng(curPoint)
+				marker.bringToFront()
 				marker.setPopupContent(popupContent)
 			}
 		}