Merge #1227 into sdk602patch0911 from refs/changes/1227/head

Code review from 胡传军

* refs/changes/1227/head: (7 commits squashed)

  - 先关闭4G电话对麦克风管理，可能导致音频系统锁死

  - 修复电话界面动画问题

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

  - 增加最大数量表盘限制，待测试 ，修改BLE打印日志

  - 修改获取全部表盘id接口防止越界

  - 电话修改

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

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1227

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 565490f..04b870c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
@@ -761,7 +761,7 @@ static void ScoConnectHandle(void)
         case HFP_HF_CALL_STATE_ACTIVE:
             if (g_callOperate == OPERATE_PHONE_ACTIVE) {
                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[ScoConnectHandle] OPERATE_PHONE_ACTIVE");
-                // TransCallToMobilePhone();
+                TransCallToMobilePhone();
                 return;
             }
             CallerLogModel::GetInstance()->SetCallStatus(true);
@@ -772,8 +772,17 @@ static void ScoConnectHandle(void)
             CallerLogModel::GetInstance()->SetMakePhoneStatus(true);
             break;
         case HFP_HF_CALL_STATE_DIALING:
+
+            if(OHOS::CallerLogModel::GetInstance()->GetCallDial() == OHOS::CallerLogModel::HFP_PHONE_DIAL)
+            {
+                TransCallToMobilePhone();
+                return;
+            }
+            
             CallerLogModel::GetInstance()->SetDialingStatus("正在拨号");
             CallerLogModel::GetInstance()->SetMakePhoneStatus(true);
+
+          
             break;
         case HFP_HF_CALL_STATE_INCOMING:
             CallerLogModel::GetInstance()->SetMakePhoneStatus(false);

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 2ea9ca6..cd1ab01 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
@@ -103,7 +103,7 @@ void start_SOS_phone_dail(void)
     #if SOS_TEST_FLAG
     if(1)
     #else
-    if(uapi_cat1_get_power_stat()|| uapi_dev_runtime_get_cat1_simstat())
+    if(uapi_cat1_get_power_stat() && uapi_dev_runtime_get_cat1_simstat())
     #endif
     {
         calldial_event_sendmsg_toUI(OHOS::get_sos_number(0));
@@ -513,7 +513,7 @@ static void IncomingHandle(void)
     CallerLogModel::GetInstance()->SetMakePhoneStatus(false);
 
     InitCallingTimer();
-    
+
     DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY);
 
 }