From c954cdb51f93585b58b761c2663688c36e6b044f Mon Sep 17 00:00:00 2001 From: jihongshun <1151753686@qq.com> Date: 星期五, 15 八月 2025 17:13:54 +0800 Subject: [PATCH] 创建航线新增全局配置 --- src/views/system/shootPoint/components/shootPointDialog.vue | 613 +++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 479 insertions(+), 134 deletions(-) diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue index 621e5d8..f4fb7ff 100644 --- a/src/views/system/shootPoint/components/shootPointDialog.vue +++ b/src/views/system/shootPoint/components/shootPointDialog.vue @@ -12,92 +12,87 @@ <div class="chooseModel"> <el-button type="primary" @click='chooseModel'>閫夋嫨妯″瀷</el-button> <div class="modelType"> - 妯″瀷鍚嶇О锛氭ā鍨嬪1 + 妯″瀷鍚嶇О锛歿{ modelName }} </div> <div> - 妯″瀷绫诲瀷锛氱數濉� + 妯″瀷绫诲瀷锛歿{ templateType }} </div> + <el-form label-width="70px" :model="form"> + <el-form-item label="妯℃澘鍚嶇О"> + <el-input v-model="form.templateName"></el-input> + </el-form-item> + </el-form> </div> <div class="modelTree"> <div class='modelTreeTitle'>宸℃鐐圭洰褰�</div> - <el-tree - class="filter-tree" - :data="treeData" - :props="defaultProps" - draggable - :allow-drop="allowDrop" - @node-drop="handleDrop" - default-expand-all - ref="tree"> - </el-tree> + <el-tabs v-model="activeName"> + <el-tab-pane label="鑸偣鏍�" name="first"> + <el-tree + class="filter-tree" + :data="treeData" + :props="defaultProps" + draggable + :allow-drop="allowDrop" + @node-drop="handleDrop" + default-expand-all + @node-click="handleNodeClick" + ref="tree"> + </el-tree> + </el-tab-pane> + <el-tab-pane label="鑸偣鍒楄〃" name="second"> + <div class="waypoint-panel"> + + <!-- 鑸偣鍒楄〃 --> + <div class="waypoints"> + <div + v-for="(wp, index) in waypoints" + :key="index" + class="waypoint-item" + :class="{ active: selectedIndex === index }" + @click="toggleSelect(wp,index)" + > + <div class="waypoint-header"> + <i + class="el-icon-success" + ></i> + <span> + <span class="waypoint-index">{{ wp.label }}</span> + <i class="el-icon-camera"></i> + <i class="el-icon-video-camera"></i> + <i class="el-icon-picture-outline"></i> + </span> + </div> + </div> + </div> + </div> + </el-tab-pane> + </el-tabs> + </div> </el-card> </el-col> <el-col :span="20"> - <!-- <el-card class="noScroll"> --> - <InitMap v-if="showMap" @mergePoint="mergePoint"></InitMap> - <!-- </el-card> --> + <InitMap v-if="showMap" @mergePoint="mergePoint" :towerUrl="towerUrl" :deviceData="deviceData" @dealTreeData="dealTreeData" ref="initMap"></InitMap> </el-col> - <!-- <el-col :span="8"> - <div> - <div class="cameraView"> - <a>鐩告満瑙嗚</a> - </div> - <div class="uavView"> - <a>鏃犱汉鏈鸿瑙�</a> - </div> - <div class="operationControl"> - <a>鎿嶆帶鐩稿叧(浣跨敤浠ヤ笅閿帶鍒剁浉鏈鸿瑙�)</a> - <div> - <el-button type="primary">鍦伴潰鐐�</el-button> - <el-button type="primary">绌轰腑鐐�</el-button> - <el-button type="primary">鎮仠鏃堕棿</el-button> - </div> - <div> - <div class="container"> - <div class="keypad"> - <div class="row"> - <div class="key">Q-涓婂崌</div> - <div class="key">W-鍚戝墠</div> - <div class="key">E-涓嬮檷</div> - </div> - <div class="row"> - <div class="key">A- 鍚戝乏</div> - <div class="key">S- 鍚戝悗</div> - <div class="key">D- 鍚戝彸</div> - </div> - </div> - <div class="arrow-pad"> - <div class="arrow-row"> - <div class="arrow empty"></div> - <div class="arrow">鈫� - 鍚戜笂鐪�</div> - <div class="arrow empty"></div> - </div> - <div class="arrow-row"> - <div class="arrow">鈫� - 鍚戝乏杞�</div> - <div class="arrow">鈫� - 鍚戜笅鐪�</div> - <div class="arrow">鈫� - 鍚戝彸杞�</div> - </div> - </div> - </div> - </div> - </div> - </div> - </el-col> --> </el-row> <span slot="footer" class="dialog-footer"> <el-button @click="closeModal">鍙� 娑�</el-button> - <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button> + <el-button type="primary" @click="submit()" >纭� 瀹�</el-button> </span> </el-dialog> - <ChooseModelDialog v-if="showModel" @cancel ='cancel' @getRowData="getRowData" ></ChooseModelDialog> + <ChooseModelDialog v-if="showModel" @cancel ='cancel' @getRowData="getRowData"></ChooseModelDialog> </div> </template> <script> import CesiumMap from "../../../../utils/components/cesium-map.vue"; import InitMap from "../../../../utils/components/init-map.vue"; import ChooseModelDialog from './chooseModelDialog.vue'; - +import { addPoint , getPointInfo} from "@/api/system/template" +let globalon = 0 +let globalat = 0 +let towerHeight = 45 +//濉旂殑鏈濆悜绠楁硶鎵�鐢ㄥ埌鐨� 鏃嬭浆搴︽暟 +let rotationAngle = Cesium.Math.toRadians(0) export default{ name:'shootPointDialog', components: { @@ -105,32 +100,16 @@ ChooseModelDialog, InitMap }, + props: { + templateId: { + type: String, + defaule: null + } + }, data(){ return{ dialogVisible :true, showModel:false, - // treeData: [{ - // id: 1, - // label: '涓�绾� 1', - // children: [{ - // id: 4, - // label: '浜岀骇 1-1', - // }] - // }, { - // id: 2, - // label: '涓�绾� 2', - // children: [{ - // id: 5, - // label: '浜岀骇 2-1' - // }] - // }, { - // id: 3, - // label: '涓�绾� 3', - // children: [{ - // id: 7, - // label: '浜岀骇 3-1' - // }] - // }], treeData:[], defaultProps: { children: 'children', @@ -140,10 +119,230 @@ initialCameraPosition: null, initialCameraOrientation: null, animationFrameId: null, - showMap:false + showMap:false, + towerUrl:null, + chooseModelId:null, + modelName:null, + templateType:null, + form:{}, + deviceData:null, + activeName: 'first', + totalDistance: 3054.9, + totalTime: '5m 56s', + totalPoints: 11, + totalPhotos: 3, + waypoints:[], + selectedIndex:null } }, + mounted(){ + console.log(this.templateId) + if(this.templateId) { + //棰勮閫昏緫 + getPointInfo(this.templateId).then(res=>{ + if(res.code == 200 ) { + console.log(res.data) + this.getRowData(res.data) + let drawArr = this.convertToTree(res.data.ardListWayPointsLS) + setTimeout(() => { + //娓叉煋鏃堕棿闂 鍔犱釜寤舵椂鍣� + this.drawLines(drawArr) + }, 500); + } + }) + } + }, methods:{ + toggleSelect(wq,index) { + console.log(this.treeData) + console.log(wq) + // 濡傛灉鐐瑰嚮鐨勬槸褰撳墠琛岋紝鍒欏彇娑堥�変腑 + if (this.selectedIndex === index) { + this.selectedIndex = null + } else { + this.selectedIndex = index + } + const result = this.treeData.filter(item => + item.children && item.children.some(child => child.label === wq.label) + ); + const dataObj = result[0] + const from = [dataObj.children[0]?.longitude,dataObj.children[0]?.latitude, dataObj.children[0]?.height]; + const to = [dataObj.longitude,dataObj.latitude, dataObj.height]; + this.flyToAndLookAt(from, to); + this.$refs.initMap.DealVisualCone(dataObj) + }, + // 璁$畻 heading锛堝亸鑸锛� + computeHeading(fromCartesian, toCartesian) { + const transform = Cesium.Transforms.eastNorthUpToFixedFrame(fromCartesian); + const direction = Cesium.Cartesian3.subtract( + toCartesian, + fromCartesian, + new Cesium.Cartesian3() + ); + const directionLocal = Cesium.Matrix4.multiplyByPointAsVector( + Cesium.Matrix4.inverseTransformation(transform, new Cesium.Matrix4()), + direction, + new Cesium.Cartesian3() + ); + Cesium.Cartesian3.normalize(directionLocal, directionLocal); + return Math.atan2(directionLocal.x, directionLocal.y); + }, + + // 璁$畻 pitch锛堜刊浠拌锛� + computePitch(fromCartesian, toCartesian) { + const transform = Cesium.Transforms.eastNorthUpToFixedFrame(fromCartesian); + const direction = Cesium.Cartesian3.subtract( + toCartesian, + fromCartesian, + new Cesium.Cartesian3() + ); + const directionLocal = Cesium.Matrix4.multiplyByPointAsVector( + Cesium.Matrix4.inverseTransformation(transform, new Cesium.Matrix4()), + direction, + new Cesium.Cartesian3() + ); + Cesium.Cartesian3.normalize(directionLocal, directionLocal); + return Math.asin(directionLocal.z); // z杞村悜涓� + }, + + // 椋炲埌 from 鐪嬪悜 to + flyToAndLookAt(from, to) { + const fromCartesian = Cesium.Cartesian3.fromDegrees(from[0], from[1], from[2]); + const toCartesian = Cesium.Cartesian3.fromDegrees(to[0], to[1], to[2]); + + const heading = this.computeHeading(fromCartesian, toCartesian); + const pitch = this.computePitch(fromCartesian, toCartesian); + let viewer = window.viewerM + viewer.camera.flyTo({ + destination: fromCartesian, + orientation: { + heading: heading, + pitch: pitch, + roll: 0.0 + }, + duration: 3 + }); + }, + handleNodeClick(data,node) { + if(data.children && data.children.length >0) { + //鐐瑰嚮鐖剁骇 + const from = [data.children[0].longitude,data.children[0].latitude, data.children[0].height]; + const to = [data.longitude,data.latitude, data.height]; + // this.flyToAndLookAt(from, to); + } else { + //鐐瑰嚮瀛愮骇 + const from = [data.longitude,data.latitude, data.height]; + const to = [node.parent?.data?.longitude,node.parent?.data?.latitude, node.parent?.data?.height]; + // this.flyToAndLookAt(from, to); + } + this.$refs.initMap.DealVisualCone(data,node) + }, + dealTreeData(arrList){ + this.treeData = arrList + const childrenArr = arrList + .filter(item => Array.isArray(item.children)) + .map(item => item.children) + .reduce((acc, cur) => acc.concat(cur), []); + this.waypoints = childrenArr + console.log(childrenArr) + console.log(this.treeData) + }, + convertToTree(data) { + return data.map((item, index) => { + const parentId = 'air_' + index; + return { + id: parentId, + label: item.targetName, + longitude: item.longitude, + latitude: item.latitude, + height: item.altitude, + children: (item.ardGroundPoint || []).map((g, i) => { + return { + id: parentId + '_ground_' + i, + label: g.targetName, + longitude: g.longitude, + latitude: g.latitude, + height: g.height + } + }) + } + }); + }, + drawLines(treeData) { + console.log(treeData) + console.log(window) + console.log(window.viewerM) + let viewer = window.viewerM + + // 鏀堕泦绌轰腑鐐逛綅缃� + const airPositions = treeData.map(point => { + return Cesium.Cartesian3.fromDegrees( + point.longitude, + point.latitude, + point.height + ); + }); + + // 1. 绌轰腑鐐逛箣闂寸敤榛勮壊瀹炵嚎杩炴帴 + viewer.entities.add({ + polyline: { + positions: airPositions, + width: 2, + material: Cesium.Color.YELLOW + } + }); + + // 2. 姣忎釜绌轰腑鐐逛笌鍦伴潰鐐圭敤钃濊壊铏氱嚎杩炴帴 + treeData.forEach(point => { + const airPos = Cesium.Cartesian3.fromDegrees(point.longitude, point.latitude, point.height); + point.children.forEach(child => { + const groundPos = Cesium.Cartesian3.fromDegrees(child.longitude, child.latitude, child.height); + viewer.entities.add({ + polyline: { + positions: [airPos, groundPos], + width: 1, + material: new Cesium.PolylineDashMaterialProperty({ + color: Cesium.Color.BLUE, + dashLength: 8 + }) + } + }); + }); + }); + }, + addPoint(viewer, position, color, label) { + viewer.entities.add({ + name: label, + position, + point: { + pixelSize: 10, + color: color, + heightReference: Cesium.HeightReference.NONE + }, + label: { + text: label, + font: '12px sans-serif', + pixelOffset: new Cesium.Cartesian2(10, -10), + style: Cesium.LabelStyle.FILL, + fillColor: color, + showBackground: true, + } + }); + }, + drawLine(viewer, positions, color, dashed = false) { + viewer.entities.add({ + polyline: { + positions, + width: 2, + material: dashed + ? new Cesium.PolylineDashMaterialProperty({ + color: color, + dashLength: 8, + }) + : color, + } + }); + }, handleClose(){ this.dialogVisible = false }, @@ -156,32 +355,61 @@ cancel(){ this.showModel = false }, + rotateAllPoints(dataList) { + return dataList.map(item => { + console.log(item) + const groundPoint = Cesium.Cartesian3.fromDegrees(item.longitude, item.latitude, item.height); + const towerPoint = Cesium.Cartesian3.fromDegrees(0, 0, 0); + + // 鏃嬭浆鍦伴潰鐐规湰韬紙浼氬彉锛屼絾缁曡嚜韬棆杞笉浼氱Щ鍔級 + const newGroundPoint = this.rotateAroundPoint( groundPoint,towerPoint, rotationAngle); + const newGroundCarto = Cesium.Cartographic.fromCartesian(newGroundPoint); + const newGround = { + ...item, + longitude: Cesium.Math.toDegrees(newGroundCarto.longitude), + latitude: Cesium.Math.toDegrees(newGroundCarto.latitude), + height: newGroundCarto.height + }; + console.log(newGround) + // 澶勭悊瀛愮┖涓偣 + newGround.children = item.children.map(child => { + const airPoint = Cesium.Cartesian3.fromDegrees(child.longitude, child.latitude, child.height); + const rotatedAirPoint = this.rotateAroundPoint( airPoint,towerPoint, rotationAngle); + const rotatedAirCarto = Cesium.Cartographic.fromCartesian(rotatedAirPoint); + + return { + ...child, + longitude: Cesium.Math.toDegrees(rotatedAirCarto.longitude), + latitude: Cesium.Math.toDegrees(rotatedAirCarto.latitude), + height: rotatedAirCarto.height + }; + }); + + return newGround; + }); + }, + //鍚堝苟閫昏緫 灏嗛檮杩憂绫宠寖鍥村唴鐨勭偣鍚堝苟 骞朵笖澶勭悊鎴愭暟鎹� mergePoint(arr,mergeNumber,viewer){ this.treeData = arr - console.log(mergeNumber) const result = this.replaceCloseChildrenWithHighestPoint(this.treeData,mergeNumber); - console.log(result) - console.log(viewer) - console.log(window.viewer) - const updated = this.insertRaisedPoints(result, 125.1541, 46.5542, 236, 130); + // const updated = this.insertRaisedPoints(result, 0,0, 236, 130); + const updated = this.insertRaisedPoints(result, globalon, globalat, towerHeight); this.treeData = updated - - console.log(updated) const airPoints = [] this.treeData.forEach(item => { const ground = item const air = item.children[0] - // 鍦伴潰鐐瑰埌绌轰腑鐐� 鈥� 鐧借壊铏氱嚎 + // 鍦伴潰鐐瑰埌7绌轰腑鐐� 鈥� 鐧借壊铏氱嚎 viewer.entities.add({ polyline: { positions: Cesium.Cartesian3.fromDegreesArrayHeights([ ground.longitude, ground.latitude, ground.height, air.longitude, air.latitude, air.height ]), - width: 2, + width: 5, material: new Cesium.PolylineDashMaterialProperty({ - color: Cesium.Color.WHITE, + color: Cesium.Color.RED, dashLength: 16.0 }) } @@ -194,13 +422,15 @@ viewer.entities.add({ polyline: { positions: Cesium.Cartesian3.fromDegreesArrayHeights(positions), - width: 2, - material: Cesium.Color.YELLOW + width: 5, + material: Cesium.Color.RED } }) } + console.log(this.treeData) }, - insertRaisedPoints(data, centerLon, centerLat, centerHeight, radius = 130) { + //鏁扮粍 濉旂殑绮惧害 濉旂殑绾害 濉旂殑楂樺害 鍗婂緞 + insertRaisedPoints(data, centerLon, centerLat, centerHeight, radius = 10) { const center = Cesium.Cartesian3.fromDegrees(centerLon, centerLat, centerHeight); const result = JSON.parse(JSON.stringify(data)); // 娣辨嫹璐濋伩鍏嶆薄鏌撳師鏁版嵁 const inserts = []; // 鐢ㄤ簬瀛樺偍鎻掑叆椤瑰強鍏剁洰鏍囦綅缃� @@ -346,35 +576,23 @@ }, getRowData(row){ console.log(row) - // //閫夋嫨濂芥ā鍨� 骞朵笖鑷姩椋炲埌妯″瀷浣嶇疆 - // const position = Cesium.Cartesian3.fromDegrees(0, 0, 0); - // // 璁剧疆妯″瀷鏂瑰悜锛堝彲閫夛級 - // // const heading = Cesium.Math.toRadians(135); // 鏈濅笢鍗楁柟鍚� - // let model = viewer.entities.getById("modelList"); - // const heading = Cesium.Math.toRadians(120); // 鏈濅笢鍗楁柟鍚� - // const pitch = 0; - // const roll = 0; - // const orientation = Cesium.Transforms.headingPitchRollQuaternion( - // position, - // new Cesium.HeadingPitchRoll(heading, pitch, roll) - // ); - // if(!model) { - // // 鍔犺浇 glTF 妯″瀷 - // const entity = viewer.entities.add({ - // id: "modelList", - // name: "modelList", - // position: position, - // orientation: orientation, - // model: { - // uri: "/Model/tower.glb", // 鏇挎崲鎴愪綘鐨勬ā鍨嬭矾寰� - // scale: 1000, - // }, - // }); - // viewer.flyTo(entity) - // }else { - // model.orientation = orientation - // } - this.showMap = true + this.modelName = row.modelName + this.templateType = row.modelType + this.deviceData = row + if(this.templateId){ + this.form.templateName = row.templateName || '' + } + this.chooseModelId = row.id + towerHeight = row.modelHeight || 45 + this.showMap =false + this.$nextTick(()=>{ + if(this.templateId){ + this.towerUrl = row.ardTowerModel.modelRoute + }else { + this.towerUrl = row.modelRoute + } + this.showMap = true + }) }, beforeDestroy() { // 娓呯悊 RAF 鍜屼簨浠� @@ -407,15 +625,78 @@ }, handleDrop (draggingNode, dropNode, dropType, ev) { console.log('鎷栨嫿瀹屾垚', { draggingNode, dropNode, dropType }) - // Element-UI 宸茬粡甯綘鎶� treeData 鐨勯『搴忚皟濂戒簡锛� - // 濡傛灉瑕佷繚瀛橀『搴忓埌鍚庣锛岄亶鍘� treeData 鍙戣姹傚嵆鍙� + }, + submit(){ + if(!this.form.templateName){ + return this.$message({ + message: '璇峰厛杈撳叆妯℃澘鍚嶇О鍐嶄繚瀛�', + type: 'warning' + }) + } + // this.dialogVisible = false + // const dealArr = this.submitDealData() + const transformed = this.treeData.map((ground, index) => { + const pointNumber = index + 1; + const child = ground.children?.[0] || {}; + + return { + altitude: child.height, + ardGroundPoint: [ + { + height: ground.height, + latitude: ground.latitude, + longitude: ground.longitude, + pointNumber: 1, + targetName: ground.label + } + ], + latitude: child.latitude, + longitude: child.longitude, + pointNumber: pointNumber, + targetName: child.label + }; + }) + console.log(transformed) + let parmas = { + templateName:this.form.templateName, + modelId:this.chooseModelId, + ardListWayPointsLS:transformed + } + addPoint(parmas).then(res=>{ + console.log(res) + if(res.code == 200) { + this.$message({ + message: '鏂板妯℃澘鎴愬姛', + type: 'success' + }) + this.$emit('on-submit') + this.$emit('close') + } + }) + console.log(parmas) + }, + //聽璁$畻鐐笰缁曠偣B閫嗘椂閽堟棆杞寚瀹氳搴﹀悗鐨勬柊浣嶇疆 + // 绌轰腑鐐规垨鑰呭湴闈㈢偣绗涘崱灏斿潗鏍� 濉旂殑绗涘崱灏斿潗鏍� 濉旂殑鏈濆悜鍊� + rotateAroundPoint(startPoint,pivotPoint,rotationAngle) { + //聽鍒涘缓涓�涓粠B鐐瑰埌鏈湴鍧愭爣绯荤殑杞崲鐭╅樀锛堜笢鏂瑰悜涓篨杞达紝鍖楁柟鍚戜负Y杞达紝鍨傜洿鏂瑰悜涓篫杞达級 + const transformationMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(pivotPoint); + //聽鑾峰彇涓栫晫鍧愭爣绯诲埌鏈湴鍧愭爣绯荤殑杞崲鐭╅樀 + const inverseTransformationMatrix = Cesium.Matrix4.inverse(transformationMatrix,new Cesium.Matrix4()); + //聽灏咥鐐硅浆鎹㈠埌灞�閮ㄥ潗鏍囩郴涓� + const localStartPoint = Cesium.Matrix4.multiplyByPoint(inverseTransformationMatrix, startPoint,new Cesium.Cartesian3()); + //聽璁$畻A鐐瑰湪灞�閮ㄥ潗鏍囩郴涓�嗘椂閽堟棆杞寚瀹氳搴﹀悗鐨勬柊浣嶇疆 + const rotatedX = localStartPoint.x * Math.cos(rotationAngle) + localStartPoint.y * Math.sin(rotationAngle); + const rotatedY = localStartPoint.y * Math.cos(rotationAngle) - localStartPoint.x * Math.sin(rotationAngle); + const rotatedZ = localStartPoint.z; //聽Z杞村潗鏍囦繚鎸佷笉鍙� + //聽灏嗘棆杞悗鐨勫眬閮ㄥ潗鏍囪浆鎹㈠洖涓栫晫鍧愭爣绯� + return Cesium.Matrix4.multiplyByPoint(transformationMatrix,聽new聽Cesium.Cartesian3(rotatedX,聽rotatedY,聽rotatedZ),聽new聽Cesium.Cartesian3()); } } } </script> <style scoped> .noScroll{ - height: calc(100vh - 185px); + height: calc(100vh - 175px); overflow: auto; position: relative; } @@ -426,7 +707,7 @@ text-align: center; } .chooseModel{ - height: 100px; + height: 120px; /* border: 1px solid #dddddd; */ } .cameraView{ @@ -528,4 +809,68 @@ background: transparent; box-shadow: none; } -</style> \ No newline at end of file +</style> +<style scoped> +.waypoint-panel { + width: 300px; + /* background: #1e1e1e; + color: white; */ + font-size: 14px; + height: 500px; + overflow-y: scroll; + /* overflow: scroll; */ +} + +.stats { + display: flex; + justify-content: space-around; + padding: 8px; + border-bottom: 1px solid #333; +} + +.stat-item { + display: flex; + align-items: center; +} + +.stat-item i { + margin-right: 4px; +} + +.waypoint-item { + border-bottom: 1px solid #333; + height: 40px; + line-height: 40px; +} + +.waypoint-item.active { + background-color: rgba(0, 122, 255, 0.3); /* 楂樹寒鑹� */ +} + +.waypoint-header { + display: flex; + align-items: center; + cursor: pointer; + padding: 4px 8px; +} + +.waypoint-header i { + margin-right: 6px; + height: 36px; + line-height: 36x; + transition: transform 0.2s; + font-size: 24px; +} +.waypoint-header .waypoint-index { + font-size: 24px; +} +.rotated { + transform: rotate(-90deg); +} + +.waypoint-content { + padding: 4px 8px; + display: flex; + gap: 8px; +} +</style> -- Gitblit v1.9.3