From 73dd76efe4585667d931b81ccfb78de4d499cd83 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Tue, 24 Jun 2025 17:38:24 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E4=BA=A7=E6=B5=8B=E5=AD=90?= =?utf8?q?=E7=95=8C=E9=9D=A2=E5=8F=B3=E6=BB=91=E9=80=80=E5=87=BA=E6=AD=BB?= =?utf8?q?=E6=9C=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../zhihui/UI/producttest/include/testView.h | 1 + .../zhihui/UI/producttest/src/testA5133.cpp | 2 +- .../sdk/zhihui/UI/producttest/src/testGPS.cpp | 2 +- .../sdk/zhihui/UI/producttest/src/testLCD.cpp | 2 +- .../zhihui/UI/producttest/src/testPing.cpp | 2 +- .../UI/producttest/src/testPresenter.cpp | 4 +- .../UI/producttest/src/testSEChipTest.cpp | 4 +- code/sdk/zhihui/UI/producttest/src/testTP.cpp | 2 +- .../zhihui/UI/producttest/src/testView.cpp | 589 +++++++++--------- .../zhihui/UI/producttest/src/testabout.cpp | 4 +- code/sdk/zhihui/UI/producttest/src/testbt.cpp | 2 +- .../zhihui/UI/producttest/src/testbutton.cpp | 2 +- .../zhihui/UI/producttest/src/testcat1.cpp | 2 +- .../UI/producttest/src/testchanging.cpp | 2 +- .../zhihui/UI/producttest/src/testgsenson.cpp | 2 +- .../UI/producttest/src/testhrsenson.cpp | 2 +- .../UI/producttest/src/testluminance.cpp | 2 +- .../UI/producttest/src/testmagnetic.cpp | 2 +- .../UI/producttest/src/testmicrophone.cpp | 2 +- .../zhihui/UI/producttest/src/testmotor.cpp | 2 +- .../sdk/zhihui/UI/producttest/src/testold.cpp | 2 +- .../UI/producttest/src/testpressure.cpp | 2 +- .../zhihui/UI/producttest/src/testspeak.cpp | 2 +- 23 files changed, 320 insertions(+), 318 deletions(-) diff --git a/code/sdk/zhihui/UI/producttest/include/testView.h b/code/sdk/zhihui/UI/producttest/include/testView.h index 53f060c85..b815bb49c 100644 --- a/code/sdk/zhihui/UI/producttest/include/testView.h +++ b/code/sdk/zhihui/UI/producttest/include/testView.h @@ -117,6 +117,7 @@ namespace OHOS testAboutView *test_about_view; UIScrollView *SystemScrollView[30]{nullptr}; + UIViewGroup *group{nullptr}; UILabel *SystemLabel{nullptr}; // 标题 UILabelButtonExt *SystemUpgradeButtonExt{nullptr}; diff --git a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp index eef30b201..9ed8d2fd2 100644 --- 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 4341286c2..af625e222 100644 --- 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 c2754d9a1..20c0ed853 100644 --- 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 04b7e63fa..70a4714a2 100644 --- 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 e212fd66f..e0213e04d 100644 --- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp @@ -64,14 +64,14 @@ namespace OHOS testPresenter::testPresenter() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::SystemPresenter"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testPresenter::testPresenter"); g_pSystemPresenter = this; //systemModel = testModel::GetInstance(); } testPresenter::~testPresenter() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::~SystemPresenter"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testPresenter::~testPresenter"); g_pSystemPresenter = nullptr; } diff --git a/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp b/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp index 4d31992c3..95dfd0084 100644 --- 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 259d314a6..e50e0982a 100644 --- 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 88374fb1c..2371a3cff 100644 --- 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" #include "custom_runtime.h" - #ifdef FD230 - #include "factorytest_protocol.h" +#include "factorytest_protocol.h" #endif namespace OHOS @@ -22,45 +21,43 @@ namespace OHOS static testView *g_pSystemView{nullptr}; // 2.ViewMapper[] 是一个静态的视图映射数组，将视图ID与MainStopWatchView类中的特定成员函数指针进行了绑定。 - test_ext Test_ViewMapper_t[] = { - {TESTVIEW,"","","",&testView::ChangeSystemAboutView,false},//占位，空的 - {VISON,"AboutTheWatchButton","Verison","AboutTheWatchButton_next",&testView::ChangeSystemAboutView,true}, - {LCD,"LCDButton","LCD","LCDButton_next",&testView::ChangeLCDTESTView,true}, - {TP,"TPButton","TP","TPButton_next", &testView::ChangeTPTESTView,true}, - {MAGETIC,"MAGETICButton","Magetic","MAGETICButton_next", &testView::ChangeMGTESTView,true}, - {LUMINANCE,"luminanceButton","luminance","luminanceButton_next", &testView::ChangLUMTESTView,true}, - {CHARG,"chargingButton","bat&charger","chargingButton_next",&testView::ChangchargingTESTView,true}, - {SPEAK,"speakButton","speak","speakButton_next" ,&testView::ChangspeakTESTView,true}, - - {MOTOR,"motorButton","motor","motorButton_next" ,&testView::ChangmotorTESTView,true}, - #ifdef SUPPORT_CAT1_MODEM - {CAT1,"cat1button","CAT1", "cat1button_next",&testView::ChangeCAT1TESTView,true}, - #endif - {BUTTON,"buttonbutton","button" ,"buttonbutton_next",&testView::ChangKEYTESTView,true}, - {MICROPHONE,"microphonebutton","microphone", "microphonebutton_next",&testView::ChangeMPTESTView,true}, - {HRSENSON,"hrsensonbutton","hrsensor", "hrsensonbutton_next",&testView::ChangeHRTESTView,true}, - {GSENSON,"gsensonbutton","gsensor","gsensonbutton_next" ,&testView::ChangeGTESTView,true}, - {BTTEST,"BTbutton","BT" ,"BTbutton_next",&testView::ChangeBTTESTView,true}, - {SEChipTest,"SEChipTestbutton","SEChipTest","SEChipTestbutton_next" ,&testView::ChangeSEChipTESTView,true}, - {PingTest,"PingTestbutton","PingTest","PingTestbutton_next" ,&testView::ChangePingTESTView,true}, - + test_ext Test_ViewMapper_t[] = { + {TESTVIEW, "", "", "", &testView::ChangeSystemAboutView, false}, // 占位，空的 + {VISON, "AboutTheWatchButton", "Verison", "AboutTheWatchButton_next", &testView::ChangeSystemAboutView, true}, + {LCD, "LCDButton", "LCD", "LCDButton_next", &testView::ChangeLCDTESTView, true}, + {TP, "TPButton", "TP", "TPButton_next", &testView::ChangeTPTESTView, true}, + {MAGETIC, "MAGETICButton", "Magetic", "MAGETICButton_next", &testView::ChangeMGTESTView, true}, + {LUMINANCE, "luminanceButton", "luminance", "luminanceButton_next", &testView::ChangLUMTESTView, true}, + {CHARG, "chargingButton", "bat&charger", "chargingButton_next", &testView::ChangchargingTESTView, true}, + {SPEAK, "speakButton", "speak", "speakButton_next", &testView::ChangspeakTESTView, true}, + {MOTOR, "motorButton", "motor", "motorButton_next", &testView::ChangmotorTESTView, true}, +#ifdef SUPPORT_CAT1_MODEM + {CAT1, "cat1button", "CAT1", "cat1button_next", &testView::ChangeCAT1TESTView, true}, +#endif + {BUTTON, "buttonbutton", "button", "buttonbutton_next", &testView::ChangKEYTESTView, true}, + {MICROPHONE, "microphonebutton", "microphone", "microphonebutton_next", &testView::ChangeMPTESTView, true}, + {HRSENSON, "hrsensonbutton", "hrsensor", "hrsensonbutton_next", &testView::ChangeHRTESTView, true}, + {GSENSON, "gsensonbutton", "gsensor", "gsensonbutton_next", &testView::ChangeGTESTView, true}, + {BTTEST, "BTbutton", "BT", "BTbutton_next", &testView::ChangeBTTESTView, true}, + {SEChipTest, "SEChipTestbutton", "SEChipTest", "SEChipTestbutton_next", &testView::ChangeSEChipTESTView, true}, + {PingTest, "PingTestbutton", "PingTest", "PingTestbutton_next", &testView::ChangePingTESTView, true}, #if defined(SUPPORT_GNSS) - {GPSTEST,"GPSTestbutton","GPSTest","GPSTestbutton_next" ,&testView::ChangeGPSTESTView,true}, + {GPSTEST, "GPSTestbutton", "GPSTest", "GPSTestbutton_next", &testView::ChangeGPSTESTView, true}, +#endif + {PRESSURETEST, "pressureTestbutton", "pressureTest", "pressureTestbutton_next", &testView::ChangepressureTestTESTView, true}, +#ifdef AGINGTEST + {OLDTEST, "oldtestbutton", "aging", "oldtestexit", &testView::ChangeoldTESTView, true}, +#endif + {DEEPSLEEP, "deepsleep", "DeepSleepCurrent", "xxxxxxxxx", &testView::ChangeoldTESTView, true}, + {shutdown, "shutdown", "shutdown", "xxxxxxxxx", &testView::ChangeoldTESTView, true}, + {RESET, "reset", "reset", "xxxxxxxxx", &testView::ChangeoldTESTView, true}, + {FACTORYRESE, "FactoryReset", "FactoryReset", "xxxxxxxxx", &testView::ChangeoldTESTView, true}, +#ifdef SUPPORT_A5133_SERVICE + {RF5133, "RF5133", "RF5133", "xxxxxxxxx", &testView::ChangeA5133TESTView, true}, #endif - {PRESSURETEST,"pressureTestbutton","pressureTest","pressureTestbutton_next" ,&testView::ChangepressureTestTESTView,true}, - #ifdef AGINGTEST - {OLDTEST,"oldtestbutton","aging" ,"oldtestexit",&testView::ChangeoldTESTView,true}, - #endif - {DEEPSLEEP,"deepsleep","DeepSleepCurrent","xxxxxxxxx" ,&testView::ChangeoldTESTView,true}, - {shutdown,"shutdown","shutdown", "xxxxxxxxx",&testView::ChangeoldTESTView,true}, - {RESET,"reset","reset", "xxxxxxxxx",&testView::ChangeoldTESTView,true}, - {FACTORYRESE,"FactoryReset","FactoryReset","xxxxxxxxx", &testView::ChangeoldTESTView,true}, - #ifdef SUPPORT_A5133_SERVICE - {RF5133,"RF5133","RF5133", "xxxxxxxxx",&testView::ChangeA5133TESTView,true}, - #endif }; - + testView::testView() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "testView::testView"); @@ -81,110 +78,112 @@ namespace OHOS void testView::ClearAll() { - if (initViewStatus == true) + if (group) { - SystemScrollView[TESTVIEW]->RemoveAll(); - int funcSize = sizeof(Test_ViewMapper_t) / sizeof(Test_ViewMapper_t[TESTVIEW]); - for (int i = 0; i < funcSize; i++) + group->RemoveAll(); + delete group; + group = nullptr; + if (SystemScrollView[TESTVIEW]) { - if(button[i]) + SystemScrollView[TESTVIEW]->RemoveAll(); + delete SystemScrollView[TESTVIEW]; + SystemScrollView[TESTVIEW] = nullptr; + delete SystemLabel; + SystemLabel = nullptr; + int funcSize = sizeof(Test_ViewMapper_t) / sizeof(Test_ViewMapper_t[TESTVIEW]); + for (int i = 0; i < funcSize; i++) { - delete button[i]; - button[i]=NULL; + if (button[i]) + { + delete button[i]; + button[i] = NULL; + } } } - if(test_about_view) - { - delete test_about_view; //1 - test_about_view = nullptr; - } - - if(test_LCD_view) - { - delete test_LCD_view; //2 + } + if (test_about_view) + { + delete test_about_view; // 1 + test_about_view = nullptr; + } + + if (test_LCD_view) + { + delete test_LCD_view; // 2 test_LCD_view = nullptr; - } - if(test_TP_view) - { - delete test_TP_view; //3 + } + if (test_TP_view) + { + delete test_TP_view; // 3 test_TP_view = nullptr; - } - if(test_lum_view) - { - delete test_lum_view;//4 + } + if (test_lum_view) + { + delete test_lum_view; // 4 test_lum_view = nullptr; - } - if(test_charging_view) - { - delete test_charging_view;//5 + } + if (test_charging_view) + { + delete test_charging_view; // 5 test_charging_view = nullptr; - } - if(test_speak_view) - { - delete test_speak_view;//6 + } + if (test_speak_view) + { + delete test_speak_view; // 6 test_speak_view = nullptr; - } - if(test_motor_view) - { - delete test_motor_view;//7 + } + if (test_motor_view) + { + delete test_motor_view; // 7 test_motor_view = nullptr; - } + } #ifdef SUPPORT_CAT1_MODEM - if(test_cat1_view) - { - delete test_cat1_view;//8 + if (test_cat1_view) + { + delete test_cat1_view; // 8 test_cat1_view = nullptr; - } + } #endif - if(test_KEY_view) - { - delete test_KEY_view;//9 + if (test_KEY_view) + { + delete test_KEY_view; // 9 test_KEY_view = nullptr; - } - if(test_MG_view) - { - delete test_MG_view;//10 + } + if (test_MG_view) + { + delete test_MG_view; // 10 test_MG_view = nullptr; - } - if(test_hr_view) - { - delete test_hr_view;//11 + } + if (test_hr_view) + { + delete test_hr_view; // 11 test_hr_view = nullptr; - } - if(test_MP_view) - { - delete test_MP_view;//12 + } + if (test_MP_view) + { + delete test_MP_view; // 12 test_MP_view = nullptr; - } - if(test_G_view) - { - delete test_G_view;//13 - test_G_view= nullptr; - } + } + if (test_G_view) + { + delete test_G_view; // 13 + test_G_view = nullptr; + } #ifdef SUPPORT_A5133_SERVICE - if(test_A5133_view) - { - delete test_A5133_view;//13 - test_A5133_view= nullptr; - } + if (test_A5133_view) + { + delete test_A5133_view; // 13 + test_A5133_view = nullptr; + } #endif - // delete test_G_view;//13 - // test_G_view= nullptr; + // delete test_G_view;//13 + // test_G_view= nullptr; - delete SystemLabel; - SystemLabel = nullptr; - if(SystemScrollView[TESTVIEW]) - { - delete SystemScrollView[TESTVIEW]; - SystemScrollView[TESTVIEW] = nullptr; - } - for(int i=1;i<13;i++) - { - if(SystemScrollView[i]) - SystemScrollView[i] = nullptr; - } - + for (int i = 1; i < 13; i++) + { + if (SystemScrollView[i]) + SystemScrollView[i] = nullptr; } } @@ -201,21 +200,21 @@ namespace OHOS } SystemScrollView[TESTVIEW]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); SystemScrollView[TESTVIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0xff); -SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); - + SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); + SystemScrollView[TESTVIEW]->SetScrollBlankSize(35); SystemScrollView[TESTVIEW]->SetReboundSize(50); SystemScrollView[TESTVIEW]->SetDirection(1); SystemScrollView[TESTVIEW]->SetThrowDrag(true); // 设置手指抬起屏幕后是否继续滚动。 SystemScrollView[TESTVIEW]->SetMaxScrollDistance(1000); // 设置手指抬起屏幕后的最大滚动距离。 SystemScrollView[TESTVIEW]->SetSwipeACCLevel(200); /*设置手指抬起屏幕后的补偿距离。*/ - //UIView::OnDragListener *draglistener = static_cast(new SystemViewOnDragListener()); - // if (draglistener == nullptr) - // { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!"); - // return false; - // } - //SystemScrollView[TESTVIEW]->SetOnDragListener(draglistener); + // UIView::OnDragListener *draglistener = static_cast(new SystemViewOnDragListener()); + // if (draglistener == nullptr) + // { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::draglistener can not be nullptr!"); + // return false; + // } + // SystemScrollView[TESTVIEW]->SetOnDragListener(draglistener); SystemScrollView[TESTVIEW]->SetTouchable(true); SystemScrollView[TESTVIEW]->SetDraggable(true); return true; @@ -242,14 +241,13 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); SystemLabel->SetRollSpeed(6); SystemLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); - return true; } /// @brief 设置按钮 /// @param button /// @return true 设置成功，false 失败 - + UILabelButtonExt *testView::SetTheButton_ext(ButtonConfig_ext_t &buttonconfig, UIView::OnClickListener *clickListener) { UILabelButtonExt *button = new UILabelButtonExt(); @@ -267,17 +265,15 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); button->SetText(buttonconfig.str); button->SetAlign(TEXT_ALIGNMENT_LEFT); - button->SetLabelPosition(buttonconfig.label_x,buttonconfig.label_y ); + button->SetLabelPosition(buttonconfig.label_x, buttonconfig.label_y); button->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, buttonconfig.Fontsize); - //button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); + // button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); button->SetImagePosition(326, 37); return button; } - - - void testView::initView_ext(int x,int y,int w,int h,int interval,const char *imagsrc) + void testView::initView_ext(int x, int y, int w, int h, int interval, const char *imagsrc) { if (!SetTheSystemScrollView()) { @@ -298,33 +294,30 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); buttonconfig.w = w; buttonconfig.h = h; - int len =sizeof(Test_ViewMapper_t)/sizeof(Test_ViewMapper_t[0]); + int len = sizeof(Test_ViewMapper_t) / sizeof(Test_ViewMapper_t[0]); - for(int i=1;iAdd(SystemScrollView[thisView]); } return true; } @@ -342,7 +335,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_about_view->SystemAbouTheWatchtInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -359,7 +352,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_LCD_view->testLCDInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -376,12 +369,12 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_TP_view->testTPInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } - bool testView::ChangeMGTESTView(int16_t thisView) + bool testView::ChangeMGTESTView(int16_t thisView) { if (SystemScrollView[thisView] == nullptr) { @@ -393,7 +386,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_MG_view->testmagicInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -410,11 +403,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_lum_view->testLUMInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } - + bool testView::ChangchargingTESTView(int16_t thisView) { if (SystemScrollView[thisView] == nullptr) @@ -427,7 +420,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_charging_view->testCHANINGInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -444,7 +437,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_speak_view->testSPEAKInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -461,14 +454,14 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_motor_view->testMOTORInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } - bool testView::ChangeCAT1TESTView(int16_t thisView) + bool testView::ChangeCAT1TESTView(int16_t thisView) { - #ifdef SUPPORT_CAT1_SERVICE +#ifdef SUPPORT_CAT1_SERVICE if (SystemScrollView[thisView] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeCAT1TESTView"); @@ -479,9 +472,9 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_cat1_view->testcat1InitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } - #endif +#endif return true; } @@ -497,7 +490,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_KEY_view->testBUTTONInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -514,7 +507,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_MP_view->testmicrophoneInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -531,12 +524,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_hr_view->testhrsensonInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } - bool testView::ChangeGTESTView(int16_t thisView) { if (SystemScrollView[thisView] == nullptr) @@ -549,15 +541,14 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_G_view->testGSENSONInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } - - bool testView::ChangeoldTESTView(int16_t thisView) + bool testView::ChangeoldTESTView(int16_t thisView) { - #ifdef AGINGTEST +#ifdef AGINGTEST if (SystemScrollView[thisView] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeoldTESTView"); @@ -568,13 +559,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_old_view->testoldInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } - #endif +#endif return true; - } - bool testView::ChangeBTTESTView(int16_t thisView) { @@ -588,12 +577,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_BT_view->testBTInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } - bool testView::ChangeSEChipTESTView(int16_t thisView) { if (SystemScrollView[thisView] == nullptr) @@ -606,7 +594,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_SEChip_view->SEChipInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -623,12 +611,11 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_Ping_view->testPingInitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } - bool testView::ChangeGPSTESTView(int16_t thisView) { #if defined(SUPPORT_GNSS) @@ -642,13 +629,13 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_GPS_view->testGPSInitIView((uint8_t)thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } #endif return true; } - bool testView::ChangepressureTestTESTView(int16_t thisView) + bool testView::ChangepressureTestTESTView(int16_t thisView) { if (SystemScrollView[thisView] == nullptr) @@ -661,14 +648,12 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_pressure_view->testpressureInitIView((uint8_t)thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } - - #ifdef SUPPORT_A5133_SERVICE bool testView::ChangeA5133TESTView(int16_t thisView) { @@ -682,7 +667,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); return false; } SystemScrollView[thisView] = test_A5133_view->testA5133InitIView(thisView); - AddViewToRootContainer(SystemScrollView[thisView]); + group->Add(SystemScrollView[thisView]); } return true; } @@ -699,7 +684,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); /* -------------------------------------------------------------------------- */ // 1.MainStopWatchViewMapper:结构体定义了一个将视图ID映射到特定成员函数指针的映射表。 - + // 3.根据传入的interface参数执行相应视图ID关联的成员函数。 bool testView::ClickFunc(int16_t interface) { @@ -727,164 +712,190 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: SystemViewId Overstep ones bounds"); return; } - SystemScrollView[hideView]->SetVisible(false); + if (SystemScrollView[hideView] != nullptr) + { + SystemScrollView[hideView]->SetVisible(false); + } + else + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: SystemScrollView[%d] is nullptr", hideView); + } ClickFunc(showView); - SystemScrollView[showView]->SetVisible(true); - Draw(); - if(hideView!=0) + if (SystemScrollView[showView] != nullptr) + { + SystemScrollView[showView]->SetVisible(true); + } + else { - switch (hideView) - { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: SystemScrollView[%d] is nullptr", showView); + } + if (hideView != 0) + { + switch (hideView) + { case VISON: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_about_view; + group->Remove(SystemScrollView[hideView]); + delete test_about_view; test_about_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case LCD: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_LCD_view; + group->Remove(SystemScrollView[hideView]); + delete test_LCD_view; test_LCD_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case TP: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_TP_view; + group->Remove(SystemScrollView[hideView]); + delete test_TP_view; test_TP_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case MAGETIC: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_MG_view; + group->Remove(SystemScrollView[hideView]); + delete test_MG_view; test_MG_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case LUMINANCE: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_lum_view; + group->Remove(SystemScrollView[hideView]); + delete test_lum_view; test_lum_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case CHARG: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_charging_view; + group->Remove(SystemScrollView[hideView]); + delete test_charging_view; test_charging_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case SPEAK: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_speak_view; + group->Remove(SystemScrollView[hideView]); + delete test_speak_view; test_speak_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case MOTOR: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_motor_view; + group->Remove(SystemScrollView[hideView]); + delete test_motor_view; test_motor_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; #ifdef SUPPORT_CAT1_MODEM - case CAT1: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_cat1_view; + case CAT1: + group->Remove(SystemScrollView[hideView]); + delete test_cat1_view; test_cat1_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; #endif - case BUTTON: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_KEY_view; + case BUTTON: + group->Remove(SystemScrollView[hideView]); + delete test_KEY_view; test_KEY_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case MICROPHONE: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_MP_view; + group->Remove(SystemScrollView[hideView]); + delete test_MP_view; test_MP_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case HRSENSON: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_hr_view; + group->Remove(SystemScrollView[hideView]); + delete test_hr_view; test_hr_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case GSENSON: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_G_view; + group->Remove(SystemScrollView[hideView]); + delete test_G_view; test_G_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; case OLDTEST: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_old_view; + group->Remove(SystemScrollView[hideView]); + delete test_old_view; test_old_view = nullptr; - SystemScrollView[hideView]=nullptr; + SystemScrollView[hideView] = nullptr; break; case BTTEST: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_BT_view; + group->Remove(SystemScrollView[hideView]); + delete test_BT_view; test_BT_view = nullptr; - SystemScrollView[hideView]=nullptr; + SystemScrollView[hideView] = nullptr; break; case SEChipTest: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_SEChip_view; + group->Remove(SystemScrollView[hideView]); + delete test_SEChip_view; test_SEChip_view = nullptr; - SystemScrollView[hideView]=nullptr; + SystemScrollView[hideView] = nullptr; break; case PingTest: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_Ping_view; + group->Remove(SystemScrollView[hideView]); + delete test_Ping_view; test_Ping_view = nullptr; - SystemScrollView[hideView]=nullptr; + SystemScrollView[hideView] = nullptr; break; #if defined(SUPPORT_GNSS) case GPSTEST: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_GPS_view; + group->Remove(SystemScrollView[hideView]); + delete test_GPS_view; test_GPS_view = nullptr; - SystemScrollView[hideView]=nullptr; - break; + SystemScrollView[hideView] = nullptr; + break; #endif #ifdef SUPPORT_A5133_SERVICE case RF5133: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_A5133_view; + group->Remove(SystemScrollView[hideView]); + delete test_A5133_view; test_A5133_view = nullptr; - SystemScrollView[hideView]=nullptr; + SystemScrollView[hideView] = nullptr; break; #endif - case PRESSURETEST: - RootView::GetInstance()->Remove(SystemScrollView[hideView]); - delete test_pressure_view; + case PRESSURETEST: + group->Remove(SystemScrollView[hideView]); + delete test_pressure_view; test_pressure_view = nullptr; - SystemScrollView[hideView]=nullptr; + SystemScrollView[hideView] = nullptr; break; - default: - break; - } + default: + break; + } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "change>>>>>>>>>>>hideView %d > showView %d >>>",hideView,showView); - + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "change>>>>>>>>>>>hideView %d > showView %d >>>", hideView, showView); } /* -------------------------------------------------------------------------- */ void testView::OnStart() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnStart>>>>>>>>>>>>>"); - //InitIView(); - initView_ext(43,120,380,100,120,"/user/res/SETTING_NEXT.bin"); + + if (group == nullptr) + { + group = new UIViewGroup(); + if (group == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::WatchQRCodeGroupView new fail!"); + } + } + group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + group->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + group->SetTouchable(true); + group->SetDraggable(true); + + // InitIView(); + initView_ext(43, 120, 380, 100, 120, "/user/res/SETTING_NEXT.bin"); const power_display_svr_api_t *display_api = power_display_svr_get_api(); if (display_api->get_screen_state() != SCREEN_ON) - { - display_api->turn_on_screen(); - } + { + display_api->turn_on_screen(); + } display_api->set_auto_timeout_function(false); - if(!uapi_dev_runtime_get_factory_test_status_flag()) + if (!uapi_dev_runtime_get_factory_test_status_flag()) uapi_set4GCapability(true); start_custom_ble_service(); @@ -894,23 +905,13 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: OnSetUpView has nullptr"); return; } - SystemScrollView[TESTVIEW]->Add(SystemLabel); - - int len =sizeof(Test_ViewMapper_t)/sizeof(Test_ViewMapper_t[0]); - - for(int i=0;iAdd(button[i]); + SystemScrollView[TESTVIEW]->Add(button[i]); } - - // SystemScrollView[SYSTEMVIEW]->Add(SuperviseButton); - // SystemScrollView[SYSTEMVIEW]->Add(SystemLanguageButton); - // SystemScrollView[SYSTEMVIEW]->Add(FactoryResetButton); - // SystemScrollView[SYSTEMVIEW]->Add(SystemUpgradeButtonExt); - - AddViewToRootContainer(SystemScrollView[TESTVIEW]); + group->Add(SystemScrollView[TESTVIEW]); + AddViewToRootContainer(group); } - - } \ 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 c6912e876..7ac4650ae 100644 --- 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 e92a457a5..1122db387 100644 --- 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 5b26dcee4..087b6ea39 100644 --- 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 b11514a7d..8c1171645 100644 --- 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 4d108ebf2..9d7780fea 100644 --- 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 41b543127..2c0351854 100644 --- 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 37eba8135..55075daaa 100644 --- 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 7b26e3cfb..11c77f072 100644 --- 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 f5a508be3..06e24dcda 100644 --- 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 a1e71ea2b..97b482655 100644 --- 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 87d21ff89..a71ff4c85 100644 --- 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 cef97cf4a..3de638e60 100644 --- 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 3f3d076ab..c860051b5 100644 --- 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 27437d64e..182ae419d 100644 --- 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; } -- 2.17.1