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 23f4c14..a3de0f9 100644 (file)
--- 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 4227c38..c0abf99 100644 (file)
--- 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 738a4a7..17bb1b9 100755 (executable)
--- 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