优化产测结果接口(bu)

diff --git a/code/sdk/zhihui/UI/producttest/include/testPresenter.h b/code/sdk/zhihui/UI/producttest/include/testPresenter.h
index 34a39a1..5befff5 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/include/testPresenter.h
+++ b/code/sdk/zhihui/UI/producttest/include/testPresenter.h
@@ -27,26 +27,26 @@
 \r
 \r
 \r
-typedef struct {\r
-        uint8_t lcd;        // LCD测试结果\r
-        uint8_t tp;         // 触摸屏测试结果\r
-        uint8_t mag;   // 磁力计测试结果\r
-        uint8_t brightness;     // 亮度测试结果\r
-        uint8_t bat;     // 亮度测试结果\r
-        uint8_t spk;        // 喇叭测试结果\r
-        uint8_t mic;     // 麦克风测试结果\r
-        uint8_t motor;          // 马达测试结果\r
-        uint8_t hr;   // 心率漏光测试结果\r
-        uint8_t gsensor;        // 重力加速度传感器\r
-        uint8_t cat1;      // 4g测试结果\r
-        uint8_t button;    // 按键测试结果\r
-        uint8_t bt;        // 蓝牙扫描测试结果\r
-        uint8_t aplipay;   // 支付宝加密芯片测试结果\r
-        uint8_t gps;       // gps测试结果\r
-        uint8_t lowpower;  // 低功耗测试结果\r
-} FactoryTestResult;\r
+// typedef struct {\r
+//         uint8_t lcd;        // LCD测试结果\r
+//         uint8_t tp;         // 触摸屏测试结果\r
+//         uint8_t mag;   // 磁力计测试结果\r
+//         uint8_t brightness;     // 亮度测试结果\r
+//         uint8_t bat;     // 亮度测试结果\r
+//         uint8_t spk;        // 喇叭测试结果\r
+//         uint8_t mic;     // 麦克风测试结果\r
+//         uint8_t motor;          // 马达测试结果\r
+//         uint8_t hr;   // 心率漏光测试结果\r
+//         uint8_t gsensor;        // 重力加速度传感器\r
+//         uint8_t cat1;      // 4g测试结果\r
+//         uint8_t button;    // 按键测试结果\r
+//         uint8_t bt;        // 蓝牙扫描测试结果\r
+//         uint8_t aplipay;   // 支付宝加密芯片测试结果\r
+//         uint8_t gps;       // gps测试结果\r
+//         uint8_t lowpower;  // 低功耗测试结果\r
+// } FactoryTestResult;\r
 \r
-static FactoryTestResult g_factoryTestResult = {0};\r
+// static FactoryTestResult g_factoryTestResult = {0};\r
 \r
 namespace OHOS\r
 {\r
@@ -106,7 +106,7 @@ namespace OHOS
 \r
         static testPresenter *GetInstance();\r
 \r
-        FactoryTestResult* GetFactoryTestResult() {return &g_factoryTestResult;}\r
+        // FactoryTestResult* GetFactoryTestResult() {return &g_factoryTestResult;}\r
 \r
 \r
     private:\r

diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
index f7ea6ff..7c713bc 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
@@ -211,7 +211,14 @@ namespace OHOS
             }\r
 \r
 \r
-            mcu_pm_lcd_off(NULL,NULL);\r
+            // mcu_pm_lcd_off(NULL,NULL);\r
+            \r
+            const power_display_svr_api_t * display_api = power_display_svr_get_api();\r
+            if (display_api)\r
+            {\r
+                display_api->turn_off_screen();    \r
+            }\r
+            \r
             return true;\r
         }\r
         \r

diff --git a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
index fb7b92a..34bc4f6 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
@@ -20,10 +20,10 @@ extern "C"
 #endif
 #endif
 
-#ifdef SUPPORT_CYWEE_SERVICE
-static gsenson_t last_value = {0};
-static bool isInit = false;
-#endif
+// #ifdef SUPPORT_CYWEE_SERVICE
+// static gsenson_t last_value = {0};
+// static bool isInit = false;
+// #endif
 
 //#include "acc_service.h"
 namespace OHOS
@@ -72,12 +72,12 @@ namespace OHOS
     static osTimerId_t  Gsenson_TEST_timer=NULL;
     void testgsensonView::ClearAll()
     {
-#ifdef SUPPORT_CYWEE_SERVICE
-        last_value.x = 0;
-        last_value.y = 0;
-        last_value.z = 0;
-        isInit = false;
-#endif
+// #ifdef SUPPORT_CYWEE_SERVICE
+//         last_value.x = 0;
+//         last_value.y = 0;
+//         last_value.z = 0;
+//         isInit = false;
+// #endif
         if(testGsonsonScrollView)
         {
             testGsonsonScrollView->RemoveAll();

diff --git a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
index 3950822..7e6f556 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
@@ -28,7 +28,7 @@ extern "C"
 #endif
 #endif
 
-static float last_value = 0;
+// static float last_value = 0;
 
 namespace OHOS
 {
@@ -56,7 +56,7 @@ namespace OHOS
      osTimerId_t  magneyic_TEST_timer=NULL;
     void testMagicView::ClearAll()
     {
-        last_value = 0;
+        // last_value = 0;
         
         if(testmagicScrollView)
         {
@@ -133,30 +133,30 @@ namespace OHOS
 #ifdef SUPPORT_MAG_SERVICE
         mag_get_fAzimuth(&angle_value);
 #endif
-        if(angle_value && !last_value)
-        {
-            last_value = angle_value;
-        }
-        else if(last_value && angle_value && last_value != angle_value)
-        {
-            FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult();  
-            if(g_ret)
-            {
-                g_ret->mag = 1;
-            }
-        }
-        else if(!angle_value)
-        {
-            FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult();  
-            if(g_ret)
-            {
-                g_ret->mag = 2;
-            }
-        }
+        // if(angle_value && !last_value)
+        // {
+        //     last_value = angle_value;
+        // }
+        // else if(last_value && angle_value && last_value != angle_value)
+        // {
+        //     FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult();  
+        //     if(g_ret)
+        //     {
+        //         g_ret->mag = 1;
+        //     }
+        // }
+        // else if(!angle_value)
+        // {
+        //     FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult();  
+        //     if(g_ret)
+        //     {
+        //         g_ret->mag = 2;
+        //     }
+        // }
 
-        FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult();  
-        if(g_ret)
-            printf("mag test result:%d\n",g_ret->mag);
+        // FactoryTestResult *g_ret = OHOS::testPresenter::GetInstance()->GetFactoryTestResult();  
+        // if(g_ret)
+        //     printf("mag test result:%d\n",g_ret->mag);
 
         char buf[16]={0};
         sprintf(buf,"angle:%.2f",angle_value);