From: Caisking <3449750381@qq.com> Date: Wed, 9 Oct 2024 09:38:07 +0000 (+0800) Subject: 训练:修改运动目标达标的动画 X-Git-Tag: release_V1.2.70_20241020_135402~111 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3133011c274e43228da294b1c3b6f77177b7f382;p=mirrors%2FFD230.git 训练:修改运动目标达标的动画 --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index 9e5c260a0..a62a8f68b 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -315,100 +315,40 @@ namespace OHOS static constexpr const char *PNG_VOICE_ASSISTANT_IMAGE_28 = APP_RES_PATH "/assistant/assistant_gif/assistant_29.bin"; static constexpr const char *PNG_VOICE_ASSISTANT_IMAGE_29 = APP_RES_PATH "/assistant/assistant_gif/assistant_30.bin"; /*运动目标达成*/ - static constexpr const char *PNG_TRAINING_WIN_IMAGE_01 = APP_RES_PATH "/Training/training_GIF/win/1.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_02 = APP_RES_PATH "/Training/training_GIF/win/2.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_03 = APP_RES_PATH "/Training/training_GIF/win/3.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_04 = APP_RES_PATH "/Training/training_GIF/win/4.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_05 = APP_RES_PATH "/Training/training_GIF/win/5.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_06 = APP_RES_PATH "/Training/training_GIF/win/6.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_07 = APP_RES_PATH "/Training/training_GIF/win/7.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_08 = APP_RES_PATH "/Training/training_GIF/win/8.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_09 = APP_RES_PATH "/Training/training_GIF/win/9.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_10 = APP_RES_PATH "/Training/training_GIF/win/10.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_11 = APP_RES_PATH "/Training/training_GIF/win/11.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_12 = APP_RES_PATH "/Training/training_GIF/win/12.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_13 = APP_RES_PATH "/Training/training_GIF/win/13.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_14 = APP_RES_PATH "/Training/training_GIF/win/14.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_15 = APP_RES_PATH "/Training/training_GIF/win/15.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_16 = APP_RES_PATH "/Training/training_GIF/win/16.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_17 = APP_RES_PATH "/Training/training_GIF/win/17.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_18 = APP_RES_PATH "/Training/training_GIF/win/18.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_19 = APP_RES_PATH "/Training/training_GIF/win/19.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_20 = APP_RES_PATH "/Training/training_GIF/win/20.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_21 = APP_RES_PATH "/Training/training_GIF/win/21.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_22 = APP_RES_PATH "/Training/training_GIF/win/22.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_23 = APP_RES_PATH "/Training/training_GIF/win/23.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_24 = APP_RES_PATH "/Training/training_GIF/win/24.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_25 = APP_RES_PATH "/Training/training_GIF/win/25.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_26 = APP_RES_PATH "/Training/training_GIF/win/26.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_27 = APP_RES_PATH "/Training/training_GIF/win/27.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_28 = APP_RES_PATH "/Training/training_GIF/win/28.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_29 = APP_RES_PATH "/Training/training_GIF/win/29.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_30 = APP_RES_PATH "/Training/training_GIF/win/30.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_31 = APP_RES_PATH "/Training/training_GIF/win/31.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_32 = APP_RES_PATH "/Training/training_GIF/win/32.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_33 = APP_RES_PATH "/Training/training_GIF/win/33.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_34 = APP_RES_PATH "/Training/training_GIF/win/34.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_35 = APP_RES_PATH "/Training/training_GIF/win/35.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_36 = APP_RES_PATH "/Training/training_GIF/win/36.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_37 = APP_RES_PATH "/Training/training_GIF/win/37.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_38 = APP_RES_PATH "/Training/training_GIF/win/38.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_39 = APP_RES_PATH "/Training/training_GIF/win/39.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_40 = APP_RES_PATH "/Training/training_GIF/win/40.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_41 = APP_RES_PATH "/Training/training_GIF/win/41.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_42 = APP_RES_PATH "/Training/training_GIF/win/42.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_43 = APP_RES_PATH "/Training/training_GIF/win/43.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_44 = APP_RES_PATH "/Training/training_GIF/win/44.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_45 = APP_RES_PATH "/Training/training_GIF/win/45.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_46 = APP_RES_PATH "/Training/training_GIF/win/46.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_47 = APP_RES_PATH "/Training/training_GIF/win/47.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_48 = APP_RES_PATH "/Training/training_GIF/win/48.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_49 = APP_RES_PATH "/Training/training_GIF/win/49.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_50 = APP_RES_PATH "/Training/training_GIF/win/50.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_51 = APP_RES_PATH "/Training/training_GIF/win/51.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_52 = APP_RES_PATH "/Training/training_GIF/win/52.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_53 = APP_RES_PATH "/Training/training_GIF/win/53.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_54 = APP_RES_PATH "/Training/training_GIF/win/54.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_55 = APP_RES_PATH "/Training/training_GIF/win/55.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_56 = APP_RES_PATH "/Training/training_GIF/win/56.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_57 = APP_RES_PATH "/Training/training_GIF/win/57.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_58 = APP_RES_PATH "/Training/training_GIF/win/58.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_59 = APP_RES_PATH "/Training/training_GIF/win/59.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_60 = APP_RES_PATH "/Training/training_GIF/win/60.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_61 = APP_RES_PATH "/Training/training_GIF/win/61.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_62 = APP_RES_PATH "/Training/training_GIF/win/62.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_63 = APP_RES_PATH "/Training/training_GIF/win/63.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_64 = APP_RES_PATH "/Training/training_GIF/win/64.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_65 = APP_RES_PATH "/Training/training_GIF/win/65.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_66 = APP_RES_PATH "/Training/training_GIF/win/66.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_67 = APP_RES_PATH "/Training/training_GIF/win/67.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_68 = APP_RES_PATH "/Training/training_GIF/win/68.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_69 = APP_RES_PATH "/Training/training_GIF/win/69.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_70 = APP_RES_PATH "/Training/training_GIF/win/70.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_71 = APP_RES_PATH "/Training/training_GIF/win/71.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_72 = APP_RES_PATH "/Training/training_GIF/win/72.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_73 = APP_RES_PATH "/Training/training_GIF/win/73.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_74 = APP_RES_PATH "/Training/training_GIF/win/74.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_75 = APP_RES_PATH "/Training/training_GIF/win/75.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_76 = APP_RES_PATH "/Training/training_GIF/win/76.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_77 = APP_RES_PATH "/Training/training_GIF/win/77.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_78 = APP_RES_PATH "/Training/training_GIF/win/78.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_79 = APP_RES_PATH "/Training/training_GIF/win/79.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_80 = APP_RES_PATH "/Training/training_GIF/win/80.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_81 = APP_RES_PATH "/Training/training_GIF/win/81.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_82 = APP_RES_PATH "/Training/training_GIF/win/82.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_83 = APP_RES_PATH "/Training/training_GIF/win/83.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_84 = APP_RES_PATH "/Training/training_GIF/win/84.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_85 = APP_RES_PATH "/Training/training_GIF/win/85.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_86 = APP_RES_PATH "/Training/training_GIF/win/86.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_87 = APP_RES_PATH "/Training/training_GIF/win/87.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_88 = APP_RES_PATH "/Training/training_GIF/win/88.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_89 = APP_RES_PATH "/Training/training_GIF/win/89.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_90 = APP_RES_PATH "/Training/training_GIF/win/90.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_91 = APP_RES_PATH "/Training/training_GIF/win/91.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_92 = APP_RES_PATH "/Training/training_GIF/win/92.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_93 = APP_RES_PATH "/Training/training_GIF/win/93.bin"; - static constexpr const char *PNG_TRAINING_WIN_IMAGE_94 = APP_RES_PATH "/Training/training_GIF/win/94.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_01 = APP_RES_PATH "/Training/training_GIF/win_gif/win_01.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_02 = APP_RES_PATH "/Training/training_GIF/win_gif/win_02.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_03 = APP_RES_PATH "/Training/training_GIF/win_gif/win_03.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_04 = APP_RES_PATH "/Training/training_GIF/win_gif/win_04.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_05 = APP_RES_PATH "/Training/training_GIF/win_gif/win_05.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_06 = APP_RES_PATH "/Training/training_GIF/win_gif/win_06.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_07 = APP_RES_PATH "/Training/training_GIF/win_gif/win_07.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_08 = APP_RES_PATH "/Training/training_GIF/win_gif/win_08.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_09 = APP_RES_PATH "/Training/training_GIF/win_gif/win_09.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_10 = APP_RES_PATH "/Training/training_GIF/win_gif/win_10.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_11 = APP_RES_PATH "/Training/training_GIF/win_gif/win_11.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_12 = APP_RES_PATH "/Training/training_GIF/win_gif/win_12.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_13 = APP_RES_PATH "/Training/training_GIF/win_gif/win_13.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_14 = APP_RES_PATH "/Training/training_GIF/win_gif/win_14.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_15 = APP_RES_PATH "/Training/training_GIF/win_gif/win_15.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_16 = APP_RES_PATH "/Training/training_GIF/win_gif/win_16.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_17 = APP_RES_PATH "/Training/training_GIF/win_gif/win_17.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_18 = APP_RES_PATH "/Training/training_GIF/win_gif/win_18.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_19 = APP_RES_PATH "/Training/training_GIF/win_gif/win_19.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_20 = APP_RES_PATH "/Training/training_GIF/win_gif/win_20.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_21 = APP_RES_PATH "/Training/training_GIF/win_gif/win_21.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_22 = APP_RES_PATH "/Training/training_GIF/win_gif/win_22.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_23 = APP_RES_PATH "/Training/training_GIF/win_gif/win_23.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_24 = APP_RES_PATH "/Training/training_GIF/win_gif/win_24.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_25 = APP_RES_PATH "/Training/training_GIF/win_gif/win_25.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_26 = APP_RES_PATH "/Training/training_GIF/win_gif/win_26.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_27 = APP_RES_PATH "/Training/training_GIF/win_gif/win_27.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_28 = APP_RES_PATH "/Training/training_GIF/win_gif/win_28.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_29 = APP_RES_PATH "/Training/training_GIF/win_gif/win_29.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_30 = APP_RES_PATH "/Training/training_GIF/win_gif/win_30.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_31 = APP_RES_PATH "/Training/training_GIF/win_gif/win_31.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_32 = APP_RES_PATH "/Training/training_GIF/win_gif/win_32.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_33 = APP_RES_PATH "/Training/training_GIF/win_gif/win_33.bin"; + static constexpr const char *PNG_TRAINING_WIN_IMAGE_34 = APP_RES_PATH "/Training/training_GIF/win_gif/win_34.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/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 002887505..27f098b17 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -469,7 +469,7 @@ void TraingModel::AnalysisData(cywee_activity_result_t *cyweeInfo) { ui_api_vibrate_once_func(); } TraingCardView::GetInstance()->SetPopupViewStatus(GetTagPopup, true); - if (TraingCardView::GetInstance()->GetAnimator()) { + if (!TraingCardView::GetInstance()->GetAnimator()) { TraingCardView::GetInstance()->GetAnimator()->Start(); } Gettagstuats = true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index de0129b56..806258c54 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -67,109 +67,190 @@ static const uint16_t LABEL_FONT_SIZE = 200; static const uint32_t BACK_GROUND_COLOR = 0xfff6f6f6; static const uint32_t CARD_PAGE_COLOR = 0xffd0d0d0; -// 动态刷新设置 -static constexpr uint16_t IMAGE_SIZE_X = 120; -static constexpr uint16_t IMAGE_SIZE_Y = 120; -static constexpr uint16_t IMAGE_POSITION_X = 173; -static constexpr uint16_t IMAGE_POSITION_Y = 100; -static constexpr uint16_t DETECTION_IMAGE_ANIMATORVIEW_SIZE = 94; -static constexpr uint16_t DETECTION_IMAGE_ANIMATORVIEW_SPEED = 30; - -static ImageAnimatorInfo g_imageAnimatorInfo_trainingwin[94] = { - {PNG_TRAINING_WIN_IMAGE_01, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_02, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_03, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_04, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_05, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_06, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_07, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_08, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_09, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_10, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_11, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_12, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_13, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_14, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_15, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_16, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_17, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_18, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_19, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_20, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_21, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_22, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_23, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_24, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_25, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_26, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_27, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_28, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_29, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_30, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_31, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_32, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_33, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_34, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_35, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_36, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_37, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_38, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_39, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_40, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_41, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_42, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_43, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_44, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_45, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_46, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_47, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_48, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_49, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_50, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_51, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_52, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_53, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_54, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_55, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_56, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_57, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_58, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_59, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_60, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_61, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_62, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_63, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_64, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_65, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_66, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_67, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_68, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_69, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_70, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_71, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_72, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_73, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_74, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_75, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_76, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_77, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_78, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_79, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_80, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_81, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_82, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_83, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_84, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_85, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_86, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_87, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_88, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_89, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_90, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_91, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_92, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_93, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, - {PNG_TRAINING_WIN_IMAGE_94, {IMAGE_POSITION_X, IMAGE_POSITION_Y}, IMAGE_SIZE_X, IMAGE_SIZE_Y, IMG_SRC_FILE_PATH}, +// 动态刷新设置 +static constexpr uint16_t IMAGE_SIZE_X = 120; +static constexpr uint16_t IMAGE_SIZE_Y = 120; +static constexpr uint16_t IMAGE_POSITION_X = 173; +static constexpr uint16_t IMAGE_POSITION_Y = 100; +static constexpr uint16_t DETECTION_IMAGE_ANIMATORVIEW_SIZE = 35; +static constexpr uint16_t DETECTION_IMAGE_ANIMATORVIEW_SPEED = 35; + +static ImageAnimatorInfo g_imageAnimatorInfo_trainingwin[35] = { + {PNG_TRAINING_WIN_IMAGE_01, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_01, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_02, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_03, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_04, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_05, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_06, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_07, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_08, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_09, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_10, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_11, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_12, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_13, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_14, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_15, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_16, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_17, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_18, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_19, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_20, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_21, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_22, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_23, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_24, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_25, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_26, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_27, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_28, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_29, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_30, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_31, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_32, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_33, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, + {PNG_TRAINING_WIN_IMAGE_34, + {IMAGE_POSITION_X, IMAGE_POSITION_Y}, + IMAGE_SIZE_X, + IMAGE_SIZE_Y, + IMG_SRC_FILE_PATH}, }; static TraingCardView *g_pTraingCardView{nullptr}; @@ -188,7 +269,7 @@ TraingCardView::TraingCardView() { } TraingCardView::~TraingCardView() { - + DeInit(); g_pTraingCardView = nullptr; @@ -252,7 +333,6 @@ void TraingCardView::DeInit() { /*界面*/ controlview_->RemoveAll(); dataallview_->RemoveAll(); - // DetailView->RemoveAll(); musicview_->RemoveAll(); endView->RemoveAll(); getView->RemoveAll(); @@ -406,17 +486,14 @@ void TraingCardView::SetPopupViewStatus(PopupType type, bool status) { } else if (type == HeartPopup) { popupView = heartView; } - if (popupView == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PopupView is NULL"); return; } - UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad(); if (cardview != nullptr) { cardview->SetVisible(!status); } - popupView->SetVisible(status); } /*结束弹窗界面*/