From: luozheng <1732036298@qq.com>
Date: Sat, 17 Aug 2024 06:23:15 +0000 (+0800)
Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 
X-Git-Tag: release_V1.2.70_20241020_135402~638^2~5^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F714%2F1;p=mirrors%2FFD230.git

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

ce26d2ab9283d9f8d6d4798809cc256ca2448489
diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index 97f22d91b,3a7807b67..28b685610
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
@@@ -1,15 -1,15 +1,15 @@@
--/*
--* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
--* Description: language
--* Author: Graphic develop team
--* Create: 2021-07-06
--*/
--
--#ifndef UI_RESOURCE_STRING_H
--#define UI_RESOURCE_STRING_H
--#include <cstdint>
--namespace OHOS {
--enum UIResourceTextId : uint16_t {
++/*
++* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
++* Description: language
++* Author: Graphic develop team
++* Create: 2021-07-06
++*/
++
++#ifndef UI_RESOURCE_STRING_H
++#define UI_RESOURCE_STRING_H
++#include <cstdint>
++namespace OHOS {
++enum UIResourceTextId : uint16_t {
      STR_EXERCISE_OUTDOORWALKING = 0,
      STR_EXERCISE_OUTDOORRUNNING = 1,
      STR_EXERCISE_OUTDOORBIKING = 2,
@@@ -523,13 -523,12 +523,13 @@@
      STR_SCHEDULE_TITLE = 510,
      STR_SCHEDULE_NO_DATA = 511,
      STR_SCHEDULE_NO_DATA_PROMPT = 512,
 -    STR_MAX_ID = 513,
 +    STR_NO_PAIRED_DEV = 513,
 +    STR_MAX_ID = 514,
  }; // UIResourceTextId
--
--enum FontLanguageId : uint8_t {
 -    LANGUAGE_ID_ZH,
++
++enum FontLanguageId : uint8_t {
      LANGUAGE_ID_EN,
 +    LANGUAGE_ID_ZH,
      LANGUAGE_ID_MAX
  }; // UITextLanguageTextId
  }
diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c
index 6ff5de753,bb6e6b375..6dc2e61bd
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@@ -2286,7 -2290,7 +2290,8 @@@ void uapi_enter_power_saving_mode(void
      do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE,NULL);
  
      //关闭音乐
 +    mmi_stop_music_play();
+ 
  }
  
  void uapi_exit_power_saving_mode(void)