优化272产测UI

diff --git a/code/sdk/zhihui/UI/producttest/include/testPresenter.h b/code/sdk/zhihui/UI/producttest/include/testPresenter.h
index 55fc6f4..ab9aa8a 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/include/testPresenter.h
+++ b/code/sdk/zhihui/UI/producttest/include/testPresenter.h
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com\r
  * @Date: 2024-08-23 10:50:37\r
  * @LastEditors: penglei 1624952103@qq.com\r
- * @LastEditTime: 2025-09-01 09:55:12\r
+ * @LastEditTime: 2025-11-17 13:55:35\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPresenter.h\r
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\r
  */\r
@@ -57,7 +57,9 @@ namespace OHOS
         VISON,\r
         LCD,\r
         TP,\r
+#ifdef SUPPORT_MAG_SERVICE\r
         MAGETIC,\r
+#endif\r
         LUMINANCE,\r
         CHARG,\r
         SPEAK,\r

diff --git a/code/sdk/zhihui/UI/producttest/include/testView.h b/code/sdk/zhihui/UI/producttest/include/testView.h
index 80a3fc4..c62f886 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/include/testView.h
+++ b/code/sdk/zhihui/UI/producttest/include/testView.h
@@ -88,10 +88,14 @@ namespace OHOS
         bool ChangspeakTESTView(int16_t thisView);\r
         bool ChangmotorTESTView(int16_t thisView);\r
         bool ChangKEYTESTView(int16_t thisView);\r
+#ifdef SUPPORT_MAG_SERVICE\r
         bool ChangeMGTESTView(int16_t thisView);\r
+#endif\r
         bool ChangeMPTESTView(int16_t thisView);\r
         bool ChangeHRTESTView(int16_t thisView);\r
+#ifdef SUPPORT_CAT1_SERVICE\r
         bool ChangeCAT1TESTView(int16_t thisView);\r
+#endif\r
         bool ChangeGTESTView(int16_t thisView);\r
         bool ChangeoldTESTView(int16_t thisView);\r
         bool ChangeBTTESTView(int16_t thisView);\r

diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
index 8cd25d5..56aff6e 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testView.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp
@@ -543,10 +543,10 @@ namespace OHOS
         }
         return true;
     }
-
+#ifdef SUPPORT_MAG_SERVICE
     bool testView::ChangeMGTESTView(int16_t thisView)
     {
-#ifdef SUPPORT_MAG_SERVICE
+
         if (SystemScrollView[thisView] == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeMGTESTView");
@@ -559,10 +559,10 @@ namespace OHOS
             SystemScrollView[thisView] = test_MG_view->testmagicInitIView(thisView);
             group->Add(SystemScrollView[thisView]);
         }
-#endif
+
         return true;
     }
-
+#endif
     bool testView::ChangLUMTESTView(int16_t thisView)
     {
         if (SystemScrollView[thisView] == nullptr)
@@ -630,10 +630,10 @@ namespace OHOS
         }
         return true;
     }
-
+#ifdef SUPPORT_CAT1_SERVICE
     bool testView::ChangeCAT1TESTView(int16_t thisView)
     {
-#ifdef SUPPORT_CAT1_SERVICE
+
         if (SystemScrollView[thisView] == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeCAT1TESTView");
@@ -646,10 +646,10 @@ namespace OHOS
             SystemScrollView[thisView] = test_cat1_view->testcat1InitIView(thisView);
             group->Add(SystemScrollView[thisView]);
         }
-#endif
+
         return true;
     }
-
+#endif
     bool testView::ChangKEYTESTView(int16_t thisView)
     {
         if (SystemScrollView[thisView] == nullptr)