Merge branch 'master' of http://xny.yj-3d.com:3000/zh/sdk4.0 into develop
This commit is contained in:
@ -145,7 +145,8 @@ class TrajectoryMotion extends Base {
|
||||
|
||||
set show(v) {
|
||||
if (typeof v === "boolean") {
|
||||
if (!this.isShowView) {
|
||||
let sdkD = get2DView()
|
||||
if (!this.isShowView || !sdkD) {
|
||||
this.options.show = v
|
||||
if (this.originalOptions) {
|
||||
this.originalOptions.show = v
|
||||
@ -156,10 +157,10 @@ class TrajectoryMotion extends Base {
|
||||
this.model.show = false
|
||||
}
|
||||
else {
|
||||
this.model.show = (!this.showView || this.showView == 3) ? this.modelShow : false
|
||||
this.model.show = (!this.showView || this.showView == 3 || !sdkD) ? this.modelShow : false
|
||||
}
|
||||
|
||||
if ((!this.showView || this.showView == 3)) {
|
||||
if ((!this.showView || this.showView == 3 || !sdkD)) {
|
||||
this.line.polyline.material = this.lineShow ? new Cesium.PolylineDashMaterialProperty({
|
||||
color: new Cesium.Color.fromCssColorString('#00ffff'),
|
||||
dashLength: 20,
|
||||
@ -175,18 +176,18 @@ class TrajectoryMotion extends Base {
|
||||
})
|
||||
}
|
||||
for (let i = 0; i < this.keyPoints.length; i++) {
|
||||
this.keyPoints[i].show = (!this.showView || this.showView == 3) ? this.keyPointShow : false
|
||||
this.keyPoints[i].show = (!this.showView || this.showView == 3 || !sdkD) ? this.keyPointShow : false
|
||||
}
|
||||
if (this.realTimeRoute) {
|
||||
this.realTimeLine && (this.realTimeLine.show = (!this.showView || this.showView == 3) ? true : false)
|
||||
this.realTimeLine && (this.realTimeLine.show = (!this.showView || this.showView == 3 || !sdkD) ? true : false)
|
||||
}
|
||||
this.label && (this.label.show = (!this.showView || this.showView == 3) ? this.options.label.show : false)
|
||||
this.fuelLabel && (this.fuelLabel.show = (!this.showView || this.showView == 3) ? this.options.fuelShow : false)
|
||||
}
|
||||
else {
|
||||
this.model.show = (!this.showView || this.showView == 3) ? this.options.show : false
|
||||
this.model.show = (!this.showView || this.showView == 3 || !sdkD) ? this.options.show : false
|
||||
let show = this.options.show
|
||||
if ((!this.showView || this.showView == 3)) {
|
||||
if ((!this.showView || this.showView == 3 || !sdkD)) {
|
||||
show = this.options.show
|
||||
}
|
||||
else {
|
||||
@ -660,7 +661,7 @@ class TrajectoryMotion extends Base {
|
||||
})
|
||||
this.TweenAnimate.pause()
|
||||
setTimeout(() => {
|
||||
_this.model.isMove = false
|
||||
_this.model && (_this.model.isMove = false)
|
||||
}, 200);
|
||||
}
|
||||
}
|
||||
@ -679,9 +680,10 @@ class TrajectoryMotion extends Base {
|
||||
return this.options.model.show
|
||||
}
|
||||
set modelShow(v) {
|
||||
let sdkD = get2DView()
|
||||
this.options.model.show = v
|
||||
let show = v
|
||||
if (this.show && (!this.showView || this.showView == 3)) {
|
||||
if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
|
||||
show = v
|
||||
}
|
||||
else {
|
||||
@ -755,7 +757,8 @@ class TrajectoryMotion extends Base {
|
||||
}
|
||||
this.options.line.show = v
|
||||
let show = v
|
||||
if ((!this.showView || this.showView == 3)) {
|
||||
let sdkD = get2DView()
|
||||
if ((!this.showView || this.showView == 3 || !sdkD)) {
|
||||
show = v
|
||||
}
|
||||
else {
|
||||
@ -979,6 +982,7 @@ class TrajectoryMotion extends Base {
|
||||
|
||||
set firstPersonView(v) {
|
||||
// this.state = true
|
||||
let sdkD = get2DView()
|
||||
let splitSdk = getSdk()
|
||||
if (get2DView() || splitSdk.sdkD || !this.show) {
|
||||
v = false
|
||||
@ -1033,7 +1037,7 @@ class TrajectoryMotion extends Base {
|
||||
CameraController(this.sdk, true)
|
||||
if (this.model && this.modelShow && this.show) {
|
||||
let show = true
|
||||
if (this.show && (!this.showView || this.showView == 3)) {
|
||||
if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
|
||||
show = true
|
||||
}
|
||||
else {
|
||||
@ -1161,8 +1165,9 @@ class TrajectoryMotion extends Base {
|
||||
}
|
||||
set labelShow(v) {
|
||||
this.options.label.show = v
|
||||
let sdkD = get2DView()
|
||||
let show = v
|
||||
if (this.show && (!this.showView || this.showView == 3)) {
|
||||
if (this.show && (!this.showView || this.showView == 3 || !sdkD)) {
|
||||
show = v
|
||||
}
|
||||
else {
|
||||
|
Reference in New Issue
Block a user