From: SnickerSun <snickersun@163.com>
Date: Tue, 16 Jul 2024 09:20:20 +0000 (+0800)
Subject: 修改SystemAbout窗口，添加OpenHarmony 3.2 Release 版本号
X-Git-Tag: release_V1.2.70_20241020_135402~792^2~7^2~5
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F532%2Fhead;p=mirrors%2FFD230.git

修改SystemAbout窗口，添加OpenHarmony 3.2 Release 版本号
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
index b34be5f63..fe53c7606 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -499,7 +499,7 @@ namespace OHOS
             .height = TITLE_LABEL_H,
             .fontSize = TITLE_LABEL_FONTSIZE,
             .lineHeigh = TITLE_LABEL_LINEHEIGHT,
-            .text = "FONTS",
+            .text = "OS Version",
             .lineBreakMode = UILabel::LINE_BREAK_MARQUEE,
         };
         FONTTitle = InitLabel(Config);
@@ -517,7 +517,7 @@ namespace OHOS
             .height = LABEL_H,
             .fontSize = LABEL_FONTSIZE,
             .lineHeigh = LABEL_LINEHEIGHT,
-            .text = "HarmonyOS Sans",
+            .text = "OpenHarmony 3.2 Release",
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,
         };
         FONT = InitLabel(Config);
diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModel.h b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
index 924e976e0..48c2c02b8 100644
--- a/code/sdk/drivers/peripheral/config/include/ConfigModel.h
+++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
@@ -282,9 +282,9 @@ namespace OHOS
             {ConfigDataType::DATATYPE_INT,     "screen_brightness",         "204"    },//CONFIGMODEL_ITEM_SCREEN_BRIGHTNESS_VALUE,   //屏幕亮度
             {ConfigDataType::DATATYPE_INT,     "screenoff_timeout_value",    "5000"  },//CONFIGMODEL_ITEM_SCREEN_OFF_TIMEOUT_VALUE,   //屏幕自动息屏时间 默认 5秒 5000ms
             {ConfigDataType::DATATYPE_BOOL,    "cat1_service_on",          "false" },//CONFIGMODEL_ITEM_CAT1_SERVICE_ON, // 关机前Cat1 Service启动着,则重启仍然启动,反之亦然
-            {ConfigDataType::DATATYPE_STRING,  "cat1_imei",                ""      },//CONFIGMODEL_ITEM_CAT1_IMEI,
-            {ConfigDataType::DATATYPE_STRING,  "cat1_modemver",            ""      },//CONFIGMODEL_ITEM_CAT1_MODEMVER,
-            {ConfigDataType::DATATYPE_STRING,  "cat1_pyver",               ""      },//CONFIGMODEL_ITEM_CAT1_PYVER,
+            {ConfigDataType::DATATYPE_STRING,  "cat1_imei",                "pls poweron 4G first"      },//CONFIGMODEL_ITEM_CAT1_IMEI,
+            {ConfigDataType::DATATYPE_STRING,  "cat1_modemver",            "pls poweron 4G first"      },//CONFIGMODEL_ITEM_CAT1_MODEMVER,
+            {ConfigDataType::DATATYPE_STRING,  "cat1_pyver",               "pls poweron 4G first"      },//CONFIGMODEL_ITEM_CAT1_PYVER,
             {ConfigDataType::DATATYPE_INT,     "language_id",               "-1"    },//CONFIGMODEL_ITEM_LANGUAGE_ID, //默认没有选择语言
             {ConfigDataType::DATATYPE_STRING,  "language_code",             ""      },//CONFIGMODEL_ITEM_LANGUAGE_CODE, //默认没有选择语言
             {ConfigDataType::DATATYPE_INT,     "timezone",                 "32"      },//CONFIGMODEL_ITEM_TIMEZONE, //单位刻钟  默认+8 小时 = 4*8 = 32 刻钟