소스 검색

feat:提交代码

jinx 4 년 전
부모
커밋
005eae8cc7
3개의 변경된 파일13개의 추가작업 그리고 7개의 파일을 삭제
  1. 8 1
      IndoorViewerAPI.js
  2. 2 1
      index.html
  3. 3 5
      js/popindoorAPI2.7.1.js

+ 8 - 1
IndoorViewerAPI.js

@@ -61780,7 +61780,7 @@ and limitations under the License.
             this.clearRefreshTimers(),
             this.fetchCurrentUser().then((function() {
 				//$('sidebar-menu-item li').has('span[data-original-title="控制点"]').hide()
-			
+				window.eventBus.emit('my-event');
                 return t.sendAuthenticationChanged()
             }
             ))
@@ -207498,10 +207498,17 @@ and limitations under the License.
             )).catch(u.handleWarning)
         }
         return t.prototype.initSideMenuItem = function() {
+			var j = this
+			window.eventBus = new EventBus();
+			window.eventBus.on('my-event', function () {
+
+				j.SidebarMenuService.closeMenu()
+			});
             var t = this
               , e = (new c.SidebarMenuItemBuilder).setKey(d.SidebarMenuItemsKey.EDITOR_MODES_GEO_REG).setTitle(this.gettext("Geo-Registration", void 0, "title")).setIcon(new r.IconInfo("material-icons","public")).setIsVisible((function() {
                 return t.canWriteAnyDataset()
             }
+			
             )).setClassCallback(this.getClassForMode((function() {
                 return t.ModeService.isGeoRegistrationMode()
             }

+ 2 - 1
index.html

@@ -24,8 +24,9 @@
     const ossPrefixDep = 'https://laser.4dkankan.com/public/';
     const sceneNum = '@replace';
     //const sceneNum = 't-gcKxRmU';
-	//const sceneNum = 't-iksBApb';
+    // const sceneNum = 't-iksBApb';
 </script>
+<script src="./bus/bus.js"></script>
 <script src="IndoorViewerAPI.js"></script>
 <script type="text/javascript" src="js/OBJExporter.js"></script>
 <script type="text/javascript" src="js/Animation.js"></script>

+ 3 - 5
js/popindoorAPI2.7.1.js

@@ -127,7 +127,7 @@ var HighlightSiteModelLayer = function(main_view, main_scene, map_view, map_scen
 
         var userService = IV.injector.get("UserService");
         //如果没有打开控制点面板,就打开
-        if (userService.isAdmin()&&!IV.myMap) {
+        if (userService.isAdmin() && !IV.myMap) {
             var main_view = IV.getMainView();
             IV.myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
             main_view.addToScene(IV.myMap);
@@ -135,7 +135,7 @@ var HighlightSiteModelLayer = function(main_view, main_scene, map_view, map_scen
         //如果没有关闭控制点面板,就关闭
         else if (!userService.isAdmin()) {
             var menu_items = IV.getMenuItems();
-            if(menu_items[menu_items.length-1].title == '控制点'){
+            if (menu_items[menu_items.length - 1].title == '控制点') {
                 menu_items.pop();
                 IV.myMap = null;
             }
@@ -950,8 +950,6 @@ var Setting = function() {
     var userService = IV.injector.get("UserService");
     var general_setting = null;
     var main_view = IV.getMainView();
-    console.log('!!!!!!!!!!!!!!!!!!!!!!!')
-    console.log(main_view)
     var main_scene = main_view.scene;
     var map_view = IV.getMapView();
     var map_scene = map_view.scene;
@@ -1040,7 +1038,7 @@ var Setting = function() {
             var highlightSiteModelLayer = new HighlightSiteModelLayer(main_view, main_scene, map_view, map_scene);
             map_view.addToScene(highlightSiteModelLayer);
         }
-        if (userService.isAdmin()&&!IV.myMap) {
+        if (userService.isAdmin() && !IV.myMap) {
             IV.myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
             main_view.addToScene(IV.myMap);
         }