更新表情文件

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
index eeb813e..3a28d8d 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp
@@ -2626,7 +2626,6 @@
         else if (emotionStr == "dizzy") return "Dizzy";
         else if (emotionStr == "thinking") return "Think";
         else if (emotionStr == "sleepy") return "Sleepy";
-        else if (emotionStr == "sleeping") return "Sleepy";
         else if (emotionStr == "working") return "WorkStudy";
         else if (emotionStr == "exercising") return "Exercise";
         else if (emotionStr == "playing") return "Play";
@@ -2673,7 +2672,14 @@
                         expressionPath = "/user/res/video/CloseEyes/" + eyesShape_ + "/" + eyesColor_ + ".mp4";
                     } else {
                         // 非眨眼表情，则在下载文件目录里面
-                        expressionPath = "/user/userdata/leiniao/emoji/" + eyesShape_ + "/" + eyesColor_ + "/" + m_currentExpression + ".mp4";
+                        if(m_currentExpression == "sleeping")
+                        {
+                            expressionPath = "/user/res/video/Default/sleeping.mp4";
+                        }
+                        else
+                        {
+                            expressionPath = "/user/userdata/leiniao/emoji/" + eyesShape_ + "/" + eyesColor_ + "/" + m_currentExpression + ".mp4";
+                        }
                     }
                 }
                 
@@ -2793,6 +2799,12 @@
                 }
                 else//非眨眼表情，则在下载文件目录里面
                 {
+                    if(m_currentExpression == "sleeping")
+                    {
+                        expressionPath = "/user/res/video/Default/sleeping.mp4";
+                    }
+                    else
+                    {
                     expressionPath = "/user/userdata/leiniao/emoji/" + eyesShape_ + "/" + eyesColor_ + "/" + m_currentExpression + ".mp4";
                 }
                 //判断表情文件是否存在

diff --git a/code/sdk/files/leiniao/fs/user/res/video/Default/Exercise.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Exercise.mp4
index a56357d..49e1635 100644 (file)
Binary files a/code/sdk/files/leiniao/fs/user/res/video/Default/Exercise.mp4 and b/code/sdk/files/leiniao/fs/user/res/video/Default/Exercise.mp4 differ

diff --git a/code/sdk/files/leiniao/fs/user/res/video/Default/sleeping.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/sleeping.mp4
new file mode 100644 (file)
index 0000000..6711580
Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/video/Default/sleeping.mp4 differ