diff --git a/src/utils/player.ts b/src/utils/player.ts index edb91b8..01bcdaf 100644 --- a/src/utils/player.ts +++ b/src/utils/player.ts @@ -9,7 +9,7 @@ export default class PlayerUtils{ const player = new acapi.DigitalTwinPlayer(process.env.VUE_APP_PALYER_URL,{ domId, iid, - // reset:true, + reset:true, apiOptions:{ onReady: this.onReady, onLog: this.onLog, //可选参数,日志输出回调函数 @@ -34,7 +34,7 @@ export default class PlayerUtils{ onKeyPress:this.onKeyPress, } }, - keyEventTarget: 'none', + keyEventTarget: 'video', }) this.api = player.getAPI(); return player diff --git a/src/views/base.component.ts b/src/views/base.component.ts index 3ee7eb4..19431a1 100644 --- a/src/views/base.component.ts +++ b/src/views/base.component.ts @@ -45,6 +45,7 @@ export default class BaseComponent extends Vue { this.$message.error("视口未加载完成") return } + this.player.api.settings.setInteractiveMode(0) this.player.api.camera.lookAt( 11660869.788125, 3692656.110371, @@ -114,83 +115,14 @@ export default class BaseComponent extends Vue { }),(res)=>{ console.log(res) }); - this.player.api.customObject.moveTo(layer.data.map(async(item)=>{ - const position = (await this.player.utils.getLonLat(item.position))[0] - const newPosition = turf.destination(turf.point(position),layer.value==="car"?50:1,Math.random()*360,{units:"meters"}).geometry.coordinates - const newLocation = (await this.player.utils.getPosition(newPosition))[0]; - if(!newLocation[2]){ - newLocation[2] = 0 - } - return { - id:item.id, - location:newLocation, - "smoothTime": 5 - } - }),(data)=>{ - console.log(data) - }) - - this.timerList[layer.value] = setInterval(()=>{ - this.player.api.customObject.moveTo(layer.data.map(async(item)=>{ - const position = (await this.player.utils.getLonLat(item.position))[0] - const newPosition = turf.destination(turf.point(position),layer.value==="car"?50:1,Math.random()*360,{units:"meters"}).geometry.coordinates - const newLocation = (await this.player.utils.getPosition(newPosition))[0]; - if(!newLocation[2]){ - newLocation[2] = 0 - } - return { - id:item.id, - location:newLocation, - "smoothTime": 5 - } - }),(data)=>{ - console.log(data) - }) - },5000) - }else{ - layer.ids = options.map(item=>item.id); } + layer.ids = options.map(item=>item.id); } }) }else{ if(layer.selected){ this.player.api.marker.show(layer.ids) - if(trackCustom){ - this.player.api.customObject.moveTo(layer.data.map(async(item)=>{ - const position = (await this.player.utils.getLonLat(item.position))[0] - const newPosition = turf.destination(turf.point(position),layer.value==="car"?50:1,Math.random()*360,{units:"meters"}).geometry.coordinates - const newLocation = (await this.player.utils.getPosition(newPosition))[0]; - if(!newLocation[2]){ - newLocation[2] = 0 - } - return { - id:item.id, - location:newLocation, - "smoothTime": 5 - } - })) - - this.timerList[layer.value] = setInterval(()=>{ - this.player.api.customObject.moveTo(layer.data.map(async(item)=>{ - const position = (await this.player.utils.getLonLat(item.position))[0] - const newPosition = turf.destination(turf.point(position),layer.value==="car"?50:1,Math.random()*360,{units:"meters"}).geometry.coordinates - const newLocation = (await this.player.utils.getPosition(newPosition))[0]; - if(!newLocation[2]){ - newLocation[2] = 0 - } - return { - id:item.id, - location:newLocation, - "smoothTime": 5 - } - })) - },5000) - } }else{ - if(trackCustom){ - clearInterval(this.timerList[layer.value]); - this.timerList[layer.value] = null; - } this.player.api.marker.hide(layer.ids) } } diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts index afbf9e0..5239b18 100644 --- a/src/views/overview.component.ts +++ b/src/views/overview.component.ts @@ -129,24 +129,25 @@ export default class OverViewComponent extends BaseComponent { } layer.selected = !layer.selected; if(layer.type === "moveMarker"){ - this.addCustom(layer,true) + this.addMarker(layer,true) } } //进入自由导览 - showView(){ + async showView (){ this.toggleAllPanel(); - this.player.api.camera.lookAt( - 11660667.474375, - 3692632.815, - 11.3054, + await this.player.api.camera.lookAt( + 11660670.518125, + 3692632.854824, + 15.530475, 0, - -0.822798, - 88.42289, - 2, - ()=>{ - this.player.api.settings.setInteractiveMode(1); - this.player.api.settings.setMainUIVisibility(false) - }) + 9.213877, + 85.199608, + 2 + ) + setTimeout(()=>{ + this.player.api.settings.setInteractiveMode(1); + this.player.api.settings.setMainUIVisibility(false) + },2000) //todo 进入自由导览 } @@ -191,7 +192,6 @@ export default class OverViewComponent extends BaseComponent { } } }) - console.log(layers) return layers }