From: xue <2144439972@qq.com> Date: Fri, 19 Sep 2025 02:57:44 +0000 (+0800) Subject: 修复编译bug X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~46^2~3 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=2c4d9387f5274602c720d240a04649dc867206bd;p=mirrors%2FFD230.git 修复编译bug --- diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp index a7d6efd97..88f4f839c 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp @@ -182,11 +182,11 @@ namespace OHOS } else if(currentSubView == ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_2) { - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdOtaView::THUNDERBIRD_GUIDEVIEW_3); + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3); } else if(currentSubView == ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) { - ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_OTAVIEW, ThunderBirdOtaView::THUNDERBIRD_OTAVIEW_NORMAL); + ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING); } return true; } diff --git a/code/sdk/files/leiniao/fs/user/res/1.bin b/code/sdk/files/leiniao/fs/user/res/1.bin deleted file mode 100644 index 71e6f2ad8..000000000 Binary files a/code/sdk/files/leiniao/fs/user/res/1.bin and /dev/null differ diff --git a/code/sdk/files/leiniao/fs/user/res/500.bin b/code/sdk/files/leiniao/fs/user/res/500.bin deleted file mode 100644 index c86f6f0d4..000000000 Binary files a/code/sdk/files/leiniao/fs/user/res/500.bin and /dev/null differ diff --git a/code/sdk/files/leiniao/fs/user/res/501.bin b/code/sdk/files/leiniao/fs/user/res/501.bin deleted file mode 100644 index bbf843c4e..000000000 Binary files a/code/sdk/files/leiniao/fs/user/res/501.bin and /dev/null differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/111.bin b/code/sdk/files/leiniao/fs/user/res/hair/111.bin deleted file mode 100644 index 09700bc96..000000000 Binary files a/code/sdk/files/leiniao/fs/user/res/hair/111.bin and /dev/null differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/curly/black.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/black.bin new file mode 100644 index 000000000..bbf8e224c Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/curly/black.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/curly/blue.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/blue.bin new file mode 100644 index 000000000..8172e2439 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/curly/blue.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/curly/dark_brown.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/dark_brown.bin new file mode 100644 index 000000000..dfe9c24ec Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/curly/dark_brown.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/curly/gold.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/gold.bin new file mode 100644 index 000000000..03d6f2c59 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/curly/gold.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/curly/gray.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/gray.bin new file mode 100644 index 000000000..64970420b Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/curly/gray.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/curly/light_brown.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/light_brown.bin new file mode 100644 index 000000000..a945731e0 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/curly/light_brown.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/Classic/curly_hair.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/orange.bin similarity index 100% rename from code/sdk/files/leiniao/fs/user/res/hair/Classic/curly_hair.bin rename to code/sdk/files/leiniao/fs/user/res/hair/curly/orange.bin diff --git a/code/sdk/files/leiniao/fs/user/res/hair/curly/purple.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/purple.bin new file mode 100644 index 000000000..8951a2ad1 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/curly/purple.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/curly/white.bin b/code/sdk/files/leiniao/fs/user/res/hair/curly/white.bin new file mode 100644 index 000000000..caa733834 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/curly/white.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Angry.bin b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Angry.bin new file mode 100644 index 000000000..a212f874f Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Angry.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Confused.bin b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Confused.bin new file mode 100644 index 000000000..2d3060286 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Confused.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Shocked.bin b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Shocked.bin new file mode 100644 index 000000000..082e0f645 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Shocked.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Sleeping.bin b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Sleeping.bin new file mode 100644 index 000000000..b04555ee9 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Sleeping.bin differ diff --git a/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Speechless.bin b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Speechless.bin new file mode 100644 index 000000000..2cbab89d4 Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Speechless.bin differ