|
|
@@ -16933,6 +16933,60 @@ function o(a, s, l) {
|
|
|
initHot(this)
|
|
|
this.roomLabels = []
|
|
|
|
|
|
+
|
|
|
+ let finish = (e={})=>{
|
|
|
+
|
|
|
+
|
|
|
+ g_data2 = hotMatcher(e)
|
|
|
+ this.hotsCount = 0;
|
|
|
+ //因为热点保存后在hots里的顺序会被修改，所以使用order来记录顺序，这里要重排序：
|
|
|
+
|
|
|
+ let create = ()=>{
|
|
|
+ //alertInfo('开始计算',{dontAutoClose:true, hideCloseBtn:true, name:'getPanoVisibles'}); //暂时没找到很多热点要计算的场景
|
|
|
+
|
|
|
+ if(e.hots){
|
|
|
+ var sids = Object.keys(e.hots).sort((a,b)=>{return e.hots[a].order - e.hots[b].order});
|
|
|
+ sids.forEach((sid)=>{
|
|
|
+ e.hots[sid].sid = sid
|
|
|
+ if(e.hots[sid].texType == 'photo' && !e.hots[sid].texSrc)return console.error('有photo热点无texSrc',e.hots[sid])
|
|
|
+
|
|
|
+ new Hot(e.hots[sid], e.hots[sid].version != 'multi' && "byHot" )
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ if(e.overlays){
|
|
|
+ e.overlays.forEach((info)=>{
|
|
|
+ new Hot(info, 'byOverlay')
|
|
|
+ })
|
|
|
+ }
|
|
|
+ Hot.createHotList();
|
|
|
+
|
|
|
+ if(DATA.roomLabels){
|
|
|
+ DATA.roomLabels.forEach((data)=>{
|
|
|
+ this.roomLabels.push(new RoomLabel(data))
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ //alertClose('getPanoVisibles');
|
|
|
+ Hot.startLoad()
|
|
|
+ editTool.loadDone('data2', e)
|
|
|
+ }
|
|
|
+
|
|
|
+ if(player.currentPano){
|
|
|
+ create()
|
|
|
+ }else{
|
|
|
+ let f = ()=>{
|
|
|
+ window.bus.removeEventListener('playerAndModelReady',f)
|
|
|
+ create()
|
|
|
+ }
|
|
|
+ window.bus.addEventListener('playerAndModelReady',f)
|
|
|
+ }
|
|
|
+ e.weixinDesc && (g_weixinObj.desc = e.weixinDesc)
|
|
|
+
|
|
|
+ r.resolve()
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
var r = $.Deferred()
|
|
|
, e = g_Prefix + "data/" + this.sid + "/data2.js?" + randomTime().getTime();
|
|
|
return a.get(e, {
|
|
|
@@ -16940,71 +16994,16 @@ function o(a, s, l) {
|
|
|
auth: this.isPublic ? null : u.authorizationHeader
|
|
|
}).done(function(e) {
|
|
|
window.data2 = e;
|
|
|
-
|
|
|
-
|
|
|
- if(!e){
|
|
|
- console.error("data2 is null")
|
|
|
- }else{
|
|
|
- g_data2 = hotMatcher(e)
|
|
|
- this.hotsCount = 0;
|
|
|
- //因为热点保存后在hots里的顺序会被修改，所以使用order来记录顺序，这里要重排序：
|
|
|
-
|
|
|
- let create = ()=>{
|
|
|
- //alertInfo('开始计算',{dontAutoClose:true, hideCloseBtn:true, name:'getPanoVisibles'}); //暂时没找到很多热点要计算的场景
|
|
|
-
|
|
|
- if(e.hots){
|
|
|
- var sids = Object.keys(e.hots).sort((a,b)=>{return e.hots[a].order - e.hots[b].order});
|
|
|
- sids.forEach((sid)=>{
|
|
|
- e.hots[sid].sid = sid
|
|
|
- if(e.hots[sid].texType == 'photo' && !e.hots[sid].texSrc)return console.error('有photo热点无texSrc',e.hots[sid])
|
|
|
-
|
|
|
- new Hot(e.hots[sid], e.hots[sid].version != 'multi' && "byHot" )
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
- if(e.overlays){
|
|
|
- e.overlays.forEach((info)=>{
|
|
|
- new Hot(info, 'byOverlay')
|
|
|
- })
|
|
|
- }
|
|
|
- Hot.createHotList();
|
|
|
-
|
|
|
-
|
|
|
- if(DATA.roomLabels){
|
|
|
- DATA.roomLabels.forEach((data)=>{
|
|
|
- this.roomLabels.push(new RoomLabel(data))
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
- //alertClose('getPanoVisibles');
|
|
|
- Hot.startLoad()
|
|
|
- editTool.loadDone('data2', e)
|
|
|
- }
|
|
|
-
|
|
|
- if(player.currentPano){
|
|
|
- create()
|
|
|
- }else{
|
|
|
- let f = ()=>{
|
|
|
- window.bus.removeEventListener('playerAndModelReady',f)
|
|
|
- create()
|
|
|
- }
|
|
|
- window.bus.addEventListener('playerAndModelReady',f)
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- e.weixinDesc && (g_weixinObj.desc = e.weixinDesc)
|
|
|
+ finish(e)
|
|
|
|
|
|
-
|
|
|
- }
|
|
|
|
|
|
- r.resolve()
|
|
|
}
|
|
|
.bind(this)).fail(function() {
|
|
|
- console.log("没有热点"),
|
|
|
-
|
|
|
- editTool.loadDone('data2', {})
|
|
|
- r.resolve()
|
|
|
+ /* console.log("没有热点"),
|
|
|
+ Hot.startLoad()
|
|
|
+ editTool.loadDone('data2', {}) */
|
|
|
+ finish()
|
|
|
+
|
|
|
}),
|
|
|
r
|
|
|
}
|
xzw