修改第一次启动时进入界面逻辑。不再根据手机是否连接做判断条件
authorluozheng <1732036298@qq.com>
Sun, 29 Sep 2024 08:08:02 +0000 (16:08 +0800)
committerluozheng <1732036298@qq.com>
Sun, 29 Sep 2024 08:08:02 +0000 (16:08 +0800)
code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp

index 027102b..9583585 100644 (file)
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-18 14:55:27
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-29 17:20:33
+ * @LastEditTime: 2024-09-29 15:35:47
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
  */
 
@@ -48,15 +48,12 @@ namespace OHOS
     /*处理恢复出厂设置后第一次跳转主界面*/
     void RebootAndShutdownModel::HandFirstTimeStartJumpToMainView(void)
     {
-        if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true)
+        if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true)
         {
-            if (ConfigModel::GetInstance()->GetLanguage() != -1)
-            {
-                uapi_set_screen_on_api();
-                NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
-                ConfigModel::GetInstance()->SetisFirstTimeStart(false);
-                NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
-            }
+            uapi_set_screen_on_api();
+            ConfigModel::GetInstance()->SetisFirstTimeStart(false);
+            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
+            NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
         }
     }