增加故事选择

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp
index 73f1693..27ef0c9 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp
@@ -307,7 +307,6 @@ namespace OHOS
             if (listenAnimator) { 
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdLullabyView::Show: 启动聆听动画");
                 listenAnimator->SetVisible(true); 
-                listenAnimator->Start(); 
             } else {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdLullabyView::Show: listenAnimator is null");
             }

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 b661ff3..868ee48 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
@@ -290,7 +290,9 @@ namespace OHOS
             
             if(currentView == THUNDERBIRD_LULLABYVIEW && currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3)
             {
-                HandleLullabyFunction(currentView, currentSubView);              
+                // HandleLullabyFunction(currentView, currentSubView);     
+                ln_ws_start_audio_chat(LN_AUDIO_CHAT_CHOOSE_STORY_REQUEST);
+                ThunderBirdLullabyView::GetInstance()->listenAnimator->Start();
             }
             else if(isDialogueing == true)
             {
@@ -598,8 +600,8 @@ namespace OHOS
                 AI_ForceInterrupt();
                 ln_ws_send_voice_chat_interrupt("进入哄睡");
                 ThunderBirdModel::GetInstance()->ClearAudioTextQueue();
-                //ln_ws_start_audio_chat(LN_AUDIO_CHAT_CHOOSE_STORY_REQUEST);
-                ln_ws_send_random_story_request("随机故事");
+                ln_ws_start_audio_chat(LN_AUDIO_CHAT_CHOOSE_STORY_REQUEST);
+                //ln_ws_send_random_story_request("随机故事");
                 break;
             case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4:
                 ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5);

diff --git a/code/sdk/files/leiniao/fs/user/res/hair/center-parted-bangs/orange.bin b/code/sdk/files/leiniao/fs/user/res/hair/center-parted-bangs/orange.bin
new file mode 100644 (file)
index 0000000..5126174
Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/center-parted-bangs/orange.bin differ

diff --git a/code/sdk/files/leiniao/fs/user/res/hair/diagonal-bangs/orange.bin b/code/sdk/files/leiniao/fs/user/res/hair/diagonal-bangs/orange.bin
new file mode 100644 (file)
index 0000000..43cdcb4
Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/diagonal-bangs/orange.bin differ

diff --git a/code/sdk/files/leiniao/fs/user/res/hair/m-shaped-bangs/orange.bin b/code/sdk/files/leiniao/fs/user/res/hair/m-shaped-bangs/orange.bin
new file mode 100644 (file)
index 0000000..fd293ce
Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/m-shaped-bangs/orange.bin differ

diff --git a/code/sdk/files/leiniao/fs/user/res/hair/side-parted-comma/orange.bin b/code/sdk/files/leiniao/fs/user/res/hair/side-parted-comma/orange.bin
new file mode 100644 (file)
index 0000000..bccef30
Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/side-parted-comma/orange.bin differ

diff --git a/code/sdk/files/leiniao/fs/user/res/hair/side-parted-texture/orange.bin b/code/sdk/files/leiniao/fs/user/res/hair/side-parted-texture/orange.bin
new file mode 100644 (file)
index 0000000..a764739
Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/side-parted-texture/orange.bin differ

diff --git a/code/sdk/files/leiniao/fs/user/res/hair/straight-bangs/orange.bin b/code/sdk/files/leiniao/fs/user/res/hair/straight-bangs/orange.bin
new file mode 100644 (file)
index 0000000..5120240
Binary files /dev/null and b/code/sdk/files/leiniao/fs/user/res/hair/straight-bangs/orange.bin differ

diff --git a/code/sdk/middleware/services/media/hal/audio/plugins/brandy/primary/primary_sub_port_out.c b/code/sdk/middleware/services/media/hal/audio/plugins/brandy/primary/primary_sub_port_out.c
index 9de3d3a..091e8fc 100644 (file)
--- a/code/sdk/middleware/services/media/hal/audio/plugins/brandy/primary/primary_sub_port_out.c
+++ b/code/sdk/middleware/services/media/hal/audio/plugins/brandy/primary/primary_sub_port_out.c
@@ -379,7 +379,7 @@ static int32_t AODevOpen(SubPortOutContext *portOutCtx, const enum AudioCategory
         }
 #ifdef BOARD_LEINIAO
         uapi_snd_gain gain;
-        gain.integer = -9;
+        gain.integer = -4;
         gain.decimal = 0;
         uapi_snd_set_volume(portOutCtx->sndHandle, sndAttr.port_attr[0].out_port, &gain, TD_NULL);
 #endif