merge: merge github_alpha into 9.x_github_merge_dev

Signed-off-by: liangjinping <[email protected]>
Change-Id: I9b37556dc297450e91e6f9f0a10a6f2448f94007

Author: lykling

cyber/setup.bash

@@ -6,25 +6,25 @@ export APOLLO_BAZEL_DIST_DIR="${APOLLO_CACHE_DIR}/distdir"
 export CYBER_PATH="${APOLLO_ROOT_DIR}/cyber"
 
 bazel_bin_path="${APOLLO_ROOT_DIR}/bazel-bin"
-# mainboard_path="${bazel_bin_path}/cyber/mainboard"
-# cyber_tool_path="${bazel_bin_path}/cyber/tools"
-# recorder_path="${cyber_tool_path}/cyber_recorder"
-# launch_path="${cyber_tool_path}/cyber_launch"
-# channel_path="${cyber_tool_path}/cyber_channel"
-# node_path="${cyber_tool_path}/cyber_node"
-# service_path="${cyber_tool_path}/cyber_service"
-# monitor_path="${cyber_tool_path}/cyber_monitor"
-# visualizer_path="${bazel_bin_path}/modules/tools/visualizer"
+mainboard_path="${bazel_bin_path}/cyber/mainboard"
+cyber_tool_path="${bazel_bin_path}/cyber/tools"
+recorder_path="${cyber_tool_path}/cyber_recorder"
+launch_path="${cyber_tool_path}/cyber_launch"
+channel_path="${cyber_tool_path}/cyber_channel"
+node_path="${cyber_tool_path}/cyber_node"
+service_path="${cyber_tool_path}/cyber_service"
+monitor_path="${cyber_tool_path}/cyber_monitor"
+visualizer_path="${bazel_bin_path}/modules/tools/visualizer"
 
 # TODO(all): place all these in one place and pathprepend
-# for entry in "${mainboard_path}" \
-#     "${recorder_path}" "${monitor_path}"  \
-#     "${channel_path}" "${node_path}" \
-#     "${service_path}" \
-#     "${launch_path}" \
-#     "${visualizer_path}" ; do
-#     pathprepend "${entry}"
-# done
+for entry in "${mainboard_path}" \
+    "${recorder_path}" "${monitor_path}"  \
+    "${channel_path}" "${node_path}" \
+    "${service_path}" \
+    "${launch_path}" \
+    "${visualizer_path}" ; do
+    pathprepend "${entry}"
+done
 
 pathprepend ${bazel_bin_path}/cyber/python/internal PYTHONPATH
 pathprepend "${PYTHON_INSTALL_PATH}/lib/python${PYTHON_VERSION}/site-packages" PYTHONPATH

modules/dreamview/frontend/src/components/DataProfile/LocalRecordItem.js

@@ -55,7 +55,7 @@ function LocalDynamicModelItem(props) {
     monitor.insert('INFO', 'Deleted  successfully!', Date.now());
     setDeleteConfirmModalVisible(false);
     // 刷新列表
-    WS.loadLocalRecords();
+    // WS.loadLocalRecords();
     PLUGIN_WS.getRecordList();
   };
 

modules/dreamview/frontend/src/components/DataProfile/RemoteResourseItemStatus.js

@@ -95,7 +95,6 @@ export function RemoteResourceItemBtn(props) {
     }
 
     if (type === 2) {
-      console.log('handleClick', status, id, type);
       PLUGIN_WS.downloadDynamicsModel(id);
     }
 

modules/dreamview/frontend/src/components/DataProfile/index.js

@@ -292,9 +292,6 @@ export default class DataProfile extends React.Component {
                     className={currentKey === tab.key ? 'active' : ''}
                     onClick={() => {
                       this.setState({ currentKey: tab.key });
-                      if (tab.key === 'recordProfiles') {
-                        WS.checkWsConnection().loadLocalRecords();
-                      }
                     }}
                   >{tab.title}</span>
                 );