1

css/lzb.css

@@ -1,4 +1,4 @@
-i {
+i {
     font-style: normal;
 }
 
@@ -1003,6 +1003,10 @@ ul.MenuOptions li.chosen {
     background-repeat: no-repeat;
     background-position-y: center;
 }
+.toolRight .hotpoint .spotList li .number{
+    color:#828282;
+    margin-right:10px;
+}
  .overlayList li .icon{
      background-image:url(../images/edit/box_video.png);
  }

js/edit.js

@@ -498,7 +498,7 @@ Hotpoint.prototype.editHot = function (target) {
   this.hotpointDetail.removeClass("atRight");
 
   $("#hotpointDetail .audio.mediaUpload").find("input").val('');  // 点击编辑导览清空上一次文件
-  var playIcon = '139.159.225.37:85/images/play.png';
+  var playIcon = 'images/play.png';
   var $layout = $("#hotpointDetail")[0];
   $layout.targetDOM = target.closest("li")[0];//closest匹配选择器的第一个祖先元素
   //编辑时将热点列表唯一标识带入，以便后期保存使用识别
@@ -651,7 +651,7 @@ Hotpoint.prototype.addmedia = function () {
     if (ev.target.tagName.toUpperCase() === 'INPUT') {
       fileHandle.call(ev.target)
     }
-     ev.target.value = null
+     
   })
   $('.edit-fun-images').on('click', function (ev) {
     var $tag = $(ev.target)
@@ -927,7 +927,7 @@ Hotpoint.prototype.saveHot = function () {
       args.images = imgUrls
       //获取热点视频所有的路径
       return new Promise(function (resolve, reject) {
-        upload($videos, 'images', resolve)
+        upload($videos, 'videos', resolve)
       })
     }).then(function (videoUrls) {
       args.video = videoUrls
@@ -1484,7 +1484,7 @@ function uploadFile(file, type, callback) {
   formData.append('name', number)
   formData.append('dir', type)
   formData.append('random', true)
-  formData.append('file', file, getRandomSid()+".jpg")
+  formData.append('file', file)
 
  
 

js/main_2020_edit.js

@@ -6425,7 +6425,7 @@ function o(a, s, l) {
                         t.player.zoomOutIncrementally()
                     })
                 }(0, l),
-                s.data.enable_social_sharing && s.data.is_public && M.share.enabled && (K.init(s.data.name),
+                s.data.enable_social_sharing && s.data.is_public && M.share.enabled && (K.init(MP_PREFETCHED_MODELDATA.name/* s.data.name */),
                 K.on(ae.OPENED, (r = document.getElementById("share-modal"),
                 function() {
                     _e("share"),
@@ -8197,7 +8197,7 @@ function o(a, s, l) {
                         document.getElementById("cobrandTitle").classList.add("hidden")),
                         !0) : (document.getElementById("model-title").classList.add("hidden"),
                         !1)
-                    }(e.name, e.coBrand)) {
+                    }(MP_PREFETCHED_MODELDATA.name, e.coBrand)) {
                         if (function(e) {
                             e ? (w = !0,
                             v.innerHTML = e) : v.classList.add("hidden")
@@ -13730,7 +13730,12 @@ function o(a, s, l) {
                     }  
                 }catch(e){console.log(e) }
                 
-                window.MP_PREFETCHED_MODELDATA = t,
+                window.MP_PREFETCHED_MODELDATA = t
+                
+                t.model.summary = t.summary
+                t.model.name = t.name
+                
+                
                 re(.7),
                 function() {
                     function y(e) {
@@ -16758,14 +16763,14 @@ function o(a, s, l) {
                     .bind(this)).fail(function() {
                         console.log("Data.js is empty");
                         //直接使用data2
-                        window.hotData = data2 
+                        /* window.hotData = data2 
                         this.createHotItem(data2, this.hots);
                         
                         for(let i in this.hots){
-                            data2[i] && this.hots[i].initStyleImg(e[i]);
+                            e[i] && this.hots[i].initStyleImg(e[i]);
                         }
                         
-                        
+                         */
                         
                         
                         

js/main_2020_show.js

@@ -6609,7 +6609,7 @@ window.Modernizr = function(n, e, t) {
                 }),
                 m(e, t),
                 A(e, t),
-                e.data.enable_social_sharing && e.data.is_public && Q.share.enabled && (Ce.init(e.data.name),
+                e.data.enable_social_sharing && e.data.is_public && Q.share.enabled && (Ce.init(MP_PREFETCHED_MODELDATA.name/* e.data.name */),
                 Ce.on(Me.OPENED, function() {
                     var e = document.getElementById("share-modal");
                     return function() {
@@ -7194,7 +7194,7 @@ window.Modernizr = function(n, e, t) {
             });
 
             /***********************方奕卓 热点列表事件监听 ************************/
-            if(window.MP_PREFETCHED_MODELDATA.showHotListSta === 'true') {
+            if(window.MP_PREFETCHED_MODELDATA.showHotListSta) {
                 $('#hotList').css('display', '');
                 $('#hotList').on('click',function(e){
                     l(e);
@@ -8578,7 +8578,7 @@ window.Modernizr = function(n, e, t) {
               , D = !1
               , N = {
                 populate: function(e) {
-                    if (n(e.name, e.coBrand)) {
+                    if (n(MP_PREFETCHED_MODELDATA.name, e.coBrand)) {
                         if (r(e.description),
                         o(e.contactName, e.phone, e.email, e.formatted_contact_phone),
                         a(e.address),
@@ -14230,6 +14230,10 @@ window.Modernizr = function(n, e, t) {
                 }catch(e){console.log(e) }
                  
 				window.MP_PREFETCHED_MODELDATA = data; 
+                data.model.summary = data.summary
+                data.model.name = data.name
+                
+                
 				progressUpdate(0.7);
 				StartLoad(); //xzw  someData.js是我整合的 原本在html里 但这样每个场景的html都不一样了
                 if(data.weixinDesc){
@@ -23498,18 +23502,24 @@ window.Modernizr = function(n, e, t) {
                             if(window.vrEnabled && !window.orientEnable){//很可能没能触发陀螺仪事件
                                 if(m.detectIOS()/*  && m.detectSafari()  */){
                                     var b = m.iosVersion();//{major: 10, minor: 3, patch: 1}  
-                                    //console.log("开始获取权限  major"+b.major) 
+                                    console.log("开始获取权限  major"+b.major) 
                                     if(b.major == 12 && b.minor>=2){ 
                                         if(browser.detectSafari()) 	 alert("浏览器未能检测到转动。为完整体验VR效果，请打开 “设置” > “Safari” > “隐私和安全” 下的 “运动和方向访问” 开关，然后刷新此页面。")
                                         else{//app??
                                             alert("浏览器未能检测到转动。请在手机或浏览器设置中开启了运动和方向访问等设置，然后刷新此页面。")
                                         }
                                     }else if(b.major >= 13){
+                                        if(!window.location.href.includes("https://")){
+                                            console.log("需要https");
+                                            alert("当前网页下，高于ios12的浏览器版本可能不支持陀螺仪开启。")
+                                           return; 
+                                        }
                                         var hasFailed = window.vrPermission && (window.vrPermission.deviceMotion != "granted" || window.vrPermission.deviceOrientation != "granted")
-                                        hasFailed || alert("'请点击“允许”'");
-                                        setTimeout(()=>{
+                                         
+                                        setTimeout(()=>{//如果使用了alert会阻断这个事件，报以下错requusting device orientation or motion access requires a user gesture
                                             if(!window.vrEnabled || window.orientEnable)return;
                                             vrPermissionCallBack("reset")	
+                                            console.log(window.DeviceMotionEvent)
                                             if ( window.DeviceMotionEvent && window.DeviceMotionEvent.requestPermission && typeof window.DeviceMotionEvent.requestPermission === 'function') {
                                                 console.log("开始获取权限1")
                                                 ///注意:需要https   本地服务器permissionState会得到denied
@@ -23878,13 +23888,13 @@ window.Modernizr = function(n, e, t) {
                 if (this.vrCameraNeedsUpdate = this.vrCameraNeedsUpdate || this.bananaFov !== a.fov || this.bananaReal_aspect !== a.aspect * this.bananaAspect || this.bananaNear !== a.near || this.bananaFar !== a.far,
                 this.vrCameraNeedsUpdate) {
                     this.vrCameraNeedsUpdate = !1,
-                    console.debug("vrCameraUpdate"),
+                    //console.debug("vrCameraUpdate"),
                     this.bananaFocus = a.focus,
                     this.bananaFov = a.fov,
                     this.bananaReal_aspect = a.aspect * this.bananaAspect,
                     this.bananaNear = a.near,
                     this.bananaFar = a.far,
-                    console.debug(a.aspect),
+                    //console.debug(a.aspect),
                     this.bananaFocus = 10;
                     var b, c, d = a.projectionMatrix.clone(), e = this.overlap / 2, f = e * this.bananaNear / this.bananaFocus, g = this.bananaNear * Math.tan(Math.PI / 180 * this.bananaFov * .5);
                     this.eyeLeft.elements[12] = -e,