From: luozheng <1732036298@qq.com>
Date: Mon, 22 Jul 2024 11:15:22 +0000 (+0800)
Subject: 解决手表解绑后恢复出厂设置，如果手机是直接与手表配对成功未选择语言，进入主界面后发现手表缺少字体问题。
X-Git-Tag: release_V1.2.70_20241020_135402~770
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F570%2F3;p=mirrors%2FFD230.git

解决手表解绑后恢复出厂设置，如果手机是直接与手表配对成功未选择语言，进入主界面后发现手表缺少字体问题。
1.如果手机与手表先绑定成功，未选择语言，需选择语言才进入主界面。
2.如果已选择语言，这时手机与手表绑定成功将自动进入主界面。
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
index fa31424c7..c7baeb376 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-28 14:17:43
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-20 18:11:50
+ * @LastEditTime: 2024-07-22 19:03:52
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -14,6 +14,7 @@
 #include <custom_utils.h>
 #include "languagecode/LanguageInit.h"
 #include "ConfigModel.h"
+#include "settings/include/SettingModel.h"
 namespace OHOS
 {
     extern Language languages[];
@@ -94,10 +95,19 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingPresenter::OnClick");
 
         /* -------------------------------------------------------------------------- */
-        if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true)
+        if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == false)
         {
             NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE);
         }
+        else if(ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true)
+        {
+            if (ConfigModel::GetInstance()->GetLanguage() == -1)
+            {
+                uapi_set_screen_on_api();
+                NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
+                ConfigModel::GetInstance()->SetisFirstTimeStart(false);
+            }
+        }
         /* -------------------------------------------------------------------------- */
 
         UNUSED(event);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
index af0dbbae5..227c699be 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-18 14:55:27
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-22 10:45:31
+ * @LastEditTime: 2024-07-22 18:52:05
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
  */
 
@@ -32,9 +32,12 @@ namespace OHOS
     {
         if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true)
         {
-            uapi_set_screen_on_api();
-            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
-            ConfigModel::GetInstance()->SetisFirstTimeStart(false);
+            if (ConfigModel::GetInstance()->GetLanguage() != -1)
+            {
+                uapi_set_screen_on_api();
+                NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
+                ConfigModel::GetInstance()->SetisFirstTimeStart(false);
+            }
         }
     }
 
@@ -136,7 +139,7 @@ namespace OHOS
         display_api->turn_on_screen();
         // if (display_api->get_screen_state() == SCREEN_OFF) /*处于灭屏状态才亮屏*/
         // {
-            
+
         // }
         // else
         // {