From d12e030d8a7690d79c5786bc2a786b6c21a24433 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Jun 2021 16:31:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 widgets/visualAngle/Widget.js |  114 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/widgets/visualAngle/Widget.js b/widgets/visualAngle/Widget.js
index fdead0b..5438f0e 100644
--- a/widgets/visualAngle/Widget.js
+++ b/widgets/visualAngle/Widget.js
@@ -29,53 +29,87 @@
 			layers: {},
 			startup: function () {
 				// 暴露在外的接口
-				var that = this;
-				$(".v-a-One").click(function () {
-					$(this).addClass('on').siblings().removeClass('on');
-					// 控制视角平移:
-					that.map.scene.screenSpaceCameraController.enableRotate = true;
+				var that = this,
+					isFixed = false,
+					isFly = false
+					, noFixed = () => {
+						// $(this).addClass('on').siblings().removeClass('on');
+						// 控制视角平移:
+						that.map.scene.screenSpaceCameraController.enableRotate = true;
+						// true: 允许左键按下视角平移;
+						// false: 禁止左键按下视角平移;
+						// 控制视角缩放:
+						that.map.scene.screenSpaceCameraController.enableZoom = true;
+						// true: 允许中键缩放视角;
+						// false:禁止中键缩放视角;
+						// 控制视角旋转:
+						that.map.scene.screenSpaceCameraController.enableTilt = true;
+						// true:允许视角旋转;
+						// false:禁止视角旋转;
+					};
 
-					// true: 允许左键按下视角平移;
+				// $(".v-a-One").click(function () {
+				// 	topic.publish('closeFlyRoute', 'FlyRoute');
+				// 	$(this).addClass('on').siblings().removeClass('on');
+				// 	// 控制视角平移:
+				// 	that.map.scene.screenSpaceCameraController.enableRotate = true;
+				// 	// true: 允许左键按下视角平移;
+				// 	// false: 禁止左键按下视角平移;
+				// 	// 控制视角缩放:
+				// 	that.map.scene.screenSpaceCameraController.enableZoom = true;
+				// 	// true: 允许中键缩放视角;
+				// 	// false:禁止中键缩放视角;
+				// 	// 控制视角旋转:
+				// 	that.map.scene.screenSpaceCameraController.enableTilt = true;
+				// 	// true:允许视角旋转;
+				// 	// false:禁止视角旋转;
 
-					// false: 禁止左键按下视角平移;
-
-					// 控制视角缩放:
-					that.map.scene.screenSpaceCameraController.enableZoom = true;
-
-					// true: 允许中键缩放视角;
-
-					// false:禁止中键缩放视角;
-
-					// 控制视角旋转:
-					that.map.scene.screenSpaceCameraController.enableTilt = true;
-
-					// true:允许视角旋转;
-
-					// false:禁止视角旋转;
-
-				})
+				// })
 				$(".v-a-Two").click(function () {
-					
-					$(this).addClass('on').siblings().removeClass('on');
-					
+
+					// 关闭量算
+					topic.publish('closeMeasurement', 'Measurement');
+					// 关闭卷帘
+					topic.publish('closeRolling', 'Rolling');
+					// 关闭分屏
+					topic.publish('closeSplitScreen', 'SplitScreen');
+					// 关闭标记
+					topic.publish('closeSign', 'Sign');
+					// 飞行路线
+					$('.jimu-widget-CoorPosition').hide();
+					$('.jimu-widget-MapPrinting').hide();
+					$('.tool-y-box').stop().hide();
+					noFixed();
+					if (isFly) {
+						$(this).removeClass('on');
+						console.log('关闭飞行')
+						topic.publish('closeFlyRoute', 'FlyRoute');
+					} else {
+						$(this).addClass('on').siblings().removeClass('on');
+						console.log('开启飞行')
+						topic.publish('openFlyRoute', 'FlyRoute');
+					}
+					isFixed = false;
+					isFly = !isFly;
 				})
 				$(".v-a-Three").click(function () {
-					$(this).addClass('on').siblings().removeClass('on');
-					that.map.scene.screenSpaceCameraController.enableRotate = false
-					that.map.scene.screenSpaceCameraController.enableZoom = true
-					that.map.scene.screenSpaceCameraController.enableTilt = false
+					if (isFixed) {
+						$(this).removeClass('on');
+						topic.publish('closeFlyRoute', 'FlyRoute');
+						noFixed();
+						console.log('关闭固定')
+					} else {
+						console.log('开启固定')
+						topic.publish('closeFlyRoute', 'FlyRoute');
+						$(this).addClass('on').siblings().removeClass('on');
+						that.map.scene.screenSpaceCameraController.enableRotate = false
+						that.map.scene.screenSpaceCameraController.enableZoom = true
+						that.map.scene.screenSpaceCameraController.enableTilt = false
+					}
+					isFly = false;
+					isFixed = !isFixed;
 				})
 
-				// $('.RouteNavigate-tool').click(function () {
-				// 	$('.jimu-widget-RouteNavigate').show();
-				// 	$('.jimu-widget-MapPrinting').hide();
-				// 	$('.jimu-widget-CoorPosition').hide();
-				// 	$('.jimu-widget-Measurement').hide();
-				// 	$('.jimu-widget-Sign').hide();
-				// 	$('.jimu-widget-FlyRoute').hide();
-				// 	$('.jimu-widget-DynamicRiver').hide();
-				// 	$('.tool-y-box').toggle()
-				// })
 			},
 
 			closeToolBox: function (item) {

--
Gitblit v1.9.3