4G拨号超时优化

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 b8549dd..b0d462b 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
@@ -648,7 +648,6 @@ static void IncomingHandle(void)
 
     InitCallingTimer();
 
-    DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY);
 
 }
 
@@ -666,7 +665,6 @@ static void WaitingOpreate()
 
 static void WatchActiveHandle()
 {
-    DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY);
     InitCallingTimer();
     CallerLogModel::GetInstance()->SetCallStatus(true);
     CallerLogModel::GetInstance()->SetWaitingStatus(false);
@@ -680,37 +678,38 @@ static void WatchFinishHandle(void)
 {
     if (NotificationManager::GetInstance()->GetWatchCallStatus()) 
     {
-       if(get_falg_SOS())
+        if(get_falg_SOS())
         {
             addcalllog();
             sos_falg_add();
         }
         else
         {
-        if(CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourcePhone)
-        {
-            addcalllog();
-        }
-        else if(uapi_dev_runtime_get_train_status() || transmittingISShow())
-        {
-            addcalllog();
-            StatusReset();
-        }
-        else
-        {
-           
-            addcalllog();
-            StatusReset();
-}   
+            if(CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourcePhone)
+            {
+                addcalllog();
+            }
+            else if(uapi_dev_runtime_get_train_status() || transmittingISShow())
+            {
+                addcalllog();
+                StatusReset();
+            }
+            else
+            {
+            
+                addcalllog();
+                StatusReset();
+            }   
         }   
                
     }
-    DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY);
 }
 
 void  using_cat1_phone_state_change_cb(uint8_t state)
 {
-     g_callOperate = state;
+    g_callOperate = state;
+    DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY);
+
 
     switch (g_callOperate) {
         case OPERATE_DIALING:
@@ -799,8 +798,8 @@ void CalldialTimerCallBackProc(int data)
     dail_falg++;
     if(dail_falg>=DIAL_TIME)
     {
-        cat1_call_hungup_timer();
-        cat1_handle_call_disconnected((char *)CallerLogModel::GetInstance()->GetPhoneNumber().c_str());
+        // cat1_call_hungup_timer();
+        cat1_handle_call_disconnected("callfail");
     }
    
 }
@@ -1325,7 +1324,6 @@ void FreeCalldialView(void)
 {
     if (calldialView != nullptr) {
         DisableCallTimer(CallTimerType::NOTIFY_PHONE_CALLING_DISPLAY);
-        DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY);
 
         RootView::GetInstance()->Remove(calldialView);
 

diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
index 763f10e..547dad9 100644 (file)
--- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
@@ -830,7 +830,7 @@ void cat1_call_dial(char* phonenum)
         #if PY_SRV_VER_CURRENT >=16
             if(osTimerIsRunning(g_timer_time_Dial)==0  )
             {
-                osStatus_t ret = osTimerStart(g_timer_time_Dial,3000); 
+                osStatus_t ret = osTimerStart(g_timer_time_Dial,5000); 
                 WEARABLE_LOGI(WEARABLE_LOG_MODULE_MAIN_SERVICE,"cat1 g_timer_time_Dial timer ret %d\n",ret);
             }
         #endif