From: root <root@hcj>
Date: Sun, 3 Mar 2024 05:56:25 +0000 (+0800)
Subject: cat1电话
X-Git-Tag: release_V1.2.70_20241020_135402~1274^2~38^2~2
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=7cab33f06ceb7d27087093813e02415b7efc5ce9;p=mirrors%2FFD230.git

cat1电话
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneService.h b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneService.h
index 23f4c1447..a3de0f919 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneService.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneService.h
@@ -117,7 +117,6 @@ int AcceptIncomingCall(void);
 
 void CallChangeIncomePro(const hfp_hf_calls_info_t *call);
 
-int AcceptIncomingCall_cat1(void);
 /**
  * @brief 手表拒接呼入来电
  *
diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
index 4227c38c8..c0abf996e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
@@ -1709,13 +1709,7 @@ int AcceptIncomingCall(void)
     return OHOS_SUCCESS;
 }
 
-int AcceptIncomingCall_cat1(void)
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[AcceptIncomingCall] start");
-    int ret, i;
-    incomedcall_event_sendmsg_toUI("10086");
-    return OHOS_SUCCESS;
-}
+
 // 手表拒接呼入来电，成功：0，失败：错误码
 int RejectIncomingCall(void)
 {
diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
index 738a4a7df..17bb1b98e 100755
--- a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
@@ -27,6 +27,7 @@
 #define NOTIFY_ONE_MINUTE 60000
 #define NOTOFY_NO_OPERATE_TIME 35000
 
+#include "cat1_server_hal.h"
 #include "NativeAbility.h"
 namespace OHOS {
 int changeImage = 0;
@@ -524,7 +525,10 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event)
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MakephoneNotify 11111111 ");
             //#ifdef SUPPORT_CAT1_SERVICE
                 
-                AcceptIncomingCall_cat1();
+                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[AcceptIncomingCall] start");
+    
+                incomedcall_event_sendmsg_toUI("10086");
+    
                 cat1_call_answer();
 
             //#endif