修改新来电提示次数限制 #1144

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
index 265b658..b2008b5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
@@ -423,24 +423,13 @@ static void WaitingOpreate()
 
     if(NotificationManager::GetInstance()->GetWatchCallStatus())
     {
-        if(!CallerLogModel::GetInstance()->get_RejectIncomingCall_falg())
-        {
-
-             if(RejectIncomingCall() != 0) {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCallingPresenter::[HintsHandupClick] RejectIncomingCall error");
-            return ;
-            }
-            CallerLogModel::GetInstance()->set_RejectIncomingCall_falg(1);
-            CustomEventPublish(TOPIC_EVENT_HFP_HINT,NULL,0);
-        }
-        else
-        {
-            if(RejectIncomingCall() != 0) {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCallingPresenter::[HintsHandupClick] RejectIncomingCall error");
-            return ;
-            }
-            return;
+       
+        if(RejectIncomingCall() != 0) {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCallingPresenter::[HintsHandupClick] RejectIncomingCall error");
+        return ;
         }
+        CustomEventPublish(TOPIC_EVENT_HFP_HINT,NULL,0);
+       
     }
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[WaitingOpreate] WaitingOpreate");
 }

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 f6edaf9..2b0e8f6 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
@@ -539,19 +539,13 @@ static void IncomingHandle(void)
 
 static void WaitingOpreate()
 {
-    
-    if(!CallerLogModel::GetInstance()->get_RejectIncomingCall_falg())
     {
         cat1_call_hungup();
         CustomEventPublish(TOPIC_EVENT_HFP_HINT,NULL,0);
         CallerLogModel::GetInstance()->set_RejectIncomingCall_falg(1);
         return;
     }
-    else
-    {
-        cat1_call_hungup();
-        return;
-    }
+   
 }
 
 static void WatchActiveHandle()
@@ -651,7 +645,6 @@ void  using_cat1_phone_state_change_cb(uint8_t state)
         //手表不做任何处理仅记录
         case OPERATE_WATCH_REJECT:
             CustomEventPublish(TOPIC_EVENT_HFP_HINT,NULL,0);
-            
             addcalllogend();
             return;
         default:
@@ -666,41 +659,7 @@ void cat1_phone_state_change_cb(uint8_t state)
             std::bind(using_cat1_phone_state_change_cb,state));
 }
 
-
-//     PhoneCallInfo tmp;
-
-//     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CallChangeFinishPro] start g_scoFlag = %d, g_currCallNum = %d",
-//         g_scoFlag, g_currCallNum);
-//     if (call == NULL || g_currCallNum == 0) {
-//         return;
-//     }
-
-   //phoneCall = FindCallInfoInCallList((const unsigned char*)call->number, call->number_len);
-//     if (phoneCall == NULL) {
-//         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CallChangeFinishPro] FindCallInfoInCallList Finish no this call");
-//         return;
-//     }
-//     if (g_finishOperate == OPERATE_WATCH_FINISH) {
-//         phoneCall->operate = OPERATE_WATCH_FINISH;
-//     } else if (g_finishOperate == OPERATE_WATCH_REJECT) {
-//         phoneCall->operate = OPERATE_WATCH_REJECT;
-//     } else {
-//         phoneCall->operate = OPERATE_NON_WATCH_FINISH;
-//     }
-//     g_finishOperate = OPERATE_NON_WATCH_FINISH;
-//     g_currCallNum--;
-
-//     (void)memcpy_s(&tmp, sizeof(PhoneCallInfo), phoneCall, sizeof(PhoneCallInfo));
-//     (void)memcpy_s(&tmp.unitCalls, sizeof(hfp_hf_calls_info_t), call, sizeof(hfp_hf_calls_info_t));
-//     (void)memset_s(phoneCall, sizeof(PhoneCallInfo), 0, sizeof(PhoneCallInfo));
-//     (void)memset_s(phoneCall->name, NAME_SIZE, '\0', NAME_SIZE);
-//     (void)memset_s(phoneCall->tel, MAX_PHONE_NUM, '\0', MAX_PHONE_NUM);
-//     phoneCall->lastStatus = HFP_HF_CALL_STATE_FINISHED;
-
-//     // 添加通话记录
-   //
-     
-        
+            
 
 void CallTimerCallBack(int data)
 {