修复编译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 a7d6efd..88f4f83 100644 (file)
--- 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 (file)
index 71e6f2a..0000000
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 (file)
index c86f6f0..0000000
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 (file)
index bbf843c..0000000
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 (file)
index 09700bc..0000000
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 (file)
index 0000000..bbf8e22
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 (file)
index 0000000..8172e24
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 (file)
index 0000000..dfe9c24
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 (file)
index 0000000..03d6f2c
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 (file)
index 0000000..6497042
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 (file)
index 0000000..a945731
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 (file)
index 0000000..8951a2a
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 (file)
index 0000000..caa7338
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 (file)
index 0000000..a212f87
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 (file)
index 0000000..2d30602
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 (file)
index 0000000..082e0f6
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 (file)
index 0000000..b04555e
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 (file)
index 0000000..2cbab89
Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/hairicon/Speechless.bin differ