修改产测UI代码路径

diff --git a/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt
index 8207241..5d37a82 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt
@@ -19,6 +19,10 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/protocol/bt/host/bt/bts/brandy_service/service/src/base
     ${ROOT_DIR}/protocol/bt/host/bt/bts/brandy_service/bt_audio_wrapper
 
+    ${ROOT_DIR}/zhihui/UI/producttest/include
+    ${ROOT_DIR}/zhihui/UI
+    # ${ROOT_DIR}/protocol/bt/host/bt/bts/brandy_service/bt_audio_wrapper
+
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/include
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/clock/include
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/include
@@ -58,7 +62,7 @@ set(PRIVATE_HEADER
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/health_service
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/training_card
 
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/include
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/include
 
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/themestyle/include   
 
@@ -772,28 +776,6 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/phone/src/CallLogAdapter.cpp
     
 
-    #产测
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testPresenter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testView.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testabout.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testLCD.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testTP.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testmagnetic.cpp 
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testluminance.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testchanging.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testspeak.cpp 
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testmotor.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testbutton.cpp 
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testmicrophone.cpp  
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testcat1.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testhrsenson.cpp 
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testgsenson.cpp  
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testold.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testbt.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testSEChipTest.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testModel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testPing.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testGPS.cpp
     
     
     #每日目标
@@ -840,7 +822,7 @@ endif()
 if("SUPPORT_A5133_SERVICE" IN_LIST DEFINES)
 set(SOURCES
     ${SOURCES}
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testA5133.cpp
+    # ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/producttest/src/testA5133.cpp
 )
 endif()
 if("SUPPORT_ALIPAY_SEC" IN_LIST DEFINES)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp
index b3170cf..1c8729d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp
@@ -498,7 +498,8 @@ namespace OHOS
         {VIEW_CONNECT_PHONE, "ConnectPhoneView"},
         //{VIEW_PHONE, "phoneview"},
         {VIEW_INDOORWALK, "IndoorWalkView"},
-        {VIEW_TEST, "testView"}};
+        {VIEW_TEST, "testView"}
+        };
 
     NativeLauncher::NativeLauncher() {}
     NativeLauncher::~NativeLauncher() {}

diff --git a/code/sdk/application/wearable/fd230/service/msg_center/CMakeLists.txt b/code/sdk/application/wearable/fd230/service/msg_center/CMakeLists.txt
index 41b5264..eb9ec37 100644 (file)
--- a/code/sdk/application/wearable/fd230/service/msg_center/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230/service/msg_center/CMakeLists.txt
@@ -27,6 +27,8 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/middleware/utils/fs/include/fs
     ${ROOT_DIR}/include/middleware/services/bts/br
     ${ROOT_DIR}/include/middleware/services/bts/common
+    ${ROOT_DIR}/zhihui/UI/producttest/include
+    ${ROOT_DIR}/zhihui/UI
 )
 
 set(PRIVATE_HEADER
@@ -157,6 +159,8 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/include/middleware/services/bts/common
     ${ROOT_DIR}/application/auto_ota
     ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audio_capturer/interfaces/kits/audio_capturer_lite
+    ${ROOT_DIR}/zhihui/UI/producttest/include
+    ${ROOT_DIR}/zhihui/UI
 )
 
 if("JS_ENABLE" IN_LIST DEFINES)

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 8ddd853..70c8b9e 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -391,7 +391,9 @@ target = {
                            "bleservice",
                            "blemoder",
                            "factorytest_service",
-                           "hid_service"],
+                           "hid_service",
+                           "producttest",
+                           ],
                'image_analysis': False,
                'fs_image_path':'fd230',
                'fs_image': True
@@ -503,7 +505,8 @@ target = {
                            "cywee",
                            "lqbp002ta",
                            "ppg_sensor_vc9202",
-                           "charge_ic"
+                           "charge_ic",
+                            "producttest",
                            ],
                'image_analysis': False,
                'fs_image_path':'fd230',
@@ -607,6 +610,7 @@ target = {
                         #  "blemoder",
                         #  "factorytest_service",
                         #  "hid_service",
+                         "producttest",
                         "cywee"
                            ],
                'image_analysis': False,
@@ -717,6 +721,7 @@ target = {
                         #  "blemoder",
                         #  "factorytest_service",
                         #  "hid_service",
+                        "producttest",
                         "cywee",
                         "charge_ic",
                         "ppg_sensor_vc921x",

diff --git a/code/sdk/zhihui/CMakeLists.txt b/code/sdk/zhihui/CMakeLists.txt
index f785a65..1d5b76f 100644 (file)
--- a/code/sdk/zhihui/CMakeLists.txt
+++ b/code/sdk/zhihui/CMakeLists.txt
@@ -8,4 +8,4 @@ add_subdirectory_if_exist(utils)
 add_subdirectory_if_exist(utilscpp)
 add_subdirectory_if_exist(drivers)
 add_subdirectory_if_exist(config)
-
+add_subdirectory_if_exist(UI)

diff --git a/code/sdk/zhihui/UI/CMakeLists.txt b/code/sdk/zhihui/UI/CMakeLists.txt
new file mode 100644 (file)
index 0000000..961cbff
--- /dev/null
+++ b/code/sdk/zhihui/UI/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory_if_exist(producttest)
\ No newline at end of file

diff --git a/code/sdk/zhihui/UI/producttest/CMakeLists.txt b/code/sdk/zhihui/UI/producttest/CMakeLists.txt
new file mode 100644 (file)
index 0000000..629e0b8
--- /dev/null
+++ b/code/sdk/zhihui/UI/producttest/CMakeLists.txt
@@ -0,0 +1,128 @@
+#===============================================================================
+# @brief    cmake file
+# Copyright (c) @CompanyNameMagicTag 2022-2023. All rights reserved.
+#===============================================================================
+set(COMPONENT_NAME "producttest")
+
+set(SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testPresenter.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testabout.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testLCD.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testTP.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testmagnetic.cpp 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testluminance.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testchanging.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testspeak.cpp 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testmotor.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testbutton.cpp 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testmicrophone.cpp  
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testcat1.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testhrsenson.cpp 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testgsenson.cpp  
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testold.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testbt.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testSEChipTest.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testModel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testPing.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/testGPS.cpp
+)
+
+set(PUBLIC_HEADER
+    ${ROOT_DIR}/open_source/openharmony/third_party/cJSON
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+set(PRIVATE_HEADER
+    ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/display/interfaces/include
+    ${ROOT_DIR}/middleware/utils/update/inner_include
+    ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits
+    ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/innerkits
+    ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/include
+    ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits
+    ${ROOT_DIR}/open_source/openharmony/utils/native/lite/include
+    ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits
+    ${ROOT_DIR}/open_source/openharmony/utils/native/lite/kv_store/innerkits
+    ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits/gfx_utils
+    ${ROOT_DIR}/middleware/services/media/foundation/player/interfaces/kits
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/key/include
+    ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits
+    ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits/font
+    ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks/font
+    ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks
+   
+    ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/src/utils/innerkits
+    # /home/hcj/615/FD230/code/sdk/application/wearable/nativeapp/nativeui/player/include/PlayersPresenter.h
+    # /home/hcj/615/FD230/code/sdk/middleware/services/gui/uikit/ui/frameworks/font/glyphs_manager.h
+    # /home/hcj/615/FD230/code/sdk//UiServersMsg.h
+)
+if("FD230" IN_LIST DEFINES)
+set(PRIVATE_HEADER
+    ${PRIVATE_HEADER}
+    ${ROOT_DIR}/application/wearable/fd230/nativeabilityfwk/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/uiservice/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/applist/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativelauncher/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/main/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/compass/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/compass
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/alarm/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/include
+    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/player/include
+)
+else()
+set(PRIVATE_HEADER
+    ${PRIVATE_HEADER}
+    ${ROOT_DIR}/application/wearable/nativeabilityfwk/include
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/uiservice/include
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/applist/include
+    ${ROOT_DIR}/application/wearable/nativeapp/nativelauncher/include
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/main/include
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/alarm/include
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/alarmclockmanage/include
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/alarmclocktimerconfig/include
+    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/player/include
+    
+)
+endif()
+
+set(PRIVATE_DEFINES
+    TARGET_NAME="${TARGET_COMMAND}"
+    BUILD_TIME="${BUILD_TIME}"
+)
+
+set(PUBLIC_DEFINES
+)
+
+# use this when you want to add ccflags like -include xxx
+set(COMPONENT_PUBLIC_CCFLAGS
+)
+
+set(COMPONENT_CCFLAGS
+    -std=c++11
+    -Wno-error
+    -Wno-unused-parameter
+    -fno-exceptions
+    -fno-unwind-tables
+    -fno-asynchronous-unwind-tables
+    -Wno-undef
+    -Wno-bitwise-op-parentheses
+    -Wno-shift-op-parentheses
+    -nostdlibinc
+    -nostdinc
+    -nostdlib
+    -Wno-c++11-narrowing
+    -Wno-error=unused-function
+)
+set(WHOLE_LINK
+    true
+)
+
+set(MAIN_COMPONENT
+    false
+)
+
+build_component()

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testA5133.h b/code/sdk/zhihui/UI/producttest/include/testA5133.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testA5133.h
rename to code/sdk/zhihui/UI/producttest/include/testA5133.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testGPS.h b/code/sdk/zhihui/UI/producttest/include/testGPS.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testGPS.h
rename to code/sdk/zhihui/UI/producttest/include/testGPS.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testLCD.h b/code/sdk/zhihui/UI/producttest/include/testLCD.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testLCD.h
rename to code/sdk/zhihui/UI/producttest/include/testLCD.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testLCDC.h b/code/sdk/zhihui/UI/producttest/include/testLCDC.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testLCDC.h
rename to code/sdk/zhihui/UI/producttest/include/testLCDC.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testModel.h b/code/sdk/zhihui/UI/producttest/include/testModel.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testModel.h
rename to code/sdk/zhihui/UI/producttest/include/testModel.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPing.h b/code/sdk/zhihui/UI/producttest/include/testPing.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPing.h
rename to code/sdk/zhihui/UI/producttest/include/testPing.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPresenter.h b/code/sdk/zhihui/UI/producttest/include/testPresenter.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPresenter.h
rename to code/sdk/zhihui/UI/producttest/include/testPresenter.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPresenterC.h b/code/sdk/zhihui/UI/producttest/include/testPresenterC.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPresenterC.h
rename to code/sdk/zhihui/UI/producttest/include/testPresenterC.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testSEChipTest.h b/code/sdk/zhihui/UI/producttest/include/testSEChipTest.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testSEChipTest.h
rename to code/sdk/zhihui/UI/producttest/include/testSEChipTest.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testTP.h b/code/sdk/zhihui/UI/producttest/include/testTP.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testTP.h
rename to code/sdk/zhihui/UI/producttest/include/testTP.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testTPC.h b/code/sdk/zhihui/UI/producttest/include/testTPC.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testTPC.h
rename to code/sdk/zhihui/UI/producttest/include/testTPC.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testView.h b/code/sdk/zhihui/UI/producttest/include/testView.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testView.h
rename to code/sdk/zhihui/UI/producttest/include/testView.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testabout.h b/code/sdk/zhihui/UI/producttest/include/testabout.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testabout.h
rename to code/sdk/zhihui/UI/producttest/include/testabout.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testbt.h b/code/sdk/zhihui/UI/producttest/include/testbt.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testbt.h
rename to code/sdk/zhihui/UI/producttest/include/testbt.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testbutton.h b/code/sdk/zhihui/UI/producttest/include/testbutton.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testbutton.h
rename to code/sdk/zhihui/UI/producttest/include/testbutton.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testcat1.h b/code/sdk/zhihui/UI/producttest/include/testcat1.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testcat1.h
rename to code/sdk/zhihui/UI/producttest/include/testcat1.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testchanging.h b/code/sdk/zhihui/UI/producttest/include/testchanging.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testchanging.h
rename to code/sdk/zhihui/UI/producttest/include/testchanging.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testgsenson.h b/code/sdk/zhihui/UI/producttest/include/testgsenson.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testgsenson.h
rename to code/sdk/zhihui/UI/producttest/include/testgsenson.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testhrsenson.h b/code/sdk/zhihui/UI/producttest/include/testhrsenson.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testhrsenson.h
rename to code/sdk/zhihui/UI/producttest/include/testhrsenson.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testluminance.h b/code/sdk/zhihui/UI/producttest/include/testluminance.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testluminance.h
rename to code/sdk/zhihui/UI/producttest/include/testluminance.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmagnetic.h b/code/sdk/zhihui/UI/producttest/include/testmagnetic.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmagnetic.h
rename to code/sdk/zhihui/UI/producttest/include/testmagnetic.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmicrophone.h b/code/sdk/zhihui/UI/producttest/include/testmicrophone.h
similarity index 98%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmicrophone.h
rename to code/sdk/zhihui/UI/producttest/include/testmicrophone.h
index 5e4d779..9a6d876 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmicrophone.h
+++ b/code/sdk/zhihui/UI/producttest/include/testmicrophone.h
@@ -20,7 +20,9 @@
 #include "components/ui_image_view.h"
 #include "components/ui_label_button_ext.h"
 #include "producttest/include/testPresenter.h" 
+#ifdef FD230
 #include "record/include/RecordingModel.h"
+#endif
 //#include "cmsis_os.h"
 #include <iostream>
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmicrophoneC.h b/code/sdk/zhihui/UI/producttest/include/testmicrophoneC.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmicrophoneC.h
rename to code/sdk/zhihui/UI/producttest/include/testmicrophoneC.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmotor.h b/code/sdk/zhihui/UI/producttest/include/testmotor.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testmotor.h
rename to code/sdk/zhihui/UI/producttest/include/testmotor.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testold.h b/code/sdk/zhihui/UI/producttest/include/testold.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testold.h
rename to code/sdk/zhihui/UI/producttest/include/testold.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testspeak.h b/code/sdk/zhihui/UI/producttest/include/testspeak.h
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testspeak.h
rename to code/sdk/zhihui/UI/producttest/include/testspeak.h

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testA5133.cpp b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testA5133.cpp
rename to code/sdk/zhihui/UI/producttest/src/testA5133.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testGPS.cpp b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testGPS.cpp
rename to code/sdk/zhihui/UI/producttest/src/testGPS.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testLCD.cpp b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testLCD.cpp
rename to code/sdk/zhihui/UI/producttest/src/testLCD.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testModel.cpp b/code/sdk/zhihui/UI/producttest/src/testModel.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testModel.cpp
rename to code/sdk/zhihui/UI/producttest/src/testModel.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testPing.cpp b/code/sdk/zhihui/UI/producttest/src/testPing.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testPing.cpp
rename to code/sdk/zhihui/UI/producttest/src/testPing.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testPresenter.cpp
rename to code/sdk/zhihui/UI/producttest/src/testPresenter.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testSEChipTest.cpp b/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testSEChipTest.cpp
rename to code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testTP.cpp b/code/sdk/zhihui/UI/producttest/src/testTP.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testTP.cpp
rename to code/sdk/zhihui/UI/producttest/src/testTP.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testView.cpp
rename to code/sdk/zhihui/UI/producttest/src/testView.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testabout.cpp b/code/sdk/zhihui/UI/producttest/src/testabout.cpp
similarity index 99%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testabout.cpp
rename to code/sdk/zhihui/UI/producttest/src/testabout.cpp
index 0ef8f07..c6912e8 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testabout.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testabout.cpp
@@ -138,7 +138,7 @@ namespace OHOS
         // Set additional property
         label_button->SetText("next");
         label_button->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 44);
-        label_button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
+        label_button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff0b1928, UIButton::PRESSED);
         label_button->SetStyle(STYLE_BACKGROUND_OPA, 0x80);
 
         UIView::OnClickListener *touchListener = static_cast<UIView::OnClickListener *>(testPresenter::GetInstance());

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testbt.cpp b/code/sdk/zhihui/UI/producttest/src/testbt.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testbt.cpp
rename to code/sdk/zhihui/UI/producttest/src/testbt.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testbutton.cpp b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testbutton.cpp
rename to code/sdk/zhihui/UI/producttest/src/testbutton.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testcat1.cpp b/code/sdk/zhihui/UI/producttest/src/testcat1.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testcat1.cpp
rename to code/sdk/zhihui/UI/producttest/src/testcat1.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testchanging.cpp b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testchanging.cpp
rename to code/sdk/zhihui/UI/producttest/src/testchanging.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testgsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testgsenson.cpp
rename to code/sdk/zhihui/UI/producttest/src/testgsenson.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testhrsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testhrsenson.cpp
rename to code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testluminance.cpp b/code/sdk/zhihui/UI/producttest/src/testluminance.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testluminance.cpp
rename to code/sdk/zhihui/UI/producttest/src/testluminance.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testmagnetic.cpp b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testmagnetic.cpp
rename to code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testmicrophone.cpp b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testmicrophone.cpp
rename to code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testmotor.cpp b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testmotor.cpp
rename to code/sdk/zhihui/UI/producttest/src/testmotor.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testold.cpp b/code/sdk/zhihui/UI/producttest/src/testold.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testold.cpp
rename to code/sdk/zhihui/UI/producttest/src/testold.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testspeak.cpp b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp
similarity index 100%
rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testspeak.cpp
rename to code/sdk/zhihui/UI/producttest/src/testspeak.cpp

diff --git a/code/sdk/zhihui/utils/CMakeLists.txt b/code/sdk/zhihui/utils/CMakeLists.txt
index 5c9ff31..75c9543 100644 (file)
--- a/code/sdk/zhihui/utils/CMakeLists.txt
+++ b/code/sdk/zhihui/utils/CMakeLists.txt
@@ -44,6 +44,8 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits/dock/
     ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks/
     ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks/dock/
+    ${ROOT_DIR}/zhihui/UI/producttest/include
+    ${ROOT_DIR}/zhihui/UI
 )
 
 if("FD230" IN_LIST DEFINES)