xushiting 3 lat temu
rodzic
commit
ac97d2b5cf
2 zmienionych plików z 13 dodań i 9 usunięć
  1. 1 1
      index.html
  2. 12 8
      main.js

+ 1 - 1
index.html

@@ -29,7 +29,7 @@
 	// const sceneNum = 't-HMGa5zn';
 </script>
 <script src="https://laser.4dkankan.com/public/bus/bus.js"></script>
-<script src="https://laser.4dkankan.com/public/main.js?v=12"></script>
+<script src="https://laser.4dkankan.com/public/main.js?v=8"></script>
 <script type="text/javascript" src="https://laser.4dkankan.com/public/js/OBJExporter.js"></script>
 <script type="text/javascript" src="https://laser.4dkankan.com/public/js/Animation.js"></script>
 <script type="text/javascript" src="https://laser.4dkankan.com/public/js/AnimationHandler.js"></script>

+ 12 - 8
main.js

@@ -52886,13 +52886,13 @@ and limitations under the License.
                withCredentials: !0
            };
 
-        
+			
            let matchingUrls = [
                'api/images',
                'api/tiled_maps',
                'api/site_model',
-               'api/site_model/within',
-               'api/site_model/within_polygon',
+               //'api/site_model/within',
+               //'api/site_model/within_polygon',
                'api/search/site_model',
                'api/search/poi',
                'api/groups',
@@ -52900,7 +52900,7 @@ and limitations under the License.
                'api/user',
                'api/users',
                'api/route',
-               //'status/health',
+               'status/health',
                'api/configs',
                'api/poi_type_groups',
                'api/poi_types',
@@ -52913,7 +52913,7 @@ and limitations under the License.
                    o.url = '/indoor/'+sceneNum+'/'+o.url;
                }
            }
-        
+			
         console.log('url:'+o.url);  
         //o.url = window.location.origin+o.url;
         //if(o.url.indexOf('api/site_model/closest')>-1||o.url.indexOf('api/images/')>-1||o.url.indexOf('api/site_model/within')>-1||o.url.indexOf('api/site_model/within_polygon')>-1||o.url.indexOf('api/search/site_model')>-1||o.url.indexOf('api/search/poi')>-1){
@@ -152996,8 +152996,10 @@ and limitations under the License.
                        console.log('url2:'+a);
                        if(a.indexOf('/api')>-1||a.indexOf('/api/pois/filter')>-1||a.indexOf('/api/poses')>-1||a.indexOf('/api/images')>-1){
                           //o = 'GET';
-                          //a = '../../indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
-                          a = '/indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
+                          if(a.indexOf('/indoor/'+sceneNum) == -1){
+							  a = '/indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
+						  }
+                          
                           a = window.location.origin+a.replace(ossPrefixDep,"");
                        } 
                        else if(a.indexOf('/poi/icon')>-1||a.indexOf('/poi/image')>-1){
@@ -153010,7 +153012,9 @@ and limitations under the License.
                                    a = '/indoor/'+sceneNum+a.substring(a.indexOf('/api/'));
                                    a = window.location.origin+a.replace(ossPrefixDep,"");
                                 }
-                               
+                               else if(a.indexOf('/status/health')>-1){
+									a = window.location.origin+'/indoor/'+sceneNum+"/"+a.replace(ossPrefixDep,"");
+							   }
                                y.open(o, a, !0),
                                M(l, (function(t, e) {
                                    F(t) && y.setRequestHeader(e, t)