增加雷鸟必要宏

diff --git a/code/sdk/middleware/services/gui/uikit/CMakeLists.txt b/code/sdk/middleware/services/gui/uikit/CMakeLists.txt
index 62fb078..a69952c 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/CMakeLists.txt
+++ b/code/sdk/middleware/services/gui/uikit/CMakeLists.txt
@@ -122,6 +122,9 @@ list(REMOVE_ITEM COMPONENT_SRC ${UIKIT_ROOT_DIR}/ui/frameworks/components/ui_sur
 list(REMOVE_ITEM COMPONENT_SRC ${UIKIT_ROOT_DIR}/ui/frameworks/components/ui_video.cpp)\r
 list(REMOVE_ITEM COMPONENT_SRC ${UIKIT_ROOT_DIR}/ui/frameworks/dfx/performance_task.cpp)\r
 list(REMOVE_ITEM COMPONENT_SRC ${UIKIT_ROOT_DIR}/ui/frameworks/dfx/ui_screenshot.cpp)\r
+if(NOT "thunderbird_toys" IN_LIST TARGET_COMPONENT)\r
+    list(REMOVE_ITEM COMPONENT_SRC ${PROP_UI_SRC}/dfx/ws_net_task.cpp)\r
+endif()\r
 list(REMOVE_ITEM COMPONENT_SRC ${UIKIT_ROOT_DIR}/ui/frameworks/dock/lite_input_distributer.cpp)\r
 list(REMOVE_ITEM COMPONENT_SRC ${UIKIT_ROOT_DIR}/ui/frameworks/dock/ohos/ohos_input_device.cpp)\r
 list(REMOVE_ITEM COMPONENT_SRC ${UIKIT_ROOT_DIR}/ui/frameworks/dock/screen_device_proxy.cpp)\r

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp
index 9938972..2700337 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp
@@ -435,6 +435,7 @@ void PrintFPS(int argc, char *argv[])
     }
 }
 
+#if defined (THUNDERBIRD_TOYS)
 extern "C" void ShowWSNet(int argc, char *argv[])
 {
     if (argc == 0) {
@@ -466,7 +467,7 @@ extern "C" void HideWSNet(int argc, char *argv[])
 {
     WSNetTask::GetInstance()->HideWSNet();
 }
-
+#endif
 #if defined (SUPPORT_DIAL_DEBUG)
 void PrintWatchDialInfo(const watch_dial_info &info)
 {
@@ -748,8 +749,10 @@ struct DfxCmd g_dfxCmdList[] = {{"screencap", OHOS::ScreencapCmd},
     {"printfps", OHOS::PrintFPS},
     {"hidefps", OHOS::HideFPS},
     {"showfps", OHOS::ShowFPS},
+#if defined (THUNDERBIRD_TOYS)
     {"showws", OHOS::ShowWSNet},
     {"hidews", OHOS::HideWSNet},
+#endif
     {"showtime", OHOS::ShowTime},
     {"refresh", OHOS::ForceRefresh},
 #if defined (SUPPORT_DIAL_DEBUG)

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/ws_net_task.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/ws_net_task.cpp
index 3fe0858..5105372 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/ws_net_task.cpp
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/ws_net_task.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "dfx/ws_net_task.h"
-#if ENABLE_DFX_CMD
+#if ENABLE_DFX_CMD && defined(THUNDERBIRD_TOYS)
 #include <cmath>
 #include <string>
 #include <cstdio>
@@ -29,14 +29,8 @@
 #include "custom_runtime.h"
 #endif
 
-// 前向声明，避免循环依赖
-#ifdef __cplusplus
-extern "C" {
-#endif
-// WebSocket连接状态函数声明
-const char* ln_ws_get_connection_state_string(void);
-#ifdef __cplusplus
-}
+#ifdef THUNDERBIRD_TOYS
+#include "ln_api.h"
 #endif
 
 namespace OHOS {

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/ws_net_task.h b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/ws_net_task.h
index d86c6ad..dff9f06 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/ws_net_task.h
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/ws_net_task.h
@@ -17,7 +17,7 @@
 #define WS_NET_TASK_H
 
 #include "graphic_config.h"
-#if ENABLE_DFX_CMD
+#if ENABLE_DFX_CMD && defined(THUNDERBIRD_TOYS)
 #include <atomic>
 #include "common/task_manager.h"
 #include "components/ui_label.h"
@@ -48,7 +48,7 @@ private:
     char textBuffer_[256];
 };
 }
-#endif // ENABLE_DFX_CMD
+#endif // ENABLE_DFX_CMD && defined(THUNDERBIRD_TOYS)
 #endif  // WS_NET_TASK_H