产测增加不可休眠

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testLCD.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testLCD.cpp
index 9005948..f6b885d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testLCD.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testLCD.cpp
@@ -4,6 +4,19 @@
 #include "producttest/include/testLCD.h"
 
 #include "cmsis_os2.h"
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 
 namespace OHOS
 {
@@ -52,6 +65,12 @@ namespace OHOS
                 delete Title;
                 Title=nullptr;
             }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+            }
 
             delete testLCDScrollView;
             testLCDScrollView=nullptr;
@@ -135,6 +154,13 @@ namespace OHOS
         Title= testAboutView::GetInstance()->init_title(163,45,"LCD_TEST");
         testLCDScrollView->Add(Title);
 
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
 
        
         return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testSEChipTest.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testSEChipTest.cpp
index 3a0cabe..c5ea95b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testSEChipTest.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testSEChipTest.cpp
@@ -3,7 +3,19 @@
 #include "producttest/include/testPresenter.h"
 #include "producttest/include/testSEChipTest.h"
 #include "ConfigModel.h"
-
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 
 namespace OHOS
 {
@@ -31,7 +43,47 @@ namespace OHOS
 
     void testSEChipView::ClearAll()
     {
-      
+       if(testSEChipScrollView)
+        {
+
+            testSEChipScrollView->RemoveAll();
+
+            if(chipinfo_label)
+            {
+                delete chipinfo_label;
+                chipinfo_label=nullptr;
+            }
+
+            if(labelButton_next)
+            {
+                delete labelButton_next;
+                labelButton_next=nullptr;
+            }
+
+            if(Title)
+            {
+                delete Title;
+                Title=nullptr;
+            }
+          
+            if(IIC_label)
+            {
+                delete IIC_label;
+                IIC_label=nullptr;
+            }
+            
+
+            uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+            }
+
+
+            delete testSEChipScrollView;
+            testSEChipScrollView=nullptr;
+       }
     }
 
     UILabel *testSEChipView::InitLabel(LabelConfig &labelConfig)
@@ -146,6 +198,13 @@ namespace OHOS
         
         Title= testAboutView::GetInstance()->init_title(142,40,"SEChip_TEST");
         testSEChipScrollView->Add(Title);
+
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
         /* -------------------------------------------------------------------------- */
       
         return testSEChipScrollView;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testTP.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testTP.cpp
index 2623c69..f3beb20 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testTP.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testTP.cpp
@@ -4,7 +4,19 @@
 #include "producttest/include/testTP.h"
 
 #include "cmsis_os2.h"
-
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 namespace OHOS
 {
 
@@ -52,6 +64,14 @@ namespace OHOS
                 delete Title;
                 Title=nullptr;
             }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+            }
+            delete testTPScrollView;
+            testTPScrollView=nullptr;
 
         }
     }
@@ -163,6 +183,13 @@ namespace OHOS
         Title= testAboutView::GetInstance()->init_title(175,45,"TP_TEST");
         testTPScrollView->Add(Title);
 
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
         
 
         return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
index 1c2aa53..3a9fca5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
@@ -2,6 +2,8 @@
 #include "producttest/include/testPresenter.h"\r
 #include "power_display_service.h"\r
 #include "wearable_log.h"\r
+\r
+\r
 namespace OHOS\r
 {\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp
index f565b3b..6307857 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp
@@ -4,7 +4,19 @@
 #include "producttest/include/testbutton.h" 
 #include "AlarmClockModel.h"
 #include "cmsis_os2.h"
-
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 namespace OHOS
 {
 
@@ -64,6 +76,13 @@ namespace OHOS
                 Title=nullptr;
             }
             RootView::GetInstance()->ClearOnKeyActListener();
+
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+            }
             
             delete testBUTTONScrollView;
             testBUTTONScrollView=nullptr;
@@ -293,6 +312,13 @@ namespace OHOS
         testBUTTONScrollView->SetTouchable(true);
         testBUTTONScrollView->SetDraggable(true);
 
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
 
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
index 43fc7fc..a06b853 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
@@ -78,6 +78,7 @@ namespace OHOS
                 delete Title;
                 Title=nullptr;
             }
+          
             
 
             delete testcat1ScrollView;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testchanging.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testchanging.cpp
index 76d90e9..018a34c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testchanging.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testchanging.cpp
@@ -4,7 +4,19 @@
 #include "producttest/include/testchanging.h"
 
 #include "cmsis_os2.h"
-
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 namespace OHOS
 {
 
@@ -50,6 +62,12 @@ namespace OHOS
                 delete Title;
                 Title=nullptr;
             }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+            }
 
             delete testCHANINGScrollView;
            testCHANINGScrollView=nullptr;
@@ -166,6 +184,13 @@ namespace OHOS
         Title= testAboutView::GetInstance()->init_title(120,45,"CHANING_TEST");
         testCHANINGScrollView->Add(Title);
 
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
         return true;
     }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testgsenson.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testgsenson.cpp
index 385c0dc..c5bf575 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testgsenson.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testgsenson.cpp
@@ -4,6 +4,21 @@
 #include "producttest/include/testgsenson.h"
 #include "cmsis_os2.h"
 #include "cywee_hal.h" 
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
+
 //#include "acc_service.h"
 namespace OHOS
 {
@@ -76,6 +91,12 @@ namespace OHOS
             {
                 delete labelButton_next;
                 labelButton_next=nullptr;
+            }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
             }
             delete testGsonsonScrollView;
             testGsonsonScrollView=nullptr;
@@ -218,6 +239,13 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,"BTbutton_next");
         testGsonsonScrollView->Add(labelButton_next);
 
+        uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
 
         testGsonsonScrollView->SetTouchable(true);
         testGsonsonScrollView->SetDraggable(true);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testhrsenson.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testhrsenson.cpp
index 7c559dc..10ec695 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testhrsenson.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testhrsenson.cpp
@@ -9,6 +9,21 @@
 #include "cat1_server_hal.h"
 #include "ppg_service.h"
 
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
+
+
 namespace OHOS
 {
 
@@ -63,6 +78,12 @@ namespace OHOS
                 delete Title;
                 Title=nullptr;
             }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+            }
 
             delete testhrsensonScrollView;
             testhrsensonScrollView=nullptr;
@@ -280,7 +301,14 @@ namespace OHOS
         testhrsensonScrollView->SetDraggable(true);
 
         int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;
-        send_ppg_cmd_msg(md); 
+        send_ppg_cmd_msg(md);
+
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
 
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testluminance.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testluminance.cpp
index e47fbe4..fa959fb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testluminance.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testluminance.cpp
@@ -4,6 +4,19 @@
 #include "producttest/include/testluminance.h"
 #include "ConfigModel.h"
 #include "cmsis_os2.h"
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 
 namespace OHOS
 {
@@ -50,6 +63,12 @@ namespace OHOS
                 delete Title;
                 Title=nullptr;
             }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+            }
 
            delete testLUMScrollView;
            testLUMScrollView=nullptr;
@@ -116,6 +135,13 @@ namespace OHOS
         Title= testAboutView::GetInstance()->init_title(99,54,"BRIGHTNESS_TEST");
         testLUMScrollView->Add(Title);
 
+        uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
         return true;
     }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmagnetic.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmagnetic.cpp
index 68bbef8..102cb53 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmagnetic.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmagnetic.cpp
@@ -9,6 +9,21 @@
 #include "battery_service.h"
 #include "battery_hal.h"
 #endif
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
+
 namespace OHOS
 {
 
@@ -61,6 +76,12 @@ namespace OHOS
             {
                 delete labelButton_next;
                 labelButton_next=nullptr;
+            }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
             }
             delete testmagicScrollView;
             testmagicScrollView=nullptr;
@@ -222,6 +243,13 @@ namespace OHOS
         testmagicScrollView->SetTouchable(true);
         testmagicScrollView->SetDraggable(true);
 
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
 
 
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmicrophone.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmicrophone.cpp
index 494b2cc..42ce279 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmicrophone.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmicrophone.cpp
@@ -5,6 +5,19 @@
 #include "AlarmClockModel.h"
 #include "cmsis_os2.h"
 #include "audio_capture_wrapper.h"
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 namespace OHOS
 {
 
@@ -49,6 +62,12 @@ namespace OHOS
             {
                 delete Title;
                 Title=nullptr;
+            }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
             }
             AlarmClockModel::GetInstance()->AlarmPlayerStop();
             delete testmakephoneScrollView;
@@ -193,6 +212,13 @@ namespace OHOS
         testmakephoneScrollView->SetTouchable(true);
         testmakephoneScrollView->SetDraggable(true);
 
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
 
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmotor.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmotor.cpp
index 6b557aa..043c249 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmotor.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmotor.cpp
@@ -6,6 +6,19 @@
 #include "cmsis_os2.h"
 #include "dock/vibrator_manager.h"
 
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 
 namespace OHOS
 {
@@ -51,6 +64,12 @@ namespace OHOS
             {
                 delete Title;
                 Title=nullptr;
+            }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
             }
             delete tesMOTORScrollView;
             tesMOTORScrollView=nullptr;
@@ -180,6 +199,13 @@ namespace OHOS
 
         Title= testAboutView::GetInstance()->init_title(136,45,"MOTOR_TEST");
         tesMOTORScrollView->Add(Title);
+
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
         
 
         return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
index 9996b76..968fff5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
@@ -10,6 +10,19 @@
 #include "CompassModel.h"
 #include "linux/delay.h"
 #include "power_display_service.h"
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 //#include "acc_service.h"
 namespace OHOS
 {
@@ -157,6 +170,12 @@ namespace OHOS
             {
                 delete labelButton_next;
                 labelButton_next=nullptr;
+            }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
             }
             delete testoldScrollView;
             testoldScrollView=nullptr;
@@ -283,6 +302,13 @@ namespace OHOS
          }  
         display_api->set_screen_set_keepon_timeout(-1);
 
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
         
 
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testspeak.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testspeak.cpp
index 2347aa6..fb33f7c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testspeak.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testspeak.cpp
@@ -4,6 +4,19 @@
 #include "producttest/include/testspeak.h" 
 #include "AlarmClockModel.h"
 #include "cmsis_os2.h"
+#ifdef __cplusplus
+#if __cplusplus
+extern "C"
+{
+#endif
+#endif
+    #include "pm_veto.h"
+    #include "pm.h"
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
 
 namespace OHOS
 {
@@ -54,6 +67,12 @@ namespace OHOS
             {
                 delete Title;
                 Title=nullptr;
+            }
+             uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+            if (cnt == 1) {
+                uapi_pm_remove_sleep_veto(PM_ID_P_TEST);
+            } else {
+                // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
             }
             delete testSPEAKScrollView;
             testSPEAKScrollView=nullptr;
@@ -216,6 +235,13 @@ namespace OHOS
         testSPEAKScrollView->SetTouchable(true);
         testSPEAKScrollView->SetDraggable(true);
 
+         uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
+        if (cnt == 0) {
+            uapi_pm_add_sleep_veto(PM_ID_P_TEST);
+        } else {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n");
+        }
+
 
         return true;
     }

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
index c8cd31c..e11693c 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -482,7 +482,7 @@ void BtGapReadRemoteRssiEventCallback(const bd_addr_t *bdAddr, int rssi, int sta
 void BtGapDiscoveryStateChangedCallback(int status)\r
 {\r
     UNUSED(status);\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bt BtGapDiscoveryStateChangedCallback %d", status);\r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bt BtGapDiscoveryStateChangedCallback %d", status);\r
 }\r
 \r
 static void ChangeScanView()\r