增加4G通话音量调节 及SIM改成大写 #606

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneAudio.h b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneAudio.h
index fd0b6c9..6063ee4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneAudio.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneAudio.h
@@ -58,6 +58,18 @@ int32 PhoneAudioStreamOutDeinit(int32 instanceNum);
 
 int32 PhoneAudioManagerDeactInterrupt(void);
 
+//////////////////cat1////////////////
+int32 PhoneAudioGetCAT1MinVolume(void);
+
+
+int32 PhoneAudioGetCAT1MAXVolume(void);
+
+
+int32 PhoneCAT1AudioGetVolume(void);
+
+
+bool PhoneCATAudioSetVolume(int32 volume);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp
index 8b695c8..7d8de10 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp
@@ -14,6 +14,7 @@
 #include "audio_stream_out.h"
 #include "audio_errors.h"
 #include "wearable_log.h"
+#include "audio_manager_c_wrapper.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -55,6 +56,35 @@ std::shared_ptr<PhoneAudioInterruptListener> g_audioIntListener = nullptr;
 static AudioSession g_sessionId;
 static AudioInterrupt g_interrupt;
 
+int32 PhoneAudioGetCAT1MinVolume(void)
+{
+    int32 ret= g_amInstance.GetMinVolume(AUDIO_STREAM_VOICE_CALL_VOLTE);
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d",ret);
+    return ret;
+}
+
+int32 PhoneAudioGetCAT1MAXVolume(void)
+{
+    int32 ret= g_amInstance.GetMaxVolume(AUDIO_STREAM_VOICE_CALL_VOLTE);
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d",ret);
+    return ret;
+}
+
+int32 PhoneCAT1AudioGetVolume(void)
+{
+    int32 ret= g_amInstance.GetVolume(AUDIO_STREAM_VOICE_CALL_VOLTE);
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d",ret);
+    return ret;
+}
+
+
+bool PhoneCATAudioSetVolume(int32 volume)
+{
+    return g_amInstance.SetVolume(AUDIO_STREAM_VOICE_CALL_VOLTE, volume);
+}
+
+
+
 int32 PhoneAudioGetMinVolume(void)
 {
     return g_amInstance.GetMinVolume(AUDIO_STREAM_VOICE_CALL_BT_SCO);
@@ -75,6 +105,7 @@ bool PhoneAudioSetVolume(int32 volume)
     return g_amInstance.SetVolume(AUDIO_STREAM_VOICE_CALL_BT_SCO, volume);
 }
 
+
 // 设置通话speaker静音/取消静音
 bool PhoneAudioSetSpeakerMute(bool isMute)
 {
@@ -98,13 +129,17 @@ bool PhoneAudioSetSpeakerMute(bool isMute)
 bool PhoneAudioSetMicMute(bool isMute)
 {
     bool ret;
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[PhoneAudioSetMicMute] start");
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[PhoneAudioSetMicMute] start");
     ret = g_amInstance.IsMicrophoneMute();
     if (ret == isMute) {
         return true;
     }
     ret = g_amInstance.SetMicrophoneMute(isMute);
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[PhoneAudioSetMicMute] end! ret = %d", ret);
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[PhoneAudioSetMicMute] end! ret = %d", ret);
+
+    AudioStreamOutSetMute(isMute);
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[AudioStreamOutSetMute] end! ret = %d", ret);
+
     return ret;
 }
 

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 27c118e..f707e05 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
@@ -1855,41 +1855,80 @@ int GetCallInfoInCallList(PhoneCallInfo callList[], int listNum, int *retNum)
 // hfp音量范围 0-15, media 音量范围 0-100
 unsigned char GetCallCurrVolume(void)
 {
-    int32_t volume = PhoneAudioGetVolume();
-    int32_t minVolume = PhoneAudioGetMinVolume();
-    int32_t maxVolume = PhoneAudioGetMaxVolume();
-    unsigned char hfpVolume = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换
+    if(OHOS::CallerLogModel::GetInstance()->GetCallSource() == OHOS::CallerLogModel::CallSourceCat1)
+    {
+         int32_t volume = PhoneCAT1AudioGetVolume();
+        int32_t minVolume = PhoneAudioGetCAT1MinVolume();
+        int32_t maxVolume = PhoneAudioGetCAT1MAXVolume();
+        unsigned char hfpVolume = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换
+
+        if (volume != 0 && hfpVolume == 0) {
+            hfpVolume = 1;
+        }
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[GetCallCurrVolume] volume:%d, minVolume:%d, maxVolume:%d, hfpVolume:%d",
+            volume, minVolume, maxVolume, hfpVolume);
+        return hfpVolume;
+    }
+    else
+    {
+        int32_t volume = PhoneAudioGetVolume();
+        int32_t minVolume = PhoneAudioGetMinVolume();
+        int32_t maxVolume = PhoneAudioGetMaxVolume();
+        unsigned char hfpVolume = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换
+
+        if (volume != 0 && hfpVolume == 0) {
+            hfpVolume = 1;
+        }
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[GetCallCurrVolume] volume:%d, minVolume:%d, maxVolume:%d, hfpVolume:%d",
+            volume, minVolume, maxVolume, hfpVolume);
+        return hfpVolume;
 
-    if (volume != 0 && hfpVolume == 0) {
-        hfpVolume = 1;
     }
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[GetCallCurrVolume] volume:%d, minVolume:%d, maxVolume:%d, hfpVolume:%d",
-        volume, minVolume, maxVolume, hfpVolume);
-    return hfpVolume;
+
 }
 
 void SetSpeakerVolume(unsigned char hfpVolume)
 {
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] start, hfpVolume:%d", hfpVolume);
-    int32_t minVolume = PhoneAudioGetMinVolume();
-    int32_t maxVolume = PhoneAudioGetMaxVolume();
-    int32_t volume = hfpVolume * (maxVolume - minVolume) / CALL_VOLUME_MAX; // 转换
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] minVolume:%d, maxVolume:%d, volume:%d",
-        minVolume, maxVolume, volume);
-
-    int32_t ret = PhoneAudioSetVolume(volume);
-    if (!ret) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] PhoneAudioSetVolume ret:%d", ret);
-        return;
+    if(OHOS::CallerLogModel::GetInstance()->GetCallSource() == OHOS::CallerLogModel::CallSourceCat1)
+    {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] start, CallSourceCat1:%d", hfpVolume);
+        int32_t minVolume = PhoneAudioGetCAT1MinVolume();
+        int32_t maxVolume = PhoneAudioGetCAT1MAXVolume();
+        int32_t volume = hfpVolume * (maxVolume - minVolume)/ CALL_VOLUME_MAX;// 转换
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] minVolume:%d, maxVolume:%d, volume:%d",
+            minVolume, maxVolume, volume);
+
+        int32_t ret = PhoneCATAudioSetVolume(volume);
+        if (!ret) {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] PhoneAudioSetVolume ret:%d", ret);
+            return;
+        }
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] success!");
     }
+    else
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] start, hfpVolume:%d", hfpVolume);
+        int32_t minVolume = PhoneAudioGetMinVolume();
+        int32_t maxVolume = PhoneAudioGetMaxVolume();
+        int32_t volume = hfpVolume * (maxVolume - minVolume) / CALL_VOLUME_MAX; // 转换
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] minVolume:%d, maxVolume:%d, volume:%d",
+            minVolume, maxVolume, volume);
 
-    ret = hfp_hf_set_volume(&g_bdAddr, HFP_VOLUME_SPEAKER, hfpVolume);
-    if (ret != ERRCODE_BT_SUCCESS) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] set_volume ret:%d, hfpVolume:%d",
-            ret, hfpVolume);
-        return;
+        int32_t ret = PhoneAudioSetVolume(volume);
+        if (!ret) {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] PhoneAudioSetVolume ret:%d", ret);
+            return;
+        }
+
+        ret = hfp_hf_set_volume(&g_bdAddr, HFP_VOLUME_SPEAKER, hfpVolume);
+        if (ret != ERRCODE_BT_SUCCESS) {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] set_volume ret:%d, hfpVolume:%d",
+                ret, hfpVolume);
+            return;
+        }
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] success!");
     }
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] success!");
+
 
     return;
 }

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 2c630bb..163785b 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index 122750f..6010619 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -434,7 +434,7 @@ STR_IPHONE$1.苹果手机
 STR_ANDROID$2.安卓手机\r
 STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE$请前往手机“设置”→“蓝牙”列表找到“XX”并点击后重试\r
 STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDROID$请前往手机“设置”→“蓝牙”列表找到 “XX”点击右侧图标进入蓝牙设置\r
-STR_SIM_CARD_ERROR$Sim卡异常\r
+STR_SIM_CARD_ERROR$SIM卡异常\r
 STR_CHECK_SIM_CARD_INSERTION$SIM卡拨号异常，请检查手表SIM卡是否正确插入\r
 STR_WEATHER_REPORT$气象报告\r
 STR_ULTRAVIOLET$紫外线\r

diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx
index 806a88f..6ed7e1d 100644 (file)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 49cbbd1..1c477cc 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -435,7 +435,7 @@
        <lanstr id="STR_ANDROID" value="2.安卓手机"/>
        <lanstr id="STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE" value="请前往手机“设置”→“蓝牙”列表找到“XX”并点击后重试"/>
        <lanstr id="STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDROID" value="请前往手机“设置”→“蓝牙”列表找到 “XX”点击右侧图标进入蓝牙设置"/>
-       <lanstr id="STR_SIM_CARD_ERROR" value="Sim卡异常"/>
+       <lanstr id="STR_SIM_CARD_ERROR" value="SIM卡异常"/>
        <lanstr id="STR_CHECK_SIM_CARD_INSERTION" value="SIM卡拨号异常，请检查手表SIM卡是否正确插入"/>
        <lanstr id="STR_WEATHER_REPORT" value="气象报告"/>
        <lanstr id="STR_ULTRAVIOLET" value="紫外线"/>

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 2c630bb..163785b 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ