From: luozheng <1732036298@qq.com>
Date: Mon, 29 Apr 2024 09:34:45 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1123^2~4
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F114%2F1;p=mirrors%2FFD230.git

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

5c69f6d285c1f3f61ec61d6ec9c0faa907e2917d
diff --cc code/sdk/application/wearable/fd230app/nativeui/phone/include/TelephonyInitInterface.h
index 394ade7a1,76fadc395..ab1b4beef
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/include/TelephonyInitInterface.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/include/TelephonyInitInterface.h
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-04-28 09:58:04
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-04-29 16:21:03
 - * @LastEditTime: 2024-04-29 09:24:21
++ * @LastEditTime: 2024-04-29 17:29:25
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/phone/include/TelephonyInitInterface.h
   */
  #ifndef TELEPHONY_INIT_INTERFACE_H
diff --cc code/sdk/application/wearable/fd230app/nativeui/phone/src/DialingMethodPresenter.cpp
index 0b676f405,6d44a9a6d..c9890fc36
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/DialingMethodPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/DialingMethodPresenter.cpp
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-03-28 14:17:43
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-04-29 16:18:09
 - * @LastEditTime: 2024-04-29 10:01:43
++ * @LastEditTime: 2024-04-29 17:30:05
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/DialingMethodPresenter.cpp
   */
  #include "AppViewIDs.h"
diff --cc code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhonePresenter.cpp
index 82d5792a6,4cb20db41..effd517f4
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhonePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhonePresenter.cpp
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-03-28 14:17:43
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-04-29 15:45:54
 - * @LastEditTime: 2024-04-29 10:02:49
++ * @LastEditTime: 2024-04-29 17:30:31
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/MainPhonePresenter.cpp
   */
  #include "AppViewIDs.h"