进入对话不做相同表情判断，用与恢复黑脸

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 17c13b6..7ffa17a 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
@@ -132,7 +132,7 @@ namespace OHOS
     static constexpr int16_t STRIDE_ALIGNMENT_VALUE = 128;
     static constexpr int16_t JPEG_WIDTH_BYTE_ALIGNMENT = 128;
     static constexpr int16_t JPEG_HEIGHT_BYTE_ALIGNMENT = 16;
-    static constexpr int16_t BUFFER_QUEUE_SIZE = 3;
+    static constexpr int16_t BUFFER_QUEUE_SIZE = 2;
     static constexpr int16_t JPEG_HEIGHT_DIVISOR = 2;
 
     static const int64_t COLOR_SIGNAL_ON = 0xffffffff;

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 a1989ba..f08c55d 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
@@ -3454,10 +3454,11 @@ extern "C" {
         }
         
         //如果本来就是眨眼的表情直接返回
-        if (m_currentExpression == "winking" || m_currentExpression.empty() == true) {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::OnEnterDialogueMode: 已经是眨眼表情，无需切换");
-            return;
-        }
+        // if (m_currentExpression == "winking" || m_currentExpression.empty() == true) {
+        //     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::OnEnterDialogueMode: 已经是眨眼表情，无需切换");
+        //     return;
+        // }
+        //不管存不存在都切换到眨眼表情，用于恢复黑脸操作
 
         ThunderBirdMainView::GetInstance()->StopHairIcon();//停止头发图标
         // 应用音量（如果在STATUS_SHOW界面调节过音量，此时应用）