From: cheng <chengyf@zhihuishixun.com>
Date: Tue, 27 Aug 2024 09:57:25 +0000 (+0800)
Subject: Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~578^2^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F803%2Fhead;p=mirrors%2FFD230.git

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

a8b7c339661f1d8e6b463974eacfa1272cb2066d
diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index d67039d45,e82567225..e6d8587e5
--- 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,
@@@ -556,14 -556,12 +556,14 @@@
      STR_NUMBER_OF_STANDS = 543,
      STR_CONSUME_CALORIES = 544,
      STR_GOAL_HINT = 545,
 -    STR_MAX_ID = 546,
 +    STR_SLEEPMODE = 546,
 +    STR_SLEEP_MODE_PROMPT_ON = 547,
 +    STR_MAX_ID = 548,
  }; // UIResourceTextId
--
--enum FontLanguageId : uint8_t {
 -    LANGUAGE_ID_EN,
++
++enum FontLanguageId : uint8_t {
      LANGUAGE_ID_ZH,
 +    LANGUAGE_ID_EN,
      LANGUAGE_ID_MAX
  }; // UITextLanguageTextId
  }
diff --cc code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index d67039d45,e82567225..e6d8587e5
--- a/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 {
++/*
++* 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,
@@@ -556,14 -556,12 +556,14 @@@
      STR_NUMBER_OF_STANDS = 543,
      STR_CONSUME_CALORIES = 544,
      STR_GOAL_HINT = 545,
 -    STR_MAX_ID = 546,
 +    STR_SLEEPMODE = 546,
 +    STR_SLEEP_MODE_PROMPT_ON = 547,
 +    STR_MAX_ID = 548,
  }; // UIResourceTextId
--
--enum FontLanguageId : uint8_t {
 -    LANGUAGE_ID_EN,
++
++enum FontLanguageId : uint8_t {
      LANGUAGE_ID_ZH,
 +    LANGUAGE_ID_EN,
      LANGUAGE_ID_MAX
  }; // UITextLanguageTextId
  }
diff --cc tools/language_tool/font/ui_resource_string.h
index d67039d45,e82567225..e6d8587e5
--- a/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 {
++/*
++* 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,
@@@ -556,14 -556,12 +556,14 @@@
      STR_NUMBER_OF_STANDS = 543,
      STR_CONSUME_CALORIES = 544,
      STR_GOAL_HINT = 545,
 -    STR_MAX_ID = 546,
 +    STR_SLEEPMODE = 546,
 +    STR_SLEEP_MODE_PROMPT_ON = 547,
 +    STR_MAX_ID = 548,
  }; // UIResourceTextId
--
--enum FontLanguageId : uint8_t {
 -    LANGUAGE_ID_EN,
++
++enum FontLanguageId : uint8_t {
      LANGUAGE_ID_ZH,
 +    LANGUAGE_ID_EN,
      LANGUAGE_ID_MAX
  }; // UITextLanguageTextId
  }