修复产测死机

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
index d714525..f9d538c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
@@ -56,7 +56,7 @@ namespace OHOS
         virtual ~testPresenter();\r
 \r
         void OnStart() override;\r
-       \r
+        void OnPause() override;\r
         void OnResume() override;\r
         void OnStop() override;\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
index 75b74da..b71341d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
@@ -90,6 +90,12 @@ namespace OHOS
         Presenter<testView>::OnStart();\r
     }\r
 \r
+    void testPresenter::OnPause(void)\r
+    {\r
+\r
+        Presenter<testView>::OnPause();\r
+    }\r
+\r
     bool testPresenter::OnPress(UIView &view, const PressEvent &event)\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::");\r
@@ -277,7 +283,6 @@ namespace OHOS
         else\r
         testbuttonView::GetInstance()-> Changbutton(1,false);\r
        \r
-       \r
         // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
         // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
     }\r

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 82706d7..2623c69 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testTP.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testTP.cpp
@@ -42,7 +42,6 @@ namespace OHOS
                     button[i]=NULL;
                 }
             }
-
             if(labelButton_next)
             {
                 delete labelButton_next;

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 cfdd0a4..3927316 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
@@ -82,35 +82,88 @@ namespace OHOS
                     button[i]=NULL;\r
                 }\r
             }\r
-             delete test_about_view;  \r
-            test_about_view = nullptr;\r
-            delete test_LCD_view;  \r
+            if(test_about_view)\r
+            {\r
+                delete test_about_view;  //1\r
+                test_about_view = nullptr;\r
+            }\r
+            \r
+            if(test_LCD_view)\r
+            {\r
+            delete test_LCD_view;  //2\r
             test_LCD_view = nullptr;\r
-            delete test_TP_view;\r
+            }\r
+            if(test_TP_view)\r
+            {\r
+            delete test_TP_view; //3\r
             test_TP_view = nullptr;\r
-            delete test_lum_view;\r
+            }\r
+            if(test_lum_view)\r
+            {\r
+            delete test_lum_view;//4\r
             test_lum_view = nullptr;\r
-            delete test_charging_view;\r
+            }\r
+            if(test_charging_view)\r
+            {\r
+            delete test_charging_view;//5\r
             test_charging_view = nullptr;\r
-            delete test_speak_view;\r
+            }\r
+            if(test_speak_view)\r
+            {\r
+            delete test_speak_view;//6\r
             test_speak_view = nullptr;\r
-            delete test_motor_view;\r
+            }\r
+            if(test_motor_view)\r
+            {\r
+            delete test_motor_view;//7\r
             test_motor_view = nullptr;\r
-            delete test_cat1_view;\r
+            }\r
+            if(test_cat1_view)\r
+            {\r
+            delete test_cat1_view;//8\r
             test_cat1_view = nullptr;\r
-            delete test_KEY_view;\r
+            }\r
+            if(test_KEY_view)\r
+            {\r
+            delete test_KEY_view;//9\r
             test_KEY_view = nullptr;\r
-            delete test_MG_view;\r
+            }\r
+            if(test_MG_view)\r
+            {\r
+            delete test_MG_view;//10\r
             test_MG_view = nullptr;\r
-            delete test_hr_view;\r
+            }\r
+            if(test_hr_view)\r
+            {\r
+            delete test_hr_view;//11\r
             test_hr_view = nullptr;\r
-            delete test_MP_view;\r
+            }\r
+            if(test_MP_view)\r
+            {\r
+            delete test_MP_view;//12\r
             test_MP_view = nullptr;\r
+            }\r
+            if(test_G_view)\r
+            {\r
+            delete test_G_view;//13\r
+            test_G_view= nullptr;\r
+            }\r
+            // delete test_G_view;//13\r
+            // test_G_view= nullptr;\r
+\r
             delete SystemLabel;\r
             SystemLabel = nullptr;\r
-\r
-            delete SystemScrollView[TESTVIEW];\r
-            SystemScrollView[TESTVIEW] = nullptr;\r
+            if(SystemScrollView[TESTVIEW])\r
+            {\r
+                delete SystemScrollView[TESTVIEW];\r
+                SystemScrollView[TESTVIEW] = nullptr;\r
+            }\r
+            for(int i=1;i<13;i++)\r
+            {\r
+                if(SystemScrollView[i])\r
+                SystemScrollView[i] = nullptr;   \r
+            }\r
+           \r
         }\r
     }\r
 \r
@@ -637,11 +690,11 @@ namespace OHOS
         //InitIView();\r
         initView_ext(43,120,380,100,120,"/user/res/SETTING_NEXT.bin");\r
         const power_display_svr_api_t *display_api = power_display_svr_get_api();\r
-        if (display_api->get_screen_state() != SCREEN_ON)\r
-         {   \r
-               display_api->turn_on_screen();  \r
-         }  \r
-        display_api->set_screen_set_keepon_timeout(-1);\r
+        // if (display_api->get_screen_state() != SCREEN_ON)\r
+        //  {   \r
+        //        display_api->turn_on_screen();  \r
+        //  }  \r
+        // display_api->set_screen_set_keepon_timeout(-1);\r
     }\r
 \r
     void testView::OnSetUpView()\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
index 1214d7b..9f1f029 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
@@ -17,7 +17,7 @@ namespace OHOS
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
         ClearAll();
-        g_pSystemAboutTheWatchView = nullptr;
+        //g_pSystemAboutTheWatchView = nullptr;
     }
 
     testAboutView *testAboutView::GetInstance()
@@ -102,10 +102,11 @@ namespace OHOS
         // label->SetPosition(x, y);         // widget's left position and top position
         // label->Resize(135, 88);          // widget's width and height
         label->SetPosition(x, y);         // widget's left position and top position
-        label->Resize(460, 62); 
+        label->Resize(200, 62); 
         // Set additional property
         label->SetText(view_text);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        label->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         label->SetVisible(true);
 
         return label;

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 7c3bb28..6494868 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbutton.cpp
@@ -57,7 +57,8 @@ namespace OHOS
                 delete Title;
                 Title=nullptr;
             }
-
+            RootView::GetInstance()->ClearOnKeyActListener();
+            
             delete testBUTTONScrollView;
             testBUTTONScrollView=nullptr;
        }

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 14e0b71..22edd87 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
@@ -32,7 +32,7 @@ namespace OHOS
                 uint16_t angle_value= (int16_t)mag_service_get_fAzimuth();
                 char buf[16]={0};
                 sprintf(buf,"angle:%d",angle_value);
-                if( testoldView::GetInstance()->x)
+                if( testoldView::GetInstance()->x && AGING_task_falg)
                 {
                     testoldView::GetInstance()->x->SetText(buf);
                     RootView::GetInstance()->Invalidate();
@@ -52,7 +52,7 @@ namespace OHOS
                 uint16 y_t=t.y;
                 uint16 z_t=t.z;
                 sprintf(buf,"gsensor:\nX:%d\nY:%d\nZ:%d",x_t,y_t,z_t);
-                if(testoldView::GetInstance()->x)
+                if(testoldView::GetInstance()->x && AGING_task_falg)
                 {
                     testoldView::GetInstance()->x->SetText(buf);
                     RootView::GetInstance()->Invalidate();

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 508a231..5608cdc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testspeak.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testspeak.cpp
@@ -113,6 +113,7 @@ namespace OHOS
                 {
                     //开始
                     AlarmClockModel::GetInstance()->AlarmPlayerStart();
+                    speakfalg=true;
                     // if(speak_TEST_timer!=NULL)
                     // osTimerDelete(speak_TEST_timer);