From ef4e5c5e5be096fd61851a9341f182d41c0be8e9 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Fri, 23 Aug 2024 09:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                             |  1 +
 appsrc/service/debug_page_test_service.cpp |  9 ++++++---
 appsrc/service/debug_page_test_service.hpp |  5 +++--
 html/debug/index.html                      | 16 +++++++++++++---
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebbdf68..48041b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ message("ARCH: ${ARCH}")
 if(${ARCH} STREQUAL "amd64")
   add_definitions(-DBUILD_ON_PC)
 endif()
+message("ARCH: ${ARCH}")
 
 file(
   GLOB_RECURSE
diff --git a/appsrc/service/debug_page_test_service.cpp b/appsrc/service/debug_page_test_service.cpp
index 4defdf0..e6e8e1a 100644
--- a/appsrc/service/debug_page_test_service.cpp
+++ b/appsrc/service/debug_page_test_service.cpp
@@ -1,6 +1,8 @@
 #include "debug_page_test_service.hpp"
 using namespace iflytop;
 void DebugPageTestService::initialize() {
+  REG_EXTFN(test_int, int(json), param0);
+  REG_EXTFN(test_int, int(SettingId), param0);
   REG_EXTFN(test_int, int(int), param0);
   REG_EXTFN(test_string, void(string), param0);
   REG_EXTFN(test_float, void(float), param0);
@@ -11,9 +13,10 @@ void DebugPageTestService::initialize() {
   REG_EXTFN(test_vector_double, void(vector<double>), param0);
   REG_EXTFN(test_vecto_json, void(vector<json>), param0);
   REG_EXTFN(test_vecto_bool, void(vector<bool>), param0);
-  REG_EXTFN(test_vecto_enum, void(SettingId), param0);
+  // REG_EXTFN(test_vecto_enum, void(vector<SettingId>), param0);
 }
-
+void DebugPageTestService::test_json(shared_ptr<MsgProcessContext> cxt, json param0) {}
+void DebugPageTestService::test_enum(shared_ptr<MsgProcessContext> cxt, SettingId param0) {}
 void DebugPageTestService::test_int(shared_ptr<MsgProcessContext> cxt, int param0) {}
 void DebugPageTestService::test_string(shared_ptr<MsgProcessContext> cxt, string param0) {}
 void DebugPageTestService::test_float(shared_ptr<MsgProcessContext> cxt, float param0) {}
@@ -24,4 +27,4 @@ void DebugPageTestService::test_vector_string(shared_ptr<MsgProcessContext> cxt,
 void DebugPageTestService::test_vector_double(shared_ptr<MsgProcessContext> cxt, vector<double> param0) {}
 void DebugPageTestService::test_vecto_json(shared_ptr<MsgProcessContext> cxt, vector<json> param0) {}
 void DebugPageTestService::test_vecto_bool(shared_ptr<MsgProcessContext> cxt, vector<bool> param0) {}
-void DebugPageTestService::test_vecto_enum(shared_ptr<MsgProcessContext> cxt, SettingId param0) {}
\ No newline at end of file
+void DebugPageTestService::test_vecto_enum(shared_ptr<MsgProcessContext> cxt, vector<SettingId> param0) {}
\ No newline at end of file
diff --git a/appsrc/service/debug_page_test_service.hpp b/appsrc/service/debug_page_test_service.hpp
index 3fd3982..29715b7 100644
--- a/appsrc/service/debug_page_test_service.hpp
+++ b/appsrc/service/debug_page_test_service.hpp
@@ -18,6 +18,8 @@ class DebugPageTestService : public enable_shared_from_this<DebugPageTestService
   void initialize();
 
  private:
+  void test_json(shared_ptr<MsgProcessContext> cxt, json param0);
+  void test_enum(shared_ptr<MsgProcessContext> cxt, SettingId param0);
   void test_int(shared_ptr<MsgProcessContext> cxt, int param0);
   void test_string(shared_ptr<MsgProcessContext> cxt, string param0);
   void test_float(shared_ptr<MsgProcessContext> cxt, float param0);
@@ -28,8 +30,7 @@ class DebugPageTestService : public enable_shared_from_this<DebugPageTestService
   void test_vector_double(shared_ptr<MsgProcessContext> cxt, vector<double> param0);
   void test_vecto_json(shared_ptr<MsgProcessContext> cxt, vector<json> param0);
   void test_vecto_bool(shared_ptr<MsgProcessContext> cxt, vector<bool> param0);
-  void test_vecto_enum(shared_ptr<MsgProcessContext> cxt, SettingId param0);
-
+  void test_vecto_enum(shared_ptr<MsgProcessContext> cxt, vector<SettingId> param0);
 };
 
 }  // namespace iflytop
diff --git a/html/debug/index.html b/html/debug/index.html
index c15ab70..18ee507 100644
--- a/html/debug/index.html
+++ b/html/debug/index.html
@@ -4,6 +4,7 @@
 <head>
   <title>TMP</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <script src="./vue.global.js"></script>
   <script src="./dayjs/dayjs.min.js"></script>
   <script src="./dayjs/plugin/customParseFormat.js"></script>
@@ -39,7 +40,7 @@
             <div v-for="param in item.params">
               <a-input v-model:value="item.values[param]" :placeholder="param" />
             </div>
-            <a-button style="margin-left:5px;" @click="actionActionExecute(item)">DoIt</a-button>
+            <a-button style="margin-left:5px;" @click="actionActionExecute(item)">执行</a-button>
           </div>
         </div>
         <div style="padding:10px;">
@@ -51,7 +52,7 @@
       </a-col>
       <a-col :span="6" style="height: 100%;display: flex;flex-direction: column;">
         <div style="text-align: right; padding:10px;">
-          <a-button @click="actionClearLogs">CLEAR</a-button>
+          <a-button @click="actionClearLogs">Clear</a-button>
         </div>
         <div style="height:0;flex-grow:1;overflow-y: auto;">
           <a-collapse>
@@ -164,7 +165,16 @@
             let type = item.paramsTypeInfo[i];
             let value = item.values[param];
             switch (type) {
-              case 'int32_t': value *= 1; break;
+              case 'json':
+              case 'vector<bool>':
+              case 'vector<json>':
+              case 'vector<double>':
+              case 'vector<int32_t>':
+              case 'vector<string>': value = JSON.parse(value); break;
+              case 'bool': value = '1' === value ? true : false; break;
+              case 'float':
+              case 'double':
+              case 'int': value *= 1; break;
               case 'string': /* nothing to do here */ break;
               default: /* throw an exception is required. */
             }