解决产测子界面右滑退出死机问题

diff --git a/code/sdk/zhihui/UI/producttest/include/testView.h b/code/sdk/zhihui/UI/producttest/include/testView.h
index 53f060c..b815bb4 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/include/testView.h
+++ b/code/sdk/zhihui/UI/producttest/include/testView.h
@@ -117,6 +117,7 @@ namespace OHOS
        \r
         testAboutView *test_about_view;\r
         UIScrollView *SystemScrollView[30]{nullptr};\r
+        UIViewGroup *group{nullptr};\r
         UILabel *SystemLabel{nullptr}; // 标题\r
         UILabelButtonExt *SystemUpgradeButtonExt{nullptr};\r
 \r

diff --git a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp
index eef30b2..9ed8d2f 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp
@@ -38,7 +38,7 @@ namespace OHOS
 
     testA5133View::testA5133View()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testA5133View::testA5133View");
         g_ptestA5133View = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
index 4341286..af625e2 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
@@ -21,7 +21,7 @@ namespace OHOS
 
     testGPSView::testGPSView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testGPSView::testGPSView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testLCD.cpp b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
index c2754d9..20c0ed8 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
@@ -26,7 +26,7 @@ namespace OHOS
 
     testLCDView::testLCDView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testLCDView::testLCDView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testPing.cpp b/code/sdk/zhihui/UI/producttest/src/testPing.cpp
index 04b7e63..70a4714 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testPing.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testPing.cpp
@@ -24,7 +24,7 @@ namespace OHOS
 
     testPingView::testPingView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testPingView::testPingView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
index e212fd6..e0213e0 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
@@ -64,14 +64,14 @@ namespace OHOS
 \r
     testPresenter::testPresenter()\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::SystemPresenter");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testPresenter::testPresenter");\r
         g_pSystemPresenter = this;\r
         //systemModel = testModel::GetInstance();\r
     }\r
 \r
     testPresenter::~testPresenter()\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::~SystemPresenter");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testPresenter::~testPresenter");\r
         g_pSystemPresenter = nullptr;\r
     }\r
 \r

diff --git a/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp b/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp
index 4d31992..95dfd00 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp
@@ -25,13 +25,13 @@ namespace OHOS
 
     testSEChipView::testSEChipView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testSEChipView::testSEChipView");
         //g_pSystemAboutTheWatchView = this;
     }
 
     testSEChipView::~testSEChipView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testSEChipView::~testSEChipView");
         ClearAll();
         //g_pSystemAboutTheWatchView = nullptr;
     }

diff --git a/code/sdk/zhihui/UI/producttest/src/testTP.cpp b/code/sdk/zhihui/UI/producttest/src/testTP.cpp
index 259d314..e50e098 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testTP.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testTP.cpp
@@ -24,7 +24,7 @@ namespace OHOS
 
     testTPView::testTPView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testTPView::testTPView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
index 88374fb..2371a3c 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testView.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp
@@ -11,9 +11,8 @@
 #include "custom_utils.h"\r
 #include "custom_runtime.h"\r
 \r
-\r
 #ifdef FD230\r
-    #include "factorytest_protocol.h"\r
+#include "factorytest_protocol.h"\r
 #endif\r
 \r
 namespace OHOS\r
@@ -22,45 +21,43 @@ namespace OHOS
     static testView *g_pSystemView{nullptr};\r
 \r
     // 2.ViewMapper[] 是一个静态的视图映射数组，将视图ID与MainStopWatchView类中的特定成员函数指针进行了绑定。\r
-        test_ext Test_ViewMapper_t[] = {\r
-        {TESTVIEW,"","","",&testView::ChangeSystemAboutView,false},//占位，空的\r
-        {VISON,"AboutTheWatchButton","Verison","AboutTheWatchButton_next",&testView::ChangeSystemAboutView,true},\r
-        {LCD,"LCDButton","LCD","LCDButton_next",&testView::ChangeLCDTESTView,true},\r
-        {TP,"TPButton","TP","TPButton_next", &testView::ChangeTPTESTView,true},\r
-        {MAGETIC,"MAGETICButton","Magetic","MAGETICButton_next", &testView::ChangeMGTESTView,true},\r
-        {LUMINANCE,"luminanceButton","luminance","luminanceButton_next", &testView::ChangLUMTESTView,true},\r
-        {CHARG,"chargingButton","bat&charger","chargingButton_next",&testView::ChangchargingTESTView,true},\r
-        {SPEAK,"speakButton","speak","speakButton_next" ,&testView::ChangspeakTESTView,true},\r
-\r
-        {MOTOR,"motorButton","motor","motorButton_next" ,&testView::ChangmotorTESTView,true},\r
-    #ifdef SUPPORT_CAT1_MODEM\r
-        {CAT1,"cat1button","CAT1", "cat1button_next",&testView::ChangeCAT1TESTView,true},\r
-    #endif\r
-        {BUTTON,"buttonbutton","button" ,"buttonbutton_next",&testView::ChangKEYTESTView,true},\r
-        {MICROPHONE,"microphonebutton","microphone", "microphonebutton_next",&testView::ChangeMPTESTView,true},\r
-        {HRSENSON,"hrsensonbutton","hrsensor", "hrsensonbutton_next",&testView::ChangeHRTESTView,true},\r
-        {GSENSON,"gsensonbutton","gsensor","gsensonbutton_next" ,&testView::ChangeGTESTView,true},\r
-        {BTTEST,"BTbutton","BT" ,"BTbutton_next",&testView::ChangeBTTESTView,true},\r
-        {SEChipTest,"SEChipTestbutton","SEChipTest","SEChipTestbutton_next" ,&testView::ChangeSEChipTESTView,true},\r
-        {PingTest,"PingTestbutton","PingTest","PingTestbutton_next" ,&testView::ChangePingTESTView,true},\r
-\r
+    test_ext Test_ViewMapper_t[] = {\r
+        {TESTVIEW, "", "", "", &testView::ChangeSystemAboutView, false}, // 占位，空的\r
+        {VISON, "AboutTheWatchButton", "Verison", "AboutTheWatchButton_next", &testView::ChangeSystemAboutView, true},\r
+        {LCD, "LCDButton", "LCD", "LCDButton_next", &testView::ChangeLCDTESTView, true},\r
+        {TP, "TPButton", "TP", "TPButton_next", &testView::ChangeTPTESTView, true},\r
+        {MAGETIC, "MAGETICButton", "Magetic", "MAGETICButton_next", &testView::ChangeMGTESTView, true},\r
+        {LUMINANCE, "luminanceButton", "luminance", "luminanceButton_next", &testView::ChangLUMTESTView, true},\r
+        {CHARG, "chargingButton", "bat&charger", "chargingButton_next", &testView::ChangchargingTESTView, true},\r
+        {SPEAK, "speakButton", "speak", "speakButton_next", &testView::ChangspeakTESTView, true},\r
+        {MOTOR, "motorButton", "motor", "motorButton_next", &testView::ChangmotorTESTView, true},\r
+#ifdef SUPPORT_CAT1_MODEM\r
+        {CAT1, "cat1button", "CAT1", "cat1button_next", &testView::ChangeCAT1TESTView, true},\r
+#endif\r
+        {BUTTON, "buttonbutton", "button", "buttonbutton_next", &testView::ChangKEYTESTView, true},\r
+        {MICROPHONE, "microphonebutton", "microphone", "microphonebutton_next", &testView::ChangeMPTESTView, true},\r
+        {HRSENSON, "hrsensonbutton", "hrsensor", "hrsensonbutton_next", &testView::ChangeHRTESTView, true},\r
+        {GSENSON, "gsensonbutton", "gsensor", "gsensonbutton_next", &testView::ChangeGTESTView, true},\r
+        {BTTEST, "BTbutton", "BT", "BTbutton_next", &testView::ChangeBTTESTView, true},\r
+        {SEChipTest, "SEChipTestbutton", "SEChipTest", "SEChipTestbutton_next", &testView::ChangeSEChipTESTView, true},\r
+        {PingTest, "PingTestbutton", "PingTest", "PingTestbutton_next", &testView::ChangePingTESTView, true},\r
 #if defined(SUPPORT_GNSS)\r
-        {GPSTEST,"GPSTestbutton","GPSTest","GPSTestbutton_next" ,&testView::ChangeGPSTESTView,true},\r
+        {GPSTEST, "GPSTestbutton", "GPSTest", "GPSTestbutton_next", &testView::ChangeGPSTESTView, true},\r
+#endif\r
+        {PRESSURETEST, "pressureTestbutton", "pressureTest", "pressureTestbutton_next", &testView::ChangepressureTestTESTView, true},\r
+#ifdef AGINGTEST\r
+        {OLDTEST, "oldtestbutton", "aging", "oldtestexit", &testView::ChangeoldTESTView, true},\r
+#endif\r
+        {DEEPSLEEP, "deepsleep", "DeepSleepCurrent", "xxxxxxxxx", &testView::ChangeoldTESTView, true},\r
+        {shutdown, "shutdown", "shutdown", "xxxxxxxxx", &testView::ChangeoldTESTView, true},\r
+        {RESET, "reset", "reset", "xxxxxxxxx", &testView::ChangeoldTESTView, true},\r
+        {FACTORYRESE, "FactoryReset", "FactoryReset", "xxxxxxxxx", &testView::ChangeoldTESTView, true},\r
+#ifdef SUPPORT_A5133_SERVICE\r
+        {RF5133, "RF5133", "RF5133", "xxxxxxxxx", &testView::ChangeA5133TESTView, true},\r
 #endif\r
-        {PRESSURETEST,"pressureTestbutton","pressureTest","pressureTestbutton_next" ,&testView::ChangepressureTestTESTView,true},\r
-    #ifdef AGINGTEST\r
-        {OLDTEST,"oldtestbutton","aging" ,"oldtestexit",&testView::ChangeoldTESTView,true},\r
-    #endif\r
-        {DEEPSLEEP,"deepsleep","DeepSleepCurrent","xxxxxxxxx" ,&testView::ChangeoldTESTView,true},\r
-        {shutdown,"shutdown","shutdown", "xxxxxxxxx",&testView::ChangeoldTESTView,true},\r
-        {RESET,"reset","reset", "xxxxxxxxx",&testView::ChangeoldTESTView,true},\r
-        {FACTORYRESE,"FactoryReset","FactoryReset","xxxxxxxxx", &testView::ChangeoldTESTView,true},\r
-    #ifdef SUPPORT_A5133_SERVICE\r
-        {RF5133,"RF5133","RF5133", "xxxxxxxxx",&testView::ChangeA5133TESTView,true},\r
-    #endif\r
 \r
     };\r
-    \r
+\r
     testView::testView()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testView::testView");\r
@@ -81,110 +78,112 @@ namespace OHOS
 \r
     void testView::ClearAll()\r
     {\r
-        if (initViewStatus == true)\r
+        if (group)\r
         {\r
-            SystemScrollView[TESTVIEW]->RemoveAll();\r
-            int funcSize = sizeof(Test_ViewMapper_t) / sizeof(Test_ViewMapper_t[TESTVIEW]);\r
-            for (int i = 0; i < funcSize; i++)\r
+            group->RemoveAll();\r
+            delete group;\r
+            group = nullptr;\r
+            if (SystemScrollView[TESTVIEW])\r
             {\r
-                if(button[i])\r
+                SystemScrollView[TESTVIEW]->RemoveAll();\r
+                delete SystemScrollView[TESTVIEW];\r
+                SystemScrollView[TESTVIEW] = nullptr;\r
+                delete SystemLabel;\r
+                SystemLabel = nullptr;\r
+                int funcSize = sizeof(Test_ViewMapper_t) / sizeof(Test_ViewMapper_t[TESTVIEW]);\r
+                for (int i = 0; i < funcSize; i++)\r
                 {\r
-                    delete button[i];\r
-                    button[i]=NULL;\r
+                    if (button[i])\r
+                    {\r
+                        delete button[i];\r
+                        button[i] = NULL;\r
+                    }\r
                 }\r
             }\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
+        }\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
-            }\r
-            if(test_TP_view)\r
-            {\r
-            delete test_TP_view; //3\r
+        }\r
+        if (test_TP_view)\r
+        {\r
+            delete test_TP_view; // 3\r
             test_TP_view = nullptr;\r
-            }\r
-            if(test_lum_view)\r
-            {\r
-            delete test_lum_view;//4\r
+        }\r
+        if (test_lum_view)\r
+        {\r
+            delete test_lum_view; // 4\r
             test_lum_view = nullptr;\r
-            }\r
-            if(test_charging_view)\r
-            {\r
-            delete test_charging_view;//5\r
+        }\r
+        if (test_charging_view)\r
+        {\r
+            delete test_charging_view; // 5\r
             test_charging_view = nullptr;\r
-            }\r
-            if(test_speak_view)\r
-            {\r
-            delete test_speak_view;//6\r
+        }\r
+        if (test_speak_view)\r
+        {\r
+            delete test_speak_view; // 6\r
             test_speak_view = nullptr;\r
-            }\r
-            if(test_motor_view)\r
-            {\r
-            delete test_motor_view;//7\r
+        }\r
+        if (test_motor_view)\r
+        {\r
+            delete test_motor_view; // 7\r
             test_motor_view = nullptr;\r
-            }\r
+        }\r
 #ifdef SUPPORT_CAT1_MODEM\r
-            if(test_cat1_view)\r
-            {\r
-            delete test_cat1_view;//8\r
+        if (test_cat1_view)\r
+        {\r
+            delete test_cat1_view; // 8\r
             test_cat1_view = nullptr;\r
-            }\r
+        }\r
 #endif\r
 \r
-            if(test_KEY_view)\r
-            {\r
-            delete test_KEY_view;//9\r
+        if (test_KEY_view)\r
+        {\r
+            delete test_KEY_view; // 9\r
             test_KEY_view = nullptr;\r
-            }\r
-            if(test_MG_view)\r
-            {\r
-            delete test_MG_view;//10\r
+        }\r
+        if (test_MG_view)\r
+        {\r
+            delete test_MG_view; // 10\r
             test_MG_view = nullptr;\r
-            }\r
-            if(test_hr_view)\r
-            {\r
-            delete test_hr_view;//11\r
+        }\r
+        if (test_hr_view)\r
+        {\r
+            delete test_hr_view; // 11\r
             test_hr_view = nullptr;\r
-            }\r
-            if(test_MP_view)\r
-            {\r
-            delete test_MP_view;//12\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
+        }\r
+        if (test_G_view)\r
+        {\r
+            delete test_G_view; // 13\r
+            test_G_view = nullptr;\r
+        }\r
 #ifdef SUPPORT_A5133_SERVICE\r
-            if(test_A5133_view)\r
-            {\r
-            delete test_A5133_view;//13\r
-            test_A5133_view= nullptr;\r
-            }\r
+        if (test_A5133_view)\r
+        {\r
+            delete test_A5133_view; // 13\r
+            test_A5133_view = nullptr;\r
+        }\r
 #endif\r
-            // delete test_G_view;//13\r
-            // test_G_view= nullptr;\r
+        // delete test_G_view;//13\r
+        // test_G_view= nullptr;\r
 \r
-            delete SystemLabel;\r
-            SystemLabel = 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
+        for (int i = 1; i < 13; i++)\r
+        {\r
+            if (SystemScrollView[i])\r
+                SystemScrollView[i] = nullptr;\r
         }\r
     }\r
 \r
@@ -201,21 +200,21 @@ namespace OHOS
         }\r
         SystemScrollView[TESTVIEW]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());\r
         SystemScrollView[TESTVIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
-SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);\r
-        \r
+        SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);\r
+\r
         SystemScrollView[TESTVIEW]->SetScrollBlankSize(35);\r
         SystemScrollView[TESTVIEW]->SetReboundSize(50);\r
         SystemScrollView[TESTVIEW]->SetDirection(1);\r
         SystemScrollView[TESTVIEW]->SetThrowDrag(true);         // 设置手指抬起屏幕后是否继续滚动。\r
         SystemScrollView[TESTVIEW]->SetMaxScrollDistance(1000); // 设置手指抬起屏幕后的最大滚动距离。\r
         SystemScrollView[TESTVIEW]->SetSwipeACCLevel(200);      /*设置手指抬起屏幕后的补偿距离。*/\r
-        //UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(new SystemViewOnDragListener());\r
-        // if (draglistener == nullptr)\r
-        // {\r
-        //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");\r
-        //     return false;\r
-        // }\r
-        //SystemScrollView[TESTVIEW]->SetOnDragListener(draglistener);\r
+        // UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(new SystemViewOnDragListener());\r
+        //  if (draglistener == nullptr)\r
+        //  {\r
+        //      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!");\r
+        //      return false;\r
+        //  }\r
+        // SystemScrollView[TESTVIEW]->SetOnDragListener(draglistener);\r
         SystemScrollView[TESTVIEW]->SetTouchable(true);\r
         SystemScrollView[TESTVIEW]->SetDraggable(true);\r
         return true;\r
@@ -242,14 +241,13 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
         SystemLabel->SetRollSpeed(6);\r
         SystemLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);\r
 \r
-        \r
         return true;\r
     }\r
 \r
     /// @brief 设置按钮\r
     /// @param button\r
     /// @return true 设置成功，false 失败\r
-   \r
+\r
     UILabelButtonExt *testView::SetTheButton_ext(ButtonConfig_ext_t &buttonconfig, UIView::OnClickListener *clickListener)\r
     {\r
         UILabelButtonExt *button = new UILabelButtonExt();\r
@@ -267,17 +265,15 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
 \r
         button->SetText(buttonconfig.str);\r
         button->SetAlign(TEXT_ALIGNMENT_LEFT);\r
-        button->SetLabelPosition(buttonconfig.label_x,buttonconfig.label_y );\r
+        button->SetLabelPosition(buttonconfig.label_x, buttonconfig.label_y);\r
         button->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, buttonconfig.Fontsize);\r
-        //button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
+        // button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
 \r
         button->SetImagePosition(326, 37);\r
         return button;\r
     }\r
 \r
-    \r
-\r
-    void testView::initView_ext(int x,int y,int w,int h,int interval,const char *imagsrc)\r
+    void testView::initView_ext(int x, int y, int w, int h, int interval, const char *imagsrc)\r
     {\r
         if (!SetTheSystemScrollView())\r
         {\r
@@ -298,33 +294,30 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
         buttonconfig.w = w;\r
         buttonconfig.h = h;\r
 \r
-        int len =sizeof(Test_ViewMapper_t)/sizeof(Test_ViewMapper_t[0]);\r
+        int len = sizeof(Test_ViewMapper_t) / sizeof(Test_ViewMapper_t[0]);\r
 \r
-        for(int i=1;i<len;i++)\r
+        for (int i = 1; i < len; i++)\r
         {\r
-            buttonconfig.str=Test_ViewMapper_t[i].Labe_str;\r
+            buttonconfig.str = Test_ViewMapper_t[i].Labe_str;\r
             buttonconfig.ViewId = Test_ViewMapper_t[i].viewid_str;\r
             buttonconfig.ImageSrc = imagsrc;\r
-            buttonconfig.label_x=40;\r
-            buttonconfig.label_y=0;\r
-            buttonconfig.Fontsize=30;\r
-            buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;\r
+            buttonconfig.label_x = 40;\r
+            buttonconfig.label_y = 0;\r
+            buttonconfig.Fontsize = 30;\r
+            buttonconfig.ALIGN = TEXT_ALIGNMENT_LEFT;\r
             button[i] = SetTheButton_ext(buttonconfig, clickListener);\r
-            buttonconfig.y+=interval;\r
-\r
+            buttonconfig.y += interval;\r
         }\r
         /* -------------------------------------------------------------------------- */\r
-       \r
     }\r
 \r
-    \r
     // 0.跳转到系统视图，其他视图都市通过这个视图跳转\r
     bool testView::ChangeSystemView(int16_t thisView)\r
     {\r
         if (SystemScrollView[thisView] == nullptr)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeSystemView");\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -342,7 +335,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_about_view->SystemAbouTheWatchtInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -359,7 +352,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_LCD_view->testLCDInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -376,12 +369,12 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_TP_view->testTPInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
 \r
-     bool testView::ChangeMGTESTView(int16_t thisView)\r
+    bool testView::ChangeMGTESTView(int16_t thisView)\r
     {\r
         if (SystemScrollView[thisView] == nullptr)\r
         {\r
@@ -393,7 +386,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_MG_view->testmagicInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -410,11 +403,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_lum_view->testLUMInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
-    \r
+\r
     bool testView::ChangchargingTESTView(int16_t thisView)\r
     {\r
         if (SystemScrollView[thisView] == nullptr)\r
@@ -427,7 +420,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_charging_view->testCHANINGInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -444,7 +437,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_speak_view->testSPEAKInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -461,14 +454,14 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_motor_view->testMOTORInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
 \r
-     bool testView::ChangeCAT1TESTView(int16_t thisView)\r
+    bool testView::ChangeCAT1TESTView(int16_t thisView)\r
     {\r
-        #ifdef SUPPORT_CAT1_SERVICE\r
+#ifdef SUPPORT_CAT1_SERVICE\r
         if (SystemScrollView[thisView] == nullptr)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeCAT1TESTView");\r
@@ -479,9 +472,9 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_cat1_view->testcat1InitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
-        #endif\r
+#endif\r
         return true;\r
     }\r
 \r
@@ -497,7 +490,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_KEY_view->testBUTTONInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -514,7 +507,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_MP_view->testmicrophoneInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -531,12 +524,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_hr_view->testhrsensonInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
 \r
-    \r
     bool testView::ChangeGTESTView(int16_t thisView)\r
     {\r
         if (SystemScrollView[thisView] == nullptr)\r
@@ -549,15 +541,14 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_G_view->testGSENSONInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
-  \r
 \r
-     bool testView::ChangeoldTESTView(int16_t thisView)\r
+    bool testView::ChangeoldTESTView(int16_t thisView)\r
     {\r
-          #ifdef AGINGTEST\r
+#ifdef AGINGTEST\r
         if (SystemScrollView[thisView] == nullptr)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeoldTESTView");\r
@@ -568,13 +559,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_old_view->testoldInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
-          #endif\r
+#endif\r
         return true;\r
-       \r
     }\r
-   \r
 \r
     bool testView::ChangeBTTESTView(int16_t thisView)\r
     {\r
@@ -588,12 +577,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_BT_view->testBTInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
 \r
-    \r
     bool testView::ChangeSEChipTESTView(int16_t thisView)\r
     {\r
         if (SystemScrollView[thisView] == nullptr)\r
@@ -606,7 +594,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_SEChip_view->SEChipInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -623,12 +611,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_Ping_view->testPingInitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
 \r
-    \r
     bool testView::ChangeGPSTESTView(int16_t thisView)\r
     {\r
 #if defined(SUPPORT_GNSS)\r
@@ -642,13 +629,13 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_GPS_view->testGPSInitIView((uint8_t)thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
 #endif\r
         return true;\r
     }\r
 \r
-     bool testView::ChangepressureTestTESTView(int16_t thisView)\r
+    bool testView::ChangepressureTestTESTView(int16_t thisView)\r
     {\r
 \r
         if (SystemScrollView[thisView] == nullptr)\r
@@ -661,14 +648,12 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_pressure_view->testpressureInitIView((uint8_t)thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
 \r
         return true;\r
     }\r
 \r
-\r
-\r
 #ifdef SUPPORT_A5133_SERVICE\r
     bool testView::ChangeA5133TESTView(int16_t thisView)\r
     {\r
@@ -682,7 +667,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 return false;\r
             }\r
             SystemScrollView[thisView] = test_A5133_view->testA5133InitIView(thisView);\r
-            AddViewToRootContainer(SystemScrollView[thisView]);\r
+            group->Add(SystemScrollView[thisView]);\r
         }\r
         return true;\r
     }\r
@@ -699,7 +684,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
 \r
     /* -------------------------------------------------------------------------- */\r
     // 1.MainStopWatchViewMapper:结构体定义了一个将视图ID映射到特定成员函数指针的映射表。\r
-  \r
+\r
     // 3.根据传入的interface参数执行相应视图ID关联的成员函数。\r
     bool testView::ClickFunc(int16_t interface)\r
     {\r
@@ -727,164 +712,190 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: SystemViewId Overstep ones bounds");\r
             return;\r
         }\r
-        SystemScrollView[hideView]->SetVisible(false);\r
+        if (SystemScrollView[hideView] != nullptr)\r
+        {\r
+            SystemScrollView[hideView]->SetVisible(false);\r
+        }\r
+        else\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: SystemScrollView[%d] is nullptr", hideView);\r
+        }\r
         ClickFunc(showView);\r
-        SystemScrollView[showView]->SetVisible(true);\r
-        Draw();\r
-        if(hideView!=0)\r
+        if (SystemScrollView[showView] != nullptr)\r
+        {\r
+            SystemScrollView[showView]->SetVisible(true);\r
+        }\r
+        else\r
         {\r
-           switch (hideView)\r
-           {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: SystemScrollView[%d] is nullptr", showView);\r
+        }\r
+        if (hideView != 0)\r
+        {\r
+            switch (hideView)\r
+            {\r
             case VISON:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_about_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_about_view;\r
                 test_about_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case LCD:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_LCD_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_LCD_view;\r
                 test_LCD_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case TP:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_TP_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_TP_view;\r
                 test_TP_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;   \r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case MAGETIC:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_MG_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_MG_view;\r
                 test_MG_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case LUMINANCE:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_lum_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_lum_view;\r
                 test_lum_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case CHARG:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_charging_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_charging_view;\r
                 test_charging_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
 \r
             case SPEAK:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_speak_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_speak_view;\r
                 test_speak_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case MOTOR:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_motor_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_motor_view;\r
                 test_motor_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
 #ifdef SUPPORT_CAT1_MODEM\r
-             case CAT1:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_cat1_view;  \r
+            case CAT1:\r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_cat1_view;\r
                 test_cat1_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
 #endif\r
-             case BUTTON:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_KEY_view;  \r
+            case BUTTON:\r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_KEY_view;\r
                 test_KEY_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case MICROPHONE:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_MP_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_MP_view;\r
                 test_MP_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case HRSENSON:\r
-                 RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_hr_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_hr_view;\r
                 test_hr_view = nullptr;\r
-                 SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case GSENSON:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_G_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_G_view;\r
                 test_G_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
-            break;\r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
             case OLDTEST:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_old_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_old_view;\r
                 test_old_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
+                SystemScrollView[hideView] = nullptr;\r
                 break;\r
             case BTTEST:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_BT_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_BT_view;\r
                 test_BT_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
+                SystemScrollView[hideView] = nullptr;\r
                 break;\r
             case SEChipTest:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_SEChip_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_SEChip_view;\r
                 test_SEChip_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
+                SystemScrollView[hideView] = nullptr;\r
                 break;\r
             case PingTest:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_Ping_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_Ping_view;\r
                 test_Ping_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
+                SystemScrollView[hideView] = nullptr;\r
                 break;\r
 #if defined(SUPPORT_GNSS)\r
             case GPSTEST:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_GPS_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_GPS_view;\r
                 test_GPS_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
-                break; \r
+                SystemScrollView[hideView] = nullptr;\r
+                break;\r
 #endif\r
 #ifdef SUPPORT_A5133_SERVICE\r
             case RF5133:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_A5133_view;  \r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_A5133_view;\r
                 test_A5133_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
+                SystemScrollView[hideView] = nullptr;\r
                 break;\r
 #endif\r
-             case PRESSURETEST:\r
-                RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
-                delete test_pressure_view;  \r
+            case PRESSURETEST:\r
+                group->Remove(SystemScrollView[hideView]);\r
+                delete test_pressure_view;\r
                 test_pressure_view = nullptr;\r
-                SystemScrollView[hideView]=nullptr;\r
+                SystemScrollView[hideView] = nullptr;\r
                 break;\r
 \r
-           default:\r
-            break;\r
-           }\r
+            default:\r
+                break;\r
+            }\r
         }\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "change>>>>>>>>>>>hideView %d > showView %d >>>",hideView,showView);\r
-       \r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "change>>>>>>>>>>>hideView %d > showView %d >>>", hideView, showView);\r
     }\r
     /* -------------------------------------------------------------------------- */\r
 \r
     void testView::OnStart()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnStart>>>>>>>>>>>>>");\r
-        //InitIView();\r
-        initView_ext(43,120,380,100,120,"/user/res/SETTING_NEXT.bin");\r
+\r
+        if (group == nullptr)\r
+        {\r
+            group = new UIViewGroup();\r
+            if (group == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::WatchQRCodeGroupView new fail!");\r
+            }\r
+        }\r
+        group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());\r
+        group->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
+        group->SetTouchable(true);\r
+        group->SetDraggable(true);\r
+\r
+        // 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
+        {\r
+            display_api->turn_on_screen();\r
+        }\r
         display_api->set_auto_timeout_function(false);\r
 \r
-        if(!uapi_dev_runtime_get_factory_test_status_flag())\r
+        if (!uapi_dev_runtime_get_factory_test_status_flag())\r
             uapi_set4GCapability(true);\r
 \r
         start_custom_ble_service();\r
@@ -894,23 +905,13 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: OnSetUpView  has nullptr");\r
             return;\r
         }\r
-        \r
         SystemScrollView[TESTVIEW]->Add(SystemLabel);\r
-\r
-        int len =sizeof(Test_ViewMapper_t)/sizeof(Test_ViewMapper_t[0]);\r
-\r
-        for(int i=0;i<len;i++)\r
+        int len = sizeof(Test_ViewMapper_t) / sizeof(Test_ViewMapper_t[0]);\r
+        for (int i = 0; i < len; i++)\r
         {\r
-         SystemScrollView[TESTVIEW]->Add(button[i]);\r
+            SystemScrollView[TESTVIEW]->Add(button[i]);\r
         }\r
-       \r
-        // SystemScrollView[SYSTEMVIEW]->Add(SuperviseButton);\r
-        // SystemScrollView[SYSTEMVIEW]->Add(SystemLanguageButton);\r
-        // SystemScrollView[SYSTEMVIEW]->Add(FactoryResetButton);\r
-        // SystemScrollView[SYSTEMVIEW]->Add(SystemUpgradeButtonExt);\r
-\r
-        AddViewToRootContainer(SystemScrollView[TESTVIEW]);\r
+        group->Add(SystemScrollView[TESTVIEW]);\r
+        AddViewToRootContainer(group);\r
     }\r
-\r
-    \r
 }
\ No newline at end of file

diff --git a/code/sdk/zhihui/UI/producttest/src/testabout.cpp b/code/sdk/zhihui/UI/producttest/src/testabout.cpp
index c6912e8..7ac4650 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testabout.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testabout.cpp
@@ -58,13 +58,13 @@ namespace OHOS
 
     testAboutView::testAboutView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testAboutView::testAboutView");
         //g_pSystemAboutTheWatchView = this;
     }
 
     testAboutView::~testAboutView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testAboutView::~testAboutView");
         ClearAll();
         //g_pSystemAboutTheWatchView = nullptr;
     }

diff --git a/code/sdk/zhihui/UI/producttest/src/testbt.cpp b/code/sdk/zhihui/UI/producttest/src/testbt.cpp
index e92a457..1122db3 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testbt.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testbt.cpp
@@ -40,7 +40,7 @@ namespace OHOS
 
     testBTView::testBTView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testBTView::testBTView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
index 5b26dce..087b6ea 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
@@ -25,7 +25,7 @@ namespace OHOS
 
     testbuttonView::testbuttonView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testbuttonView::testbuttonView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testcat1.cpp b/code/sdk/zhihui/UI/producttest/src/testcat1.cpp
index b11514a..8c11716 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testcat1.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testcat1.cpp
@@ -17,7 +17,7 @@ namespace OHOS
 
     testcat1View::testcat1View()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testcat1View::testcat1View");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testchanging.cpp b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
index 4d108eb..9d7780f 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
@@ -26,7 +26,7 @@ namespace OHOS
 
     testCHANINGView::testCHANINGView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testCHANINGView::testCHANINGView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
index 41b5431..2c03518 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
@@ -47,7 +47,7 @@ namespace OHOS
 
     testgsensonView::testgsensonView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testgsensonView::testgsensonView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
index 37eba81..55075da 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
@@ -36,7 +36,7 @@ namespace OHOS
 
     testhrsenson1View::testhrsenson1View()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testhrsenson1View::testhrsenson1View");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testluminance.cpp b/code/sdk/zhihui/UI/producttest/src/testluminance.cpp
index 7b26e3c..11c77f0 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testluminance.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testluminance.cpp
@@ -26,7 +26,7 @@ namespace OHOS
 
     testLUMView::testLUMView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testLUMView::testLUMView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
index f5a508b..06e24dc 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
@@ -33,7 +33,7 @@ namespace OHOS
 
     testMagicView::testMagicView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testMagicView::testMagicView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp
index a1e71ea..97b4826 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp
@@ -29,7 +29,7 @@ namespace OHOS
 
     testmicrohoneView::testmicrohoneView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testmicrohoneView::testmicrohoneView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp
index 87d21ff..a71ff4c 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp
@@ -30,7 +30,7 @@ namespace OHOS
 
     testMOTORView::testMOTORView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testMOTORView::testMOTORView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testold.cpp b/code/sdk/zhihui/UI/producttest/src/testold.cpp
index cef97cf..3de638e 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testold.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testold.cpp
@@ -27,7 +27,7 @@ namespace OHOS
 
     testoldView::testoldView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testoldView::testoldView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testpressure.cpp b/code/sdk/zhihui/UI/producttest/src/testpressure.cpp
index 3f3d076..c860051 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testpressure.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testpressure.cpp
@@ -33,7 +33,7 @@ namespace OHOS
 
     testpressureView::testpressureView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testpressureView::testpressureView");
         g_pSystemAboutTheWatchView = this;
     }
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testspeak.cpp b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp
index 27437d6..182ae41 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testspeak.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp
@@ -26,7 +26,7 @@ namespace OHOS
 
     testSPEAKView::testSPEAKView()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView");
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testSPEAKView::testSPEAKView");
         g_pSystemAboutTheWatchView = this;
     }