From: Caisking <3449750381@qq.com> Date: Sat, 28 Sep 2024 09:33:26 +0000 (+0800) Subject: 修改遥控拍照Slice析构 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=c1f44ba8b9276fc3ee435e51f603d5e0432bf6bf;p=mirrors%2FFD230.git 修改遥控拍照Slice析构 --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index 0a59850c1..9f3572e87 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -201,7 +201,7 @@ namespace OHOS static constexpr const char *PNG_COUNTDOWN_TIME_IMAGE_21 = APP_RES_PATH "/COUNTDOWN_IMAGE_22.bin"; static constexpr const char *PNG_COUNTDOWN_TIME_IMAGE_22 = APP_RES_PATH "/COUNTDOWN_IMAGE_23.bin"; static constexpr const char *PNG_COUNTDOWN_TIME_IMAGE_23 = APP_RES_PATH "/COUNTDOWN_IMAGE_24.bin"; - + /*血氧动画*/ static constexpr const char *PNG_CHECK_TIME_IMAGE_0 = APP_RES_PATH "/Blood/spo2_gif/spo2_01.bin"; static constexpr const char *PNG_CHECK_TIME_IMAGE_1 = APP_RES_PATH "/Blood/spo2_gif/spo2_02.bin"; static constexpr const char *PNG_CHECK_TIME_IMAGE_2 = APP_RES_PATH "/Blood/spo2_gif/spo2_03.bin"; @@ -232,6 +232,57 @@ namespace OHOS static constexpr const char *PNG_CHECK_TIME_IMAGE_27 = APP_RES_PATH "/Blood/spo2_gif/spo2_28.bin"; static constexpr const char *PNG_CHECK_TIME_IMAGE_28 = APP_RES_PATH "/Blood/spo2_gif/spo2_29.bin"; static constexpr const char *PNG_CHECK_TIME_IMAGE_29 = APP_RES_PATH "/Blood/spo2_gif/spo2_30.bin"; + /*遥控拍照动画*/ + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_0 = APP_RES_PATH "/takephotos/cream/1.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_1 = APP_RES_PATH "/takephotos/cream/2.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_2 = APP_RES_PATH "/takephotos/cream/3.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_3 = APP_RES_PATH "/takephotos/cream/4.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_4 = APP_RES_PATH "/takephotos/cream/5.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_5 = APP_RES_PATH "/takephotos/cream/6.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_6 = APP_RES_PATH "/takephotos/cream/7.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_7 = APP_RES_PATH "/takephotos/cream/8.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_8 = APP_RES_PATH "/takephotos/cream/9.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_9 = APP_RES_PATH "/takephotos/cream/10.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_10 = APP_RES_PATH "/takephotos/cream/11.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_11 = APP_RES_PATH "/takephotos/cream/12.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_12 = APP_RES_PATH "/takephotos/cream/13.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_13 = APP_RES_PATH "/takephotos/cream/14.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_14 = APP_RES_PATH "/takephotos/cream/15.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_15 = APP_RES_PATH "/takephotos/cream/16.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_16 = APP_RES_PATH "/takephotos/cream/17.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_17 = APP_RES_PATH "/takephotos/cream/18.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_18 = APP_RES_PATH "/takephotos/cream/19.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_19 = APP_RES_PATH "/takephotos/cream/20.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_20 = APP_RES_PATH "/takephotos/cream/21.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_21 = APP_RES_PATH "/takephotos/cream/22.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_22 = APP_RES_PATH "/takephotos/cream/23.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_23 = APP_RES_PATH "/takephotos/cream/24.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_24 = APP_RES_PATH "/takephotos/cream/25.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_25 = APP_RES_PATH "/takephotos/cream/26.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_26 = APP_RES_PATH "/takephotos/cream/27.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_27 = APP_RES_PATH "/takephotos/cream/28.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_28 = APP_RES_PATH "/takephotos/cream/29.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_29 = APP_RES_PATH "/takephotos/cream/30.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_30 = APP_RES_PATH "/takephotos/cream/31.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_31 = APP_RES_PATH "/takephotos/cream/32.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_32 = APP_RES_PATH "/takephotos/cream/33.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_33 = APP_RES_PATH "/takephotos/cream/34.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_34 = APP_RES_PATH "/takephotos/cream/35.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_35 = APP_RES_PATH "/takephotos/cream/36.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_36 = APP_RES_PATH "/takephotos/cream/37.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_37 = APP_RES_PATH "/takephotos/cream/38.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_38 = APP_RES_PATH "/takephotos/cream/39.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_39 = APP_RES_PATH "/takephotos/cream/40.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_40 = APP_RES_PATH "/takephotos/cream/41.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_41 = APP_RES_PATH "/takephotos/cream/42.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_42 = APP_RES_PATH "/takephotos/cream/43.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_43 = APP_RES_PATH "/takephotos/cream/44.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_44 = APP_RES_PATH "/takephotos/cream/45.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_45 = APP_RES_PATH "/takephotos/cream/46.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_46 = APP_RES_PATH "/takephotos/cream/47.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_47 = APP_RES_PATH "/takephotos/cream/48.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_48 = APP_RES_PATH "/takephotos/cream/49.bin"; + static constexpr const char *PNG_TAKE_PHOTO_IMAGE_49 = APP_RES_PATH "/takephotos/cream/50.bin"; /* -------------------------------------------------------------------------- */ static constexpr const char *PNG_ALIPAY_BIND_FAILURE = APP_RES_PATH "/alipay/ALIPAY_BIND_FAILURE.bin"; static constexpr const char *PNG_ALIPAY_BIND_SUCCESS = APP_RES_PATH "/alipay/ALIPAY_BIND_SUCCESS.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/takephotos/include/TakephotosView.h b/code/sdk/application/wearable/fd230app/nativeui/takephotos/include/TakephotosView.h index e15d0b176..66e5bd781 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/takephotos/include/TakephotosView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/takephotos/include/TakephotosView.h @@ -72,7 +72,6 @@ namespace OHOS UILabelExt *labeltitle_ = nullptr; UILabel *labelnote_ = nullptr; UILabelButtonExt *buttongo = nullptr; - UIImageView *imagerecord = nullptr; UIImageAnimatorView *creamAnimator{nullptr}; /*拍照界面*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp index 8813516dd..0e16e2171 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp @@ -17,25 +17,77 @@ #include namespace OHOS { static const uint32_t BACK_GROUND_COLOR = 0xfff6f6f6; +// 遥控拍照 +static constexpr int IMAGE_SIZE = 140; +static constexpr int CREAM_IMAGE_X = 163; +static constexpr int CREAM_IMAGE_Y = 103; +static constexpr int CREAM_IMAGE_NUM = 50; +static constexpr int CREAM_DELAY = 50; +// 遥控拍照 +static ImageAnimatorInfo g_imageAnimatorInfo_takephoto[50] = { +{PNG_TAKE_PHOTO_IMAGE_0, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_1, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_2, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_3, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_4, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_5, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_6, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_7, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_8, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_9, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_10, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_11, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_12, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_13, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_14, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_15, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_16, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_17, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_18, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_19, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_20, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_21, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_22, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_23, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_24, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_25, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_26, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_27, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_28, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_30, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_31, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_32, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_33, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_34, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_35, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_36, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_37, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_38, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_39, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_40, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_41, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_42, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_43, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_44, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_45, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_46, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_47, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_48, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +{PNG_TAKE_PHOTO_IMAGE_49, {CREAM_IMAGE_X, CREAM_IMAGE_Y}, IMAGE_SIZE, IMAGE_SIZE, IMG_SRC_FILE_PATH}, +}; + + static TakephotosView *g_pTakephotosView{nullptr}; TakephotosView::TakephotosView() { g_pTakephotosView = this; } TakephotosView::~TakephotosView() { - // DeInit(); - if (creamimageInfos != nullptr) - FreeImageInfoArray(creamimageInfos, creambasePath.c_str(), 50); - if (smileimageInfos != nullptr) - FreeImageInfoArray(smileimageInfos, smilebasePath.c_str(), 50); - creamAnimator->Stop(); - smileAnimator->Stop(); - ReleaseImageAnimatorSource(smileimageAnimatorInfo, 50); - ReleaseImageAnimatorSource(creamimageAnimatorInfo, 50); + // UIViewGroup *tmpGroup = dynamic_cast(container_); + // UIViewGroup::RemoveAndDeleteAllRecursively(tmpGroup); - UIViewGroup *tmpGroup = dynamic_cast(container_); - UIViewGroup::RemoveAndDeleteAllRecursively(tmpGroup); + DeInit(); g_pTakephotosView = nullptr; } @@ -56,8 +108,16 @@ void TakephotosView ::InitView() { /* DeInit：删除组件 */ void TakephotosView::DeInit() { - creamView->RemoveAll(); - takeView->RemoveAll(); + + if (container_) { + container_->RemoveAll(); + } + if (creamView) { + creamView->RemoveAll(); + } + if (takeView) { + takeView->RemoveAll(); + } delete labeltitle_; labeltitle_ = nullptr; @@ -65,6 +125,18 @@ void TakephotosView::DeInit() { delete labelnote_; labelnote_ = nullptr; + delete labelnote_; + labelnote_ = nullptr; + + delete buttongo; + buttongo = nullptr; + + if (creamAnimator) { + creamAnimator->Stop(); + delete creamAnimator; + creamAnimator = nullptr; + } + delete labeltake_; labeltake_ = nullptr; @@ -74,16 +146,11 @@ void TakephotosView::DeInit() { delete buttontake; buttontake = nullptr; - delete buttongo; - buttongo = nullptr; - - smileAnimator->Stop(); - delete smileAnimator; - smileAnimator = nullptr; - - creamAnimator->Stop(); - delete creamAnimator; - creamAnimator = nullptr; + if (smileAnimator) { + smileAnimator->Stop(); + delete smileAnimator; + smileAnimator = nullptr; + } delete creamView; creamView = nullptr; @@ -128,8 +195,6 @@ void TakephotosView::ShowCreamView() { labelnote_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); SetLabelId(labelnote_, STR_TACK); - /*初始化image*/ - // InitImageView(imageTake, 174, 120, 118, 120, "image", RECOED_IMAGE); /*初始化按键*/ InitButtonExt(buttongo, 0, 366, 466, 100, BUTTONGO, STR_KONW, 30); buttongo->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE); @@ -137,10 +202,14 @@ void TakephotosView::ShowCreamView() { TakephotosPresenter::GetInstance())); // 初始化图片数组以及动画 - creamimageInfos = CreateImageInfoArray(creambasePath.c_str(), 50); - InitImageAnimatorSource(creamAnimator, creamimageAnimatorInfo, - creamimageInfos, 50, 163, 103, 140, 140, - "imageAnimator", 100); + creamAnimator = new UIImageAnimatorView(); + if (creamAnimator == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodBandoffView::new UIImageAnimatorView fail"); + return; + } + creamAnimator->SetImageAnimatorSrc(g_imageAnimatorInfo_takephoto, CREAM_IMAGE_NUM, CREAM_DELAY); + creamAnimator->SetRepeat(true); creamView->Add(creamAnimator); creamView->Add(labeltitle_); @@ -189,11 +258,15 @@ void TakephotosView::ShowTakeView() { buttontake->SetOnClickListener(static_cast( TakephotosPresenter::GetInstance())); - // 初始化图片数组以及动画 {修改为统一动画} - smileimageInfos = CreateImageInfoArray(smilebasePath.c_str(), 50); - InitImageAnimatorSource(smileAnimator, smileimageAnimatorInfo, - smileimageInfos, 50, 163, 140, 140, 140, - "imageAnimator", 100); + // 初始化图片数组以及动画 + smileAnimator = new UIImageAnimatorView(); + if (smileAnimator == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodBandoffView::new UIImageAnimatorView fail"); + return; + } + smileAnimator->SetImageAnimatorSrc(g_imageAnimatorInfo_takephoto, CREAM_IMAGE_NUM, CREAM_DELAY); + smileAnimator->SetRepeat(true); takeView->Add(smileAnimator); takeView->Add(labeltake_);