From: Caisking <3449750381@qq.com>
Date: Wed, 24 Jul 2024 01:43:53 +0000 (+0800)
Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 
X-Git-Tag: release_V1.2.70_20241020_135402~702^2~13
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=e432a1fb3c4cc2da313a6fd471247c3989cd4604;p=mirrors%2FFD230.git

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

e432a1fb3c4cc2da313a6fd471247c3989cd4604
diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index e5477f0e3,9c35cbc88..29694171e
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@@ -126,10 -126,10 +126,10 @@@
  // #include "dialupdate/include/DialUpdateView.h"
  
  #include "ConfigModel.h"
- #include "rebootdevice/include/RebootModel.h"
+ #include "rebootandshutdown/include/RebootAndShutdownModel.h"
  
 -//#include "phone/include/PhoneView.h"
 -//#include "phone/include/PhonePresenter.h"
 +// #include "phone/include/PhoneView.h"
 +// #include "phone/include/PhonePresenter.h"
  #include "phone/include/PhoneCallView.h"
  #include "phone/include/PhoneCallPresenter.h"
  #include "phone/include/PhoneDirView.h"