Jelajahi Sumber

Revert "#IQRV #comment 恒银适配D2000的代码更新"

This reverts commit 8d92dcd2e5e3e764ac9e8efed9683d7a79f8dba8.
gifur 3 tahun lalu
induk
melakukan
edb0807557
2 mengubah file dengan 3 tambahan dan 9 penghapusan
  1. 2 8
      CMakeSettings.json
  2. 1 1
      addin/res/ManagerDesktop/js/webSocketBase.js

+ 2 - 8
CMakeSettings.json

@@ -37,8 +37,7 @@
       "cmakeCommandArgs": "-D BUILD_TESTING=OFF",
       "buildCommandArgs": "",
       "ctestCommandArgs": "-C Release",
-      "inheritEnvironments": [ "msvc_x86" ],
-      "variables": []
+      "inheritEnvironments": [ "msvc_x86" ]
     },
     {
       "name": "ARM64-GCC-Debug",
@@ -46,7 +45,7 @@
       "configurationType": "Debug",
       "cmakeExecutable": "cmake",
       "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ],
-      "cmakeCommandArgs": "-D BUILD_TESTING=ON",
+      "cmakeCommandArgs": "-D BUILD_TESTING=OFF -D WITH_CI_NUMBER=OFF -D SIMULATE_ON=OFF -D BUILD_DEVADAPTER=ON",
       "buildCommandArgs": "",
       "ctestCommandArgs": "--output-on-failure",
       "inheritEnvironments": [ "linux_arm" ],
@@ -64,11 +63,6 @@
           "name": "SIMULATE_ON",
           "value": "False",
           "type": "BOOL"
-        },
-        {
-          "name": "BUILD_MODULE",
-          "value": "True",
-          "type": "BOOL"
         }
       ]
     },

+ 1 - 1
addin/res/ManagerDesktop/js/webSocketBase.js

@@ -2,7 +2,7 @@
  * websocket核心模块,实现实体接口调用,消息广播,transid管理
  */ 
 var WebSocketBase = {};
-WebSocketBase.socket = new ws('ws://99.12.23.78:9002');
+WebSocketBase.socket = new ws('ws://127.0.0.1:9002');
 WebSocketBase.retryTimes = 0;
 WebSocketBase.interval = 0;
 WebSocketBase.isreconnecting = false;