产测模式入口

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 9a7720e..a863774 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
@@ -35,7 +35,9 @@ namespace OHOS
         HRSENSON,\r
         GSENSON,\r
         OLDTEST,\r
+        shutdown,\r
         TEST_1,\r
+        \r
 \r
         MAX_TESTVIEWID,\r
     } TEST_VIEW;\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 1d437bd..1ec1fff 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
@@ -51,7 +51,8 @@ namespace OHOS
         {MAKEPHONE,"makephonebutton", "hrsensonbutton_next",true},\r
         {HRSENSON,"hrsensonbutton", "gsensonbutton_next",true},\r
         {GSENSON,"gsensonbutton","xxxx" ,true},\r
-        {OLDTEST,"oldtestbutton","xxxxxxxxx",true},\r
+        {OLDTEST,"oldtestbutton","xxxx",true},\r
+        {shutdown,"shutdown","xxxxxxxxx",true},\r
         };\r
         // {FACTORYRESETVIEW,"FactoryResetButton",true},\r
         // {SYSTEMLUPGRADE,"systemupgread",true},\r
@@ -181,6 +182,10 @@ namespace OHOS
             testView::GetInstance()->ChangeView(GSENSON,TESTVIEW);\r
             return true;\r
         }\r
+        if(strcmp(view.GetViewId(),"shutdown") == 0)\r
+        {\r
+            uapi_poweroff_device();\r
+        }\r
 \r
         for(int i=0;i<len;i++)\r
         {\r

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 a1115f6..846846f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
@@ -29,9 +29,10 @@ namespace OHOS
         {CAT1,"cat1button","CAT1", &testView::ChangeCAT1TESTView},\r
         {BUTTON,"buttonbutton","button" ,&testView::ChangKEYTESTView},\r
         {MAKEPHONE,"makephonebutton","makephone" ,&testView::ChangeMPTESTView},\r
-        {HRSENSON,"hrsensonbutton","hrsenson" ,&testView::ChangeHRTESTView},\r
-        {GSENSON,"gsensonbutton","gsenson" ,&testView::ChangeGTESTView},\r
-        {OLDTEST,"oldtestbutton","oldtest" ,&testView::ChangeoldTESTView},\r
+        {HRSENSON,"hrsensonbutton","hrsensor" ,&testView::ChangeHRTESTView},\r
+        {GSENSON,"gsensonbutton","gsensor" ,&testView::ChangeGTESTView},\r
+        {OLDTEST,"oldtestbutton","aging" ,&testView::ChangeoldTESTView},\r
+        {shutdown,"shutdown","shutdown" ,&testView::ChangeoldTESTView},\r
         // {FACTORYRESETVIEW,"FactoryResetButton","恢复出厂", &testView::ChangeSystemAboutView},\r
         // {SYSTEMLUPGRADE,"systemupgread","系统升级",&testView::ChangeSystemAboutView},\r
         // {TEST,"testButton","测试模式", &testView::ChangeSystemAboutView},\r
@@ -532,21 +533,26 @@ namespace OHOS
         ClickFunc(showView);\r
         SystemScrollView[showView]->SetVisible(true);\r
         Draw();\r
-        // if(hideView!=0)\r
-        // {\r
-        //    switch (hideView)\r
-        //    {\r
-        //     case VISON:\r
-        //         delete test_about_view;  \r
-        //         test_about_view = nullptr;\r
-        //     break;\r
-        //     case LCD:\r
-        //         delete test_LCD_view;  \r
-        //         test_LCD_view = nullptr;\r
-        //     break;\r
-        //     case TP:\r
-        //         delete test_TP_view;  \r
-        //         test_TP_view = nullptr;\r
+        if(hideView!=0)\r
+        {\r
+           switch (hideView)\r
+           {\r
+            case VISON:\r
+                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+                delete test_about_view;  \r
+                test_about_view = nullptr;\r
+            break;\r
+            case LCD:\r
+                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+                delete test_LCD_view;  \r
+                test_LCD_view = nullptr;\r
+            break;\r
+            case TP:\r
+                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
+                delete test_TP_view;  \r
+                test_TP_view = nullptr;\r
+           }\r
+        }\r
         //     break;\r
         //     case MAGETIC:\r
         //         delete test_MG_view;  \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
index 56cfa2b..5b38231 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -108,8 +108,13 @@ namespace OHOS
             return false;\r
         }\r
         SystemAboutTheWatchScrollView->SetOnDragListener(draglistener);\r
+\r
         SystemAboutTheWatchScrollView->SetTouchable(true);\r
         SystemAboutTheWatchScrollView->SetDraggable(true);\r
+\r
+        SystemAboutTheWatchScrollView->SetViewId("SystemAboutTheWatchTitle");\r
+        UIView::OnClickListener *touch = static_cast<UIView::OnClickListener *>(SystemPresenter::GetInstance());\r
+        SystemAboutTheWatchScrollView->SetOnClickListener(touch);\r
         return true;\r
     }\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
index f3c48e3..aa995c1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
@@ -60,10 +60,14 @@ namespace OHOS
         Presenter<SystemView>::OnStart();\r
     }\r
 \r
-    void SystemPresenter::OnPause(void)\r
+    static uint32_t time=0;\r
+    static uint32_t OnClick_num=0;\r
+\r
+    bool SystemPresenter::OnPress(UIView &view, const PressEvent &event)\r
     {\r
+        \r
 \r
-        Presenter<SystemView>::OnPause();\r
+        \r
     }\r
 \r
     void SystemPresenter::OnResume(void)\r
@@ -109,22 +113,54 @@ namespace OHOS
         // int len=5;\r
         //  根据控件id查找是哪个控件触发了点击回调\r
 \r
+        if(strcmp(view.GetViewId(), "SystemAboutTheWatchTitle")==0)\r
+        {   \r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchTitle");\r
+            if(time==0)\r
+            {\r
+                time = event.GetTimeStamp();\r
+                OnClick_num=1;\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "222  %d",time);\r
+            }\r
+            else\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "111   %d",event.GetTimeStamp());\r
+                if(event.GetTimeStamp() -time<1000)\r
+                {\r
+                    OnClick_num++;\r
+                    \r
+                    if(OnClick_num>5)\r
+                    {\r
+                        NativeAbility::GetInstance().ChangeSlice(VIEW_TEST);\r
+                    }\r
+                }\r
+                else\r
+                {\r
+                    time =0;\r
+                }\r
+            }\r
+            return true;\r
+        }\r
+       \r
+        \r
         for (int i = 0; i < len; i++)\r
         {\r
             if (strcmp(view.GetViewId(), ViewMapper_t[i].viewid_str) == 0)\r
             {\r
                 if (i == 5)\r
                 {\r
-                    NativeAbility::GetInstance().ChangeSlice(VIEW_TEST);\r
+                   \r
                     break;\r
                 }\r
 \r
                 if (ViewMapper_t[i].enable_falg == true)\r
                     SystemView::GetInstance()->ChangeView(SYSTEMVIEW, ViewMapper_t[i].viewId);\r
+                time=0;\r
                 return true;\r
             }\r
         }\r
 \r
+\r
         if (strcmp(view.GetViewId(), FACTORYRESET_CHECKON) == 0)\r
         {\r
             p_SystemView->ChangeView(FACTORYRESETVIEW, SYSTEMVIEW);\r