Merge #755 into sdk602patch0626 from refs/changes/755/head

Code review from 罗正

* refs/changes/755/head: (23 commits squashed)

  - 1. 优化连接中的gif动画，由原来的20帧修改为现在的20帧

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 修改连接动画为60帧

  - 添加手机同步歌曲到手表，手表音乐列表同步刷新。

  - 音乐列表刷新机制优化在每次切换到音乐列表刷新一次，list高度会根据歌曲数量自适应

  - 显示方式界面添加弧形列表样式，并添加对应资源

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 倒计时界面配置多国语言

  - 1.运动识别弹窗根据弹窗汇总设置显示时长为10s，并添加震动
    2.修复开始按钮的视图Id

  - 倒计时界面优化修改

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 倒计时优化修改

  - 倒计时配置多国语言

  - APPlist应用顺序按照KUMI已经重新排列，放入设置中的四个Slice暂未屏蔽等之后加入后再屏蔽

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 1.音乐播放器在切换通道时添加主动连接和断开手机a2dp功能
    2.播放器添加连接动画，手表连接手机音乐超时时间设置为5s

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - AI语音添加取消当前AI对话功能

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 修改进入AI的按键逻辑，现在已经确定是(不在AI界面)双击进入AI，单击切换模型(在AI界面)

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/755

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
index 0224802..d2f7fb3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-18 14:55:27
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-15 16:22:03
+ * @LastEditTime: 2024-08-21 18:02:08
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
  */
 
@@ -174,17 +174,13 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */
         display_api->turn_on_screen();
         /* -------------------------------------------------------------------------- */
-        if(display_api->get_screen_state() == SCREEN_ON)
+        if (display_api->get_screen_state() == SCREEN_ON)
         {
             uint16_t curSliceId = NativeAbility::GetInstance().GetCurSliceId();
-            if (curSliceId == VIEW_AI_VOICE) // 如果当前已在ai语音界面不做切换
+            if (curSliceId == VIEW_AI_VOICE) // 如果当前已在ai语音界面就切换模型
             {
                 AiVoiceModel::GetInstance().FunctionKeyOnClickToChangeAIModel();
             }
-            else
-            {
-                NativeAbility::GetInstance().EnterSlice(VIEW_AI_VOICE); // 切换到Ai语音界面
-            }
         }
 
         return;
@@ -351,8 +347,11 @@ namespace OHOS
         }
         if (display_api->get_screen_state() == SCREEN_ON)
         {
-            // 切换到显示方式界面
-            NativeAbility::GetInstance().EnterSlice(VIEW_AI_MODELS);
+            uint16_t curSliceId = NativeAbility::GetInstance().GetCurSliceId();
+            if (curSliceId != VIEW_AI_VOICE)
+            {
+                NativeAbility::GetInstance().EnterSlice(VIEW_AI_VOICE);
+            }
         }
         else
         {
@@ -386,6 +385,6 @@ namespace OHOS
         RegisterFuncKeyPressEvent();
         // RegisterFuncKeyLongPressEvent();
         // RegisterFuncKeyClickEvent();
-        // RegisterFuncKeyDoubleClickEvent();
+        RegisterFuncKeyDoubleClickEvent();
     }
 }