Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/scene_wisdom

js/main_2020_edit.js

@@ -14950,6 +14950,7 @@ function o(a, s, l) {
                 
                 this.updatePannel()
                 window.hotNeedUpdatePannel = this
+                return true
             }else{
                 $("#hotPannel>div").css("display","");
             }
@@ -15038,9 +15039,9 @@ function o(a, s, l) {
         n.prototype.examine = function(e, options) {
             options = options || {}
             var hotPop = document.getElementById('popup');
-            
+            var hasHardware
             if(window.MP_PREFETCHED_MODELDATA.flyInOnlyBySwitch){ 
-                this.showPannel();
+                hasHardware = this.showPannel();
                 if(player.mode != 'panorama' || !player.currentPano)return; 
             }else{
                 if(this.linkType!="common" && this.infoAttribute.iframe && this.infoAttribute.iframe[0] && !options.dontOpen){
@@ -15109,7 +15110,7 @@ function o(a, s, l) {
              
             var i = document.getElementById("popup");
             
-            if (this.link && !options.dontOpen) {
+            if (this.link && !options.dontOpen && !hasHardware) {
                 g_currentHot = this,
                 i.style.display = "block",
                 i.classList.add("wait");

js/main_2020_show.js

@@ -15440,7 +15440,7 @@ window.Modernizr = function(n, e, t) {
             if(d.infoAttribute.hardware){
                 var Code = d.infoAttribute.hardware.deviceCode;
                 if(Code!= void 0){
-                    window.hardwareHotList[Code] = this
+                    window.hardwareHotList[Code] = this//硬件列表
                 }
             }
             
@@ -15546,10 +15546,9 @@ window.Modernizr = function(n, e, t) {
                         this.examine(player)
                     }else if(player.mode != 'transitioning'){
                         player.focusPoint({/* modelSize: size,  */aim: this.mesh.position})
-                    }
-                    
+                    } 
                 }
-                
+                return true
                 
             }else{
                 $("#hotPannel>div").css("display","");
@@ -15633,9 +15632,9 @@ window.Modernizr = function(n, e, t) {
             options = options || {} 
             var hotPop = document.getElementById('popup');
             
-            
+            var hasHardware;
             if(window.MP_PREFETCHED_MODELDATA.flyInOnlyBySwitch){ 
-                this.showPannel();
+                hasHardware = this.showPannel();
                 if(player.mode != 'panorama' || !player.currentPano)return; 
             }else{
                  
@@ -15715,7 +15714,7 @@ window.Modernizr = function(n, e, t) {
                 if(!player.currentPano)return;
                 
                 //获取那个热点的链接 
-                if(this.link){
+                if(this.link && !hasHardware){
                     g_currentHot = this;		
                     hotPop.style.display = "block";
                     hotPop.classList.add("wait");