优化资源路径

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
index 583351d..6bcddc8 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
@@ -656,7 +656,7 @@ namespace OHOS
         surface->SetSize(bufferSize);
         if (videoPlay_ == nullptr)
         {
-            std::string uri("/user/video/CloseEyes/RoundEyes/amber.mp4");
+            std::string uri("/user/res/video/CloseEyes/RoundEyes/amber.mp4");
             videoPlay_ = new MediaVideoPlay(surface, nullptr, uri, true);
             if (videoPlay_ == nullptr)
             {

diff --git a/code/sdk/files/leiniao/fs/user/music/1khz.mp3 b/code/sdk/files/leiniao/fs/user/res/music/1khz.mp3
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/music/1khz.mp3
rename to code/sdk/files/leiniao/fs/user/res/music/1khz.mp3

diff --git a/code/sdk/files/leiniao/fs/user/music/FactoryMode.mp3 b/code/sdk/files/leiniao/fs/user/res/music/FactoryMode.mp3
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/music/FactoryMode.mp3
rename to code/sdk/files/leiniao/fs/user/res/music/FactoryMode.mp3

diff --git a/code/sdk/files/leiniao/fs/user/music/PowerOn.mp3 b/code/sdk/files/leiniao/fs/user/res/music/PowerOn.mp3
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/music/PowerOn.mp3
rename to code/sdk/files/leiniao/fs/user/res/music/PowerOn.mp3

diff --git a/code/sdk/files/leiniao/fs/user/music/test3.txt b/code/sdk/files/leiniao/fs/user/res/music/test3.txt
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/music/test3.txt
rename to code/sdk/files/leiniao/fs/user/res/music/test3.txt

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Blue.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Blue.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Blue.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Blue.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/BluePink.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/BluePink.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/BluePink.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/BluePink.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Brown.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Brown.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Brown.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Brown.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Green.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Green.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Green.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Green.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Purple.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Purple.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Purple.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Purple.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/PurpleOrange.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/PurpleOrange.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/PurpleOrange.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/PurpleOrange.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Red.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Red.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Red.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Red.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Yellow.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Yellow.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/Yellow.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/Yellow.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/YellowGreen.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/YellowGreen.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/YellowGreen.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/YellowGreen.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/amber.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/amber.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/RoundEyes/amber.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/RoundEyes/amber.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Blue.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Blue.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Blue.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Blue.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/BluePink.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/BluePink.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/BluePink.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/BluePink.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Brown.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Brown.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Brown.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Brown.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Green.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Green.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Green.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Green.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Purple.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Purple.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Purple.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Purple.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/PurpleOrange.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/PurpleOrange.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/PurpleOrange.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/PurpleOrange.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Red.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Red.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Red.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Red.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Yellow.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Yellow.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/Yellow.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/Yellow.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/YellowGreen.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/YellowGreen.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/YellowGreen.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/YellowGreen.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/amber.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/amber.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/StraightEyes/amber.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/StraightEyes/amber.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Blue.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Blue.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Blue.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Blue.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/BluePink.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/BluePink.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/BluePink.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/BluePink.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Brown.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Brown.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Brown.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Brown.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Green.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Green.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Green.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Green.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Purple.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Purple.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Purple.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Purple.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/PurpleOrange.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/PurpleOrange.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/PurpleOrange.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/PurpleOrange.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Red.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Red.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Red.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Red.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Yellow.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Yellow.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/Yellow.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/Yellow.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/YellowGreen.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/YellowGreen.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/YellowGreen.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/YellowGreen.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/amber.mp4 b/code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/amber.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/CloseEyes/UpturnedEyes/amber.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/CloseEyes/UpturnedEyes/amber.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Angry.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Angry.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Angry.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Angry.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/CloseEyes.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/CloseEyes.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/CloseEyes.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/CloseEyes.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Dizzy.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Dizzy.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Dizzy.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Dizzy.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Doubt.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Doubt.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Doubt.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Doubt.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Embarrassed.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Embarrassed.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Embarrassed.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Embarrassed.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Exercise.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Exercise.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Exercise.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Exercise.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Grievance.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Grievance.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Grievance.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Grievance.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Heartbeat.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Heartbeat.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Heartbeat.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Heartbeat.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Kiss.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Kiss.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Kiss.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Kiss.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Laugh.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Laugh.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Laugh.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Laugh.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Naughty.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Naughty.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Naughty.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Naughty.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Play.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Play.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Play.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Play.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Shocked.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Shocked.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Shocked.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Shocked.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Sleepy.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Sleepy.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Sleepy.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Sleepy.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Smile.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Smile.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Smile.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Smile.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Speechless.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Speechless.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Speechless.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Speechless.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Stare Blankly.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Stare Blankly.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Stare Blankly.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Stare Blankly.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Tears.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Tears.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Tears.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Tears.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/Think.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/Think.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/Think.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/Think.mp4

diff --git a/code/sdk/files/leiniao/fs/user/video/Default/WorkStudy.mp4 b/code/sdk/files/leiniao/fs/user/res/video/Default/WorkStudy.mp4
similarity index 100%
rename from code/sdk/files/leiniao/fs/user/video/Default/WorkStudy.mp4
rename to code/sdk/files/leiniao/fs/user/res/video/Default/WorkStudy.mp4