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

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index d67039d,e825672..e6d8587
--- 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
@@@ -556,14 -556,12 +556,14 @@@
      STR_NUMBER_OF_STANDS = 543,\r
      STR_CONSUME_CALORIES = 544,\r
      STR_GOAL_HINT = 545,\r
 -    STR_MAX_ID = 546,\r
 +    STR_SLEEPMODE = 546,\r
 +    STR_SLEEP_MODE_PROMPT_ON = 547,\r
 +    STR_MAX_ID = 548,\r
  }; // UIResourceTextId\r
--
--enum FontLanguageId : uint8_t {
 -    LANGUAGE_ID_EN,\r
++\r
++enum FontLanguageId : uint8_t {\r
      LANGUAGE_ID_ZH,\r
 +    LANGUAGE_ID_EN,\r
      LANGUAGE_ID_MAX\r
  }; // UITextLanguageTextId\r
  }\r

diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index d67039d,e825672..e6d8587
--- 1/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
--- 2/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/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
@@@ -556,14 -556,12 +556,14 @@@
      STR_NUMBER_OF_STANDS = 543,\r
      STR_CONSUME_CALORIES = 544,\r
      STR_GOAL_HINT = 545,\r
 -    STR_MAX_ID = 546,\r
 +    STR_SLEEPMODE = 546,\r
 +    STR_SLEEP_MODE_PROMPT_ON = 547,\r
 +    STR_MAX_ID = 548,\r
  }; // UIResourceTextId\r
--
--enum FontLanguageId : uint8_t {
 -    LANGUAGE_ID_EN,\r
++\r
++enum FontLanguageId : uint8_t {\r
      LANGUAGE_ID_ZH,\r
 +    LANGUAGE_ID_EN,\r
      LANGUAGE_ID_MAX\r
  }; // UITextLanguageTextId\r
  }\r

diff --cc tools/language_tool/font/ui_resource_string.h
index d67039d,e825672..e6d8587
--- 1/tools/language_tool/font/ui_resource_string.h
--- 2/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/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
@@@ -556,14 -556,12 +556,14 @@@
      STR_NUMBER_OF_STANDS = 543,\r
      STR_CONSUME_CALORIES = 544,\r
      STR_GOAL_HINT = 545,\r
 -    STR_MAX_ID = 546,\r
 +    STR_SLEEPMODE = 546,\r
 +    STR_SLEEP_MODE_PROMPT_ON = 547,\r
 +    STR_MAX_ID = 548,\r
  }; // UIResourceTextId\r
--
--enum FontLanguageId : uint8_t {
 -    LANGUAGE_ID_EN,\r
++\r
++enum FontLanguageId : uint8_t {\r
      LANGUAGE_ID_ZH,\r
 +    LANGUAGE_ID_EN,\r
      LANGUAGE_ID_MAX\r
  }; // UITextLanguageTextId\r
  }\r