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

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index 97f22d9,3a7807b..28b6856
--- 1/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
--- 2/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 {
++/*\r
++* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.\r
++* Description: language\r
++* Author: Graphic develop team\r
++* Create: 2021-07-06\r
++*/\r
++\r
++#ifndef UI_RESOURCE_STRING_H\r
++#define UI_RESOURCE_STRING_H\r
++#include <cstdint>\r
++namespace OHOS {\r
++enum UIResourceTextId : uint16_t {\r
      STR_EXERCISE_OUTDOORWALKING = 0,\r
      STR_EXERCISE_OUTDOORRUNNING = 1,\r
      STR_EXERCISE_OUTDOORBIKING = 2,\r
@@@ -523,13 -523,12 +523,13 @@@
      STR_SCHEDULE_TITLE = 510,\r
      STR_SCHEDULE_NO_DATA = 511,\r
      STR_SCHEDULE_NO_DATA_PROMPT = 512,\r
 -    STR_MAX_ID = 513,\r
 +    STR_NO_PAIRED_DEV = 513,\r
 +    STR_MAX_ID = 514,\r
  }; // UIResourceTextId\r
--
--enum FontLanguageId : uint8_t {
 -    LANGUAGE_ID_ZH,\r
++\r
++enum FontLanguageId : uint8_t {\r
      LANGUAGE_ID_EN,\r
 +    LANGUAGE_ID_ZH,\r
      LANGUAGE_ID_MAX\r
  }; // UITextLanguageTextId\r
  }\r

diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c
index 6ff5de7,bb6e6b3..6dc2e61
--- 1/code/sdk/drivers/peripheral/utils/custom_utils.c
--- 2/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)