From: Caisking <3449750381@qq.com> Date: Sat, 16 Mar 2024 08:19:33 +0000 (+0800) Subject: 修复训练界面死机问题 X-Git-Tag: release_V1.2.70_20241020_135402~1274^2~11^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=84ed9d0c1c795f8c755026a34c211f38777e61d6;p=mirrors%2FFD230.git 修复训练界面死机问题 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index 3e7eb93fc..cf134e5c6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -293,10 +293,12 @@ namespace OHOS { if (view_->GetHorCurrentPage() == COMPASS) { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COMPASS"); SetCompassRotate(); } else if (view_->GetHorCurrentPage() == MUSIC_PLAYER) { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MUSIC_PLAYER"); SetCircleProgress(); } else if (view_->GetHorCurrentPage() == WATCH_FACE) @@ -310,7 +312,8 @@ namespace OHOS } else if (view_->GetHorCurrentPage() == BloodOxygen) { - BloodCardView::GetInstance()->UpSPO2data(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView"); + // BloodCardView::GetInstance()->UpSPO2data(); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index 17e5283b3..a7c4fcb8b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -32,7 +32,7 @@ namespace OHOS {BloodOxygen, &MainViewSample::InitBloodOxygenPage}, {TRAINING, &MainViewSample::InitTrainingPage}, {COMPASS, &MainViewSample::InitCompassPage}, - //{WEATHER, &MainViewSample::InitWeatherPage}, + {WEATHER, &MainViewSample::InitWeatherPage}, {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage}, #if 0 {APPLIST,&MainViewSample::InitApplistPage} diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h index 5804c0465..b91515d43 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h +++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h @@ -21,7 +21,7 @@ namespace OHOS TRAINING, BloodOxygen, COMPASS, - //WEATHER, + WEATHER, MUSIC_PLAYER, // APPLIST, MAX_CARD, diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp b/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp index 8b593c13c..0681054cc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp @@ -199,7 +199,7 @@ namespace OHOS LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_BLUETOOTHCONNECTED, DROPDOWN_SETTING); LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP); LoadAppMultiImages(BLOOD_IAMGES, BLOODOXYGEN_BACKGOUND, BLOODOXYGEN_BACKGOUND); - LoadAppMultiImages(TRAINING_IAMGES, TRAINING_BOUTTONGROUND, TRAINING_WALKING_BIG); + //LoadAppMultiImages(TRAINING_IAMGES, TRAINING_BOUTTONGROUND, TRAINING_WALKING_BIG); LoadAppMultiImages(MESSAGE_IAMGES, MESSAGE_MESSAGE, MESSAGE_WECHAT); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp index 86c1c439f..f447c9d48 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp @@ -189,11 +189,9 @@ namespace OHOS void TraingView::DeInit() { - UIImageView *imageViews[] = {image1, image2, image3, imagemore}; + UIImageView *imageViews[] = {image1, image2, image3}; UIButton *buttons[] = {ButtonMore, Button1, Button3, Button2}; - RemoveAll(); - for (auto &imageView : imageViews) { if (imageView != nullptr) @@ -226,18 +224,18 @@ namespace OHOS InitView(); viewiInitStatus = true; } - if (!resLoadStatus) - { - resLoadStatus = true; - } + // if (!resLoadStatus) + // { + // resLoadStatus = true; + // } } void TraingView::UnLoad(void) { - if (resLoadStatus) - { - //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES); - resLoadStatus = false; - } + // if (resLoadStatus) + // { + // //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES); + // resLoadStatus = false; + // } } }