From: CCC <2393524978@qq.com> Date: Thu, 20 Jul 2023 01:48:13 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=dfa8f852620c4a429eef994a936463452b6aab7a;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/_am_digit_bg.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/_am_digit_bg.png deleted file mode 100644 index f6215b4d..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/_am_digit_bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg_360.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg_360.png deleted file mode 100644 index 8122a925..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png index af7cd2ee..dd9a26af 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre_360.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre_360.png deleted file mode 100644 index 8da0e411..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png index 9cb6620d..4f4fdb86 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin_360.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin_360.png deleted file mode 100644 index 39ef1c4e..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin0024.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin0024.png deleted file mode 100644 index 06d3a4f7..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin0024.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin008.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin008.png deleted file mode 100644 index e04e5e9d..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin008.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_360.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_360.png deleted file mode 100644 index 01331800..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png index cbb73f7d..6f71e737 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png index 819dea6d..8094ce7c 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png index b3bcbaf6..f1be80e8 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png index 335e8452..3b28ecfc 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png index ca294ac0..9066c268 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png index 934273dd..9feebfcc 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png index 546f01db..04d5f16e 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png index a8074557..3f6b55b1 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png index f531b4ae..0a0e4ef2 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png index ec0041eb..c5bfc437 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/_icon_rocket.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/_icon_rocket.png deleted file mode 100644 index 1edc0bc7..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/_icon_rocket.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket_360.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket_360.png deleted file mode 100644 index e16e045e..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_360.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_360.png deleted file mode 100644 index 5d1639cd..00000000 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png index 0dbb5226..a691d2ca 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png index 5a71f5c9..7ddfe18f 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png index 94dda818..cc136b68 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png index 839107ce..108501b6 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png index 1bed3b4f..e1433232 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png index 8d0bdbe6..6eeeebb8 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png index 9d81b268..ab651965 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png index eb5eef04..c540767a 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png index cfeacb3e..31dfe451 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png index 597c179f..50f735e4 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png index aee86188..e7a337ca 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png index 8d4027bc..8a3ab35a 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png index d07bb44f..21c6d09a 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png index b7f54179..93ebe598 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png index 502c1065..dc53a5f3 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png index ebe84fc7..35d901aa 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png index 39cfd8f8..ccd9e557 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png index aa438211..e2c69fde 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png index de7720ac..4874b3b4 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png differ diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png index d0f789fc..8e8517f8 100644 Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/_am_digit_bg.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/_am_digit_bg.png deleted file mode 100644 index f6215b4d..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/_am_digit_bg.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg_360.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg_360.png deleted file mode 100644 index 8122a925..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_bg_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png index af7cd2ee..dd9a26af 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre_360.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre_360.png deleted file mode 100644 index 8da0e411..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_default_ambient/am_digit_pre_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png index 9cb6620d..4f4fdb86 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin_360.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin_360.png deleted file mode 100644 index 39ef1c4e..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dial_dolphin_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin0024.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin0024.png deleted file mode 100644 index 06d3a4f7..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin0024.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin008.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin008.png deleted file mode 100644 index e04e5e9d..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin008.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_360.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_360.png deleted file mode 100644 index 01331800..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png index cbb73f7d..6f71e737 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_0.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png index 819dea6d..8094ce7c 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_1.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png index b3bcbaf6..f1be80e8 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_2.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png index 335e8452..3b28ecfc 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_3.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png index ca294ac0..9066c268 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_4.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png index 934273dd..9feebfcc 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_5.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png index 546f01db..04d5f16e 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_6.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png index a8074557..3f6b55b1 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_7.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png index f531b4ae..0a0e4ef2 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_8.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png index ec0041eb..c5bfc437 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_dolphin/icon_dolphin_digital_9.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/_icon_rocket.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/_icon_rocket.png deleted file mode 100644 index 1edc0bc7..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/_icon_rocket.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket_360.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket_360.png deleted file mode 100644 index e16e045e..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_dial_rocket_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_360.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_360.png deleted file mode 100644 index 5d1639cd..00000000 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_360.png and /dev/null differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png index 0dbb5226..a691d2ca 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_0.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png index 5a71f5c9..7ddfe18f 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_1.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png index 94dda818..cc136b68 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_2.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png index 839107ce..108501b6 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_3.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png index 1bed3b4f..e1433232 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_4.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png index 8d0bdbe6..6eeeebb8 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_5.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png index 9d81b268..ab651965 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_6.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png index eb5eef04..c540767a 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_7.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png index cfeacb3e..31dfe451 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_8.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png index 597c179f..50f735e4 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_9.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png index aee86188..e7a337ca 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_0.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png index 8d4027bc..8a3ab35a 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_1.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png index d07bb44f..21c6d09a 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_2.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png index b7f54179..93ebe598 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_3.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png index 502c1065..dc53a5f3 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_4.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png index ebe84fc7..35d901aa 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_5.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png index 39cfd8f8..ccd9e557 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_6.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png index aa438211..e2c69fde 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_7.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png index de7720ac..4874b3b4 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_8.png differ diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png index d0f789fc..8e8517f8 100644 Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/dial_rocket/icon_rocket_digital_s_9.png differ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c index 7c729c22..a5dcd51c 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c @@ -135,23 +135,6 @@ void * wechat_actId_ext_get(lv_watch_Activity_Id_t actId) return NULL; } -void wechat_actId_screen_delete(lv_watch_Activity_Id_t act_id) -{ - lv_obj_t * activity_obj = lv_watch_get_activity_obj(act_id); - if(NULL == activity_obj) - return NULL; - - lv_watch_activity_ext_t * ext = lv_obj_get_ext_attr(activity_obj); - //LV_ASSERT_MEM(ext); - if(ext->prepare_destory) - { - ext->prepare_destory(activity_obj); - } - lv_obj_del(activity_obj); - - return; -} - void wechat_common_screen_prepare_destory(lv_obj_t * activity_obj) { WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -542,11 +525,7 @@ void wechat_msg_sending_result_screen_timeout(void *para) //delete sending screen //lv_watch_del_interface(ACT_ID_WECHAT_SENDING); - lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_SENDING); - if(NULL == activity_obj) - { - lv_obj_del(activity_obj); - } + wechat_msg_sending_screen_prepare_destory(NULL); //return main list screen wechat_main_screen_refresh(); @@ -603,6 +582,12 @@ void wechat_msg_sending_screen_prepare_destory(lv_obj_t * activity_obj) sending_ext->sending_anim.var = NULL; } } + + lv_obj_t * obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_SENDING); + if(NULL != obj) + { + lv_obj_del(obj); + } } lv_obj_t * wechat_msg_sending_screen_create(lv_obj_t * activity_obj) @@ -708,7 +693,12 @@ void wechat_msg_recording_anim(lv_anim_t * a) Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5); //wechat_chat_list_set_slide_enable(&ext->old_ext, true); /*reset slide_enable at the end of recording*/ - lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING); + if(NULL != activity_obj) + { + lv_obj_del(activity_obj); + } wechat_msg_sending_screen_create(NULL); } else @@ -746,8 +736,13 @@ void wechat_msg_recording_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority) } Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5); - lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); - + //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING); + if(NULL != activity_obj) + { + lv_obj_del(activity_obj); + } + lv_wechat_ext_t * ext = wechat_actId_ext_get(ACT_ID_WECHAT_MAIN); if(NULL != ext) { @@ -771,12 +766,18 @@ void wechat_msg_recording_cb(MCI_EVNET_T event , MCI_INFO_T info_type, int32_t v } wechat_chat_list_set_slide_enable(&ext->old_ext, false); /*prevent to slide out while recording*/ + lv_obj_t * activity_obj = NULL; switch(ext->event) { case MCI_EVENT_EOS: wechat_chat_list_set_slide_enable(&ext->old_ext, true); /*reset slide_enable at the end of recording*/ - lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING); + if(NULL != activity_obj) + { + lv_obj_del(activity_obj); + } wechat_msg_sending_screen_create(NULL); break; @@ -789,7 +790,12 @@ void wechat_msg_recording_cb(MCI_EVNET_T event , MCI_INFO_T info_type, int32_t v } Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5); lv_fs_remove(s_wechat_msg_item_info.msg_data_full_file_name); - lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING); + if(NULL != activity_obj) + { + lv_obj_del(activity_obj); + } wechat_chat_list_set_slide_enable(&ext->old_ext, true); /*reset slide_enable at the end of recording*/ break; @@ -801,6 +807,19 @@ void wechat_msg_recording_cb(MCI_EVNET_T event , MCI_INFO_T info_type, int32_t v } } +void wechat_msg_recording_screen_prepare_destory(lv_obj_t * activity_obj) +{ + printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + + lv_watch_png_cache_all_free(); + + lv_obj_t * obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING); + if(NULL != obj) + { + lv_obj_del(obj); + } +} + void wechat_msg_recording_screen_create(void) { WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -947,7 +966,12 @@ void wechat_msg_record_button_event_cb(lv_obj_t * obj, lv_event_t e) recording_ext->file_size = 0; Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5); lv_fs_remove(s_wechat_msg_item_info.msg_data_full_file_name); - lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING); + if(NULL != activity_obj) + { + lv_obj_del(activity_obj); + } //return main list screen wechat_main_screen_refresh(); @@ -958,7 +982,12 @@ void wechat_msg_record_button_event_cb(lv_obj_t * obj, lv_event_t e) Hal_File_Record_Stop_Req(&(recording_ext->file_size)); recording_ext->file_size = 0; Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5); - lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING); + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING); + if(NULL != activity_obj) + { + lv_obj_del(activity_obj); + } wechat_msg_sending_screen_create(NULL); } }