1

js/main_2020_show.js

@@ -12,7 +12,7 @@ $("#hotPannel .close, #hotPannel .iconquxiao").on('click',(e)=>{//关闭
     $("#hotPannel>div").css("display","");
     loadMonitor({id: "monitor", url:null })
     window.hotNeedUpdatePannel = null;
-    $(".hardware-list .hard-body").css("display",'block')//展开列表
+    //$(".hardware-list .hard-body").css("display",'block')//展开列表
 })
 
 $("#hotPannel input.mui-switch").on('change',(e)=>{//灯
@@ -15873,16 +15873,15 @@ window.Modernizr = function(n, e, t) {
                                 this.updatePannel()
                                 window.hotNeedUpdatePannel = this
 
-                                if (o.focus) {
+                                /* if (o.focus) {
                                     if (player.mode == 'panorama') {
                                         this.examine(player)
                                     } else if (player.mode != 'transitioning') {
-                                        player.focusPoint({
-                                            /* modelSize: size,  */
+                                        player.focusPoint({ 
                                             aim: this.mesh.position
                                         })
                                     }
-                                }
+                                } */
                             } else {
                             }
                         }
@@ -15988,6 +15987,11 @@ window.Modernizr = function(n, e, t) {
             var hasHardware;
             if(window.MP_PREFETCHED_MODELDATA.flyInOnlyBySwitch){ 
                 hasHardware = this.showPannel({focus:true});
+                if (player.mode == 'dollhouse' || player.mode == 'floorplan') {
+                    player.focusPoint({ 
+                        aim: this.mesh.position
+                    })
+                }
                 if(player.mode != 'panorama' || !player.currentPano)return; 
             }else{
                  

js/showHardware.js

@@ -64,7 +64,7 @@ $(function () {
     );
     console.log(row);
     window.hardwareHotList[row.id] &&
-      window.hardwareHotList[row.id].showPannel({ focus: true });
+      window.hardwareHotList[row.id].examine(player)//.showPannel({ focus: true });
   });
 
   $(".hard-header").click(function () {