增加SUPPORT_CAT1_HFP_AG_SERV 宏控制 1508/5
authorhcj <1224667075@qq.com>
Fri, 13 Dec 2024 10:00:23 +0000 (18:00 +0800)
committerhcj <1224667075@qq.com>
Fri, 13 Dec 2024 10:00:23 +0000 (18:00 +0800)
79 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
code/sdk/application/wearable/fd230app/nativeui/makephone/src/CallingView.cpp
code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhoneView.cpp
code/sdk/application/wearable/fd230app/nativeui/phoneservice/include/PhoneAGService.h
code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAGService.cpp
code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/es.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ko.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
tools/language_tool/Language_xml/input_list_en.txt
tools/language_tool/Language_xml/input_list_zh.txt
tools/language_tool/Language_xml/language_custom.xlsx
tools/language_tool/Language_xml/language_en.xml
tools/language_tool/Language_xml/language_zh.xml
tools/language_tool/font/ar.lang
tools/language_tool/font/az.lang
tools/language_tool/font/cs.lang
tools/language_tool/font/de.lang
tools/language_tool/font/el.lang
tools/language_tool/font/en.lang
tools/language_tool/font/es.lang
tools/language_tool/font/fa.lang
tools/language_tool/font/fi.lang
tools/language_tool/font/fr.lang
tools/language_tool/font/he.lang
tools/language_tool/font/hi.lang
tools/language_tool/font/hr.lang
tools/language_tool/font/id.lang
tools/language_tool/font/it.lang
tools/language_tool/font/ja.lang
tools/language_tool/font/ko.lang
tools/language_tool/font/ms.lang
tools/language_tool/font/nl.lang
tools/language_tool/font/pl.lang
tools/language_tool/font/pt.lang
tools/language_tool/font/ro.lang
tools/language_tool/font/ru.lang
tools/language_tool/font/sv.lang
tools/language_tool/font/th.lang
tools/language_tool/font/tr.lang
tools/language_tool/font/ui_resource_string.h
tools/language_tool/font/uk.lang
tools/language_tool/font/uz.lang
tools/language_tool/font/vi.lang
tools/language_tool/font/zh.lang

index 8c60a07..05a9b80 100644 (file)
@@ -650,7 +650,8 @@ enum UIResourceTextId : uint16_t {
     STR_DELETE_ALL = 637,\r
     STR_FRE_CONTACT = 638,\r
     STR_RECORD_MAX = 639,\r
-    STR_MAX_ID = 640,\r
+    STR_CLEAR_ALL_RECORDS = 640,\r
+    STR_MAX_ID = 641,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 999f9bd..b4c4114 100644 (file)
@@ -1074,11 +1074,13 @@ void BluetoothModel::BtGapAclStateChangedHandle(gap_acl_state_t state, unsigned
                 ACLConnectionFail(bdAddr);\r
             }\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "a2dp_src_connect result 0x%x", retA2dp);\r
-errcode_t rethfp= hfp_ag_cmd_conn_hfp(&bdAddr);\r
-            if(rethfp)\r
-            {\r
-                 ACLConnectionFail(bdAddr);\r
-            }\r
+            #ifdef SUPPORT_CAT1_HFP_AG_SERV\r
+                errcode_t rethfp= hfp_ag_cmd_conn_hfp(&bdAddr);\r
+                if(rethfp)\r
+                {\r
+                    ACLConnectionFail(bdAddr);\r
+                }\r
+            #endif\r
 \r
 \r
         } else {\r
index da02f92..09f0900 100644 (file)
@@ -144,20 +144,19 @@ void StatusReset(void)
 
     if(CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourceCat1)
     {
+        #ifdef SUPPORT_CAT1_HFP_AG_SERV
         if(volte_voice_state()==2 && headset_Is_connect())
         {
             do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT_HFP_DIS_SCO_CONNECT, nullptr, 0);
         }
         else
+        #endif
+        
         {
             do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_STOP, nullptr, 0);
         }
-        
-
-         
     }
    
-
     CallerLogModel::GetInstance()->Setphonebname("",0);
     CallerLogModel::GetInstance()->SetCallDial(CallerLogModel::HFP_PHONE_DIAL);
     CallerLogModel::GetInstance()->set_RejectIncomingCall_falg(0);
index 22c0402..471bfc2 100644 (file)
@@ -202,17 +202,20 @@ bool CallingView::InitImageViewDisplay()
     }
     imageheadset->SetPosition(296, 296); // 30 :  offset
 
-    if(headset_SCO_Is_connect())
-    {
-        imageheadset->SetSrc(PNG_230_HEADSET_2_IIMAGE_PATH);
-        imageheadset->SetViewId("callingheadset");
-    }
-    else if (CallerLogModel::GetInstance()->GetCallSource() == CallerLogModel::CallSourceCat1)
-    {
-        imageheadset->SetSrc(PNG_230_HEADSET_3_IIMAGE_PATH);
-        imageheadset->SetViewId("callingheadset");
-    }
-    else
+    #ifdef SUPPORT_CAT1_HFP_AG_SERV
+        if(headset_SCO_Is_connect())
+        {
+            imageheadset->SetSrc(PNG_230_HEADSET_2_IIMAGE_PATH);
+            imageheadset->SetViewId("callingheadset");
+        }
+        else if (CallerLogModel::GetInstance()->GetCallSource() == CallerLogModel::CallSourceCat1)
+        {
+            imageheadset->SetSrc(PNG_230_HEADSET_3_IIMAGE_PATH);
+            imageheadset->SetViewId("callingheadset");
+        }
+        else
+    #endif
+
     {
         imageheadset->SetSrc(PNG_230_HEADSET_1_IIMAGE_PATH);
         imageheadset->SetViewId("headset");
index 6bd9609..c0b4bcc 100644 (file)
@@ -673,6 +673,7 @@ namespace OHOS
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainPhoneView::DialingMethodButton new fail!");
                     return;
                 }
+                button_delete_all_calllog->SetTextId(STR_CLEAR_ALL_RECORDS);
                 button_delete_all_calllog->SetAlign(TEXT_ALIGNMENT_CENTER);
                 button_delete_all_calllog->SetLabelPosition(0,0);
         //         button_delete_all_calllog
@@ -685,16 +686,16 @@ namespace OHOS
                 labelParam.height = 100;
                 labelParam.fontSize = 22;
                 labelParam.lineHeigh = 25;
-                labelParam.text = "注:只保留最近20条通话记录\n在通话记录上长按可删除";
-                labelParam.lineBreakMode = UILabel::LINE_BREAK_MARQUEE,
-         
+                labelParam.text = "注:只保留最近20条通话记录在通话记录上长按可删除";
+                labelParam.lineBreakMode = UILabel::LINE_BREAK_WRAP,
+                //  button_delete_all_calllog->SetTextId(STR_NOTE_RECENT_CALLS_LIMITATION)
                 hintCallsLabel = TelephonyInitInterface::LabelViewInit(labelParam,Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));
                 if (hintCallsLabel == nullptr)
                 {
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainPhoneView::MainPhoneViewTitleLabel new fail!");
                 }
                 hintCallsLabel->SetVisible(true);
-                //hintCallsLabel->SetTextId(STR_NOTE_RECENT_CALLS_LIMITATION);
+                hintCallsLabel->SetTextId(STR_NOTE_RECENT_CALLS_LIMITATION);
                 hintCallsLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);       // 设置此文本的对齐模式
                 MainPhoneViewScrollView->Add(hintCallsLabel);
             }
index 8ced3ea..12f0b3c 100644 (file)
@@ -15,6 +15,8 @@
 #define SAMPLE_HFP_PROF_VOL_LEVEL 15
 #define SAMPLE_HFP_MEDIA_VOL_LEVEL 100
 
+#ifdef SUPPORT_CAT1_HFP_AG_SERV
+
 void hfp_ag_reg_callback(void);
 
 errcode_t hfp_ag_cmd_conn_hfp(const bd_addr_t *bd_addr);
@@ -34,6 +36,8 @@ void cat1_set_headset_volume( unsigned char volume);
 
 int cat1_ag_send_call_event( uint32_t event_topic,const char* info);
 
+#endif
+
 // void bt_hfp_ag_service_sample_cmd(uint32_t cmd_id, const char **params, int32_t params_cnt);
 
 #endif /* SAMPLE_HFP_AG_SERVICE_H */
index a5b6008..442f1a8 100644 (file)
@@ -34,6 +34,7 @@
 #include "custom_utils.h"
 
 
+
 #define SAMPLE_HFP_TASK_STACK_SIZE 0x1600
 #define SAMPLE_HFP_TASK_PRI 20
 #define HFP_MEDIA_STATUS_DEINIT 0
@@ -874,7 +875,9 @@ bool headset_SCO_Is_connect(void)
 void cat1_connect_sco_(void)
 {
     //AudioActInterrupt(AUDIO_STREAM_VOICE_CALL_VOLTE);
-    hfp_ag_cmd_conn_sco(BtAvrcpSrvGetActiveAddr());
+    #ifdef SUPPORT_CAT1_HFP_AG_SERV
+        hfp_ag_cmd_conn_sco(BtAvrcpSrvGetActiveAddr());
+    #endif
 
 }
 
@@ -882,7 +885,9 @@ void cat1_connect_sco_(void)
 void cat1_disconn_sco_(void)
 {
     //AudioActInterrupt(AUDIO_STREAM_VOICE_CALL_VOLTE);
-    hfp_ag_cmd_disconn_sco(BtAvrcpSrvGetActiveAddr());
+    #ifdef SUPPORT_CAT1_HFP_AG_SERV
+        hfp_ag_cmd_disconn_sco(BtAvrcpSrvGetActiveAddr());
+    #endif
 
 }
 
index 779fa3c..aabe9e8 100644 (file)
@@ -1825,7 +1825,9 @@ void PhoneServiceInit(void)
     CallListInit();
     RegisterHfpHfCallbacks();
 //AG 服务注册
+#ifdef SUPPORT_CAT1_HFP_AG_SERV
     hfp_ag_reg_callback();
+#endif
     
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[PhoneServiceInit] end");
 }
@@ -2068,14 +2070,17 @@ void SetSpeakerVolume(unsigned char hfpVolume)
             return;
         }
 
-        int32_t minVolume = PhoneAudioGetMinVolume();
-        int32_t maxVolume = PhoneAudioGetMaxVolume();
+        #ifdef SUPPORT_CAT1_HFP_AG_SERV
+            int32_t minVolume = PhoneAudioGetMinVolume();
+            int32_t maxVolume = PhoneAudioGetMaxVolume();
 
-        unsigned char volumeValue = (unsigned char) round(((double) (hfpVolume * CALL_VOLUME_MAX) / (maxVolume - minVolume))); // 音量转换
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] minVolume:%d, maxVolume:%d, 蓝牙音量调节映射后volume:%d",minVolume,maxVolume, volumeValue);
+            unsigned char volumeValue = (unsigned char) round(((double) (hfpVolume * CALL_VOLUME_MAX) / (maxVolume - minVolume))); // 音量转换
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] minVolume:%d, maxVolume:%d, 蓝牙音量调节映射后volume:%d",minVolume,maxVolume, volumeValue);
+            
 
 
-        cat1_set_headset_volume(volumeValue)
+            cat1_set_headset_volume(volumeValue)
+        #endif
 
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] success!");
     }
index d506cb8..25c43ba 100644 (file)
@@ -50,7 +50,10 @@ ${ROOT_DIR}/application/wearable/fd230app/nativeui/alipay/include
 # ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/player/include
 ${ROOT_DIR}/application/wearable/fd230app/nativelauncher/include
-
+${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks
+# ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits
+# /home/hcj/FD230/code/sdk/middleware/services/gui/uikit/surface/interfaces/kits/ibuffer_consumer_listener.h
+# /home/hcj/FD230/code/sdk/middleware/services/gui/uikit/ui/frameworks/common/typed_text.h
 )
 
 set(SOURCES
index 816445a..b53ff34 100644 (file)
@@ -91,12 +91,50 @@ extern "C" {
 #include "transmitting.h"
 #include "AlipayC.h"
 #include "PlayersModelC.h"
+#include "font/ui_font.h"
+#include "font/base_font.h"
+#include "common/typed_text.h"
+// #include "font/base_font.h"
+// #include "uicomponents/UIComponents.h"
 
 //#define APP_DOWNLOAD_DIAL_PATH "/user/dial/offline_dial" /*表盘市场安装路径*/
 #define DIAL_DATA_DIR APP_DOWNLOAD_DIAL_PATH
 
 // #define DIAL_DATA_DIR "/user/dial/offline_dial"
 
+uint16_t get_str_nodisplay_number(char *str, uint32_t max_len) {
+
+  uint32_t j = 0;
+  uint32_t letter = 0;
+  if (str == nullptr) {
+    return 0;
+  }
+  uint16_t nodisplay_numberlen=0;
+
+  while (str[j] != '\0') 
+  {
+    int i = j;
+    letter = OHOS::TypedText::GetUTF8Next(str, j, j);
+    int len = j - i;
+    OHOS::UIFont *fontEngine = OHOS::UIFont::GetInstance();
+    OHOS::GlyphPathData path;
+    if (!fontEngine->GetGlyphPathData(letter, 0, path)) 
+    {
+      if(nodisplay_numberlen==0 && i!=0)
+      {
+        return 0;
+      }
+      nodisplay_numberlen+=len;
+      
+    }
+    else
+    {
+      return nodisplay_numberlen;
+    }
+  }
+  // printf("%s\r\n", str_);
+}
+
 
 char * get_dial_path(void)
 {
@@ -281,6 +319,7 @@ bool Ble_Set_ScheduleInfo(uint8_t id,uint32_t timetamp_begin,uint32_t timetamp_e
     time_t currtime=timetamp_begin;
     struct tm *timeinfo;
     timeinfo = localtime(&currtime);
+    
     int y=timeinfo->tm_year+ 1900;
     int m=timeinfo->tm_mon+1;
     int d=timeinfo->tm_mday;
index e6c9587..8f1e7eb 100644 (file)
@@ -90,7 +90,7 @@ extern "C"
     
 #define MAX_MESSAGE_NUM 10
 #define TITLE_BUF_LEN 256
-#define MSG_BUF_LEN 300
+#define MSG_BUF_LEN 1024
 typedef struct ancs_data_info
 {
     uint32_t time;//时间戳 
@@ -422,6 +422,9 @@ char * get_dial_path(void);
 
 errcode_t get_dial_file_path(char* input_dialname ,uint32_t input_size, char* output_file_path , uint32_t max_output_size);
 
+
+uint16_t get_str_nodisplay_number(char *str, uint32_t max_len);
+
 #ifdef __cplusplus
 #if __cplusplus
 }
index b48bcac..3248ad7 100644 (file)
@@ -1051,8 +1051,9 @@ void MsgCenterNotifyCatIncomingCallProc(const Topic topic, Request* req)
     // When the incoming call view is displayed, the calling number is not set in CallerLogModel.
         //uapi_hfp_disconnect();
 //来电
-        
+        #ifdef SUPPORT_CAT1_HFP_AG_SERV
         cat1_ag_send_call_event(TOPIC_EVENT_CAT1_INCOMMING,call_data);
+        #endif
 
          if(NotificationManager::GetInstance()->GetWatchCallStatus() &&
         (CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourceCat1))
@@ -1117,17 +1118,20 @@ void MsgCenterNotifyCat1CallConnectedProc(const Topic topic, Request* req)
     }
     AlarmClockModel::GetInstance()->AlarmPlayerStop();
      //AlarmViewEventListener::GetInstance()->CancelAlarmRing();
-
+    #ifdef SUPPORT_CAT1_HFP_AG_SERV
     if(headset_Is_connect())
     {   
         do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT_HFP_SCO_CONNECT, nullptr, 0); 
     }
     else
+    #endif
     {
-     do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_START, nullptr, 0);
-}
-     cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLCONNTED,NULL);
-    
+        do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_START, nullptr, 0);
+    }
+    #ifdef SUPPORT_CAT1_HFP_AG_SERV
+
+    cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLCONNTED,NULL);
+    #endif
 
     CallerLogModel::GetInstance()->SetCallSource(CallerLogModel::CallSource::CallSourceCat1);
 
@@ -1167,8 +1171,9 @@ void MsgCenterNotifyCat1dialProc(const Topic topic, Request* req)
     }
     
     cat1_call_dial(call_data);
-cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLDIAL,NULL);
-
+     #ifdef SUPPORT_CAT1_HFP_AG_SERV
+    cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLDIAL,NULL);
+    #endif
     CallerLogModel::GetInstance()->SetoperateNumber(call_data,req->len);
 
     CallerLogModel::GetInstance()->SetCallSource(CallerLogModel::CallSource::CallSourceCat1);
@@ -1176,15 +1181,16 @@ cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLDIAL,NULL);
 
 
     cat1_phone_state_change_cb(OPERATE_DIALING);
-
-if(headset_Is_connect())
+     #ifdef SUPPORT_CAT1_HFP_AG_SERV
+    if(headset_Is_connect())
     {   
         do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT_HFP_SCO_CONNECT, nullptr, 0); 
     }
     else
+    #endif
     {
-    do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_START, nullptr, 0);
-        }
+        do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_START, nullptr, 0);
+    }
    
     }
     free(call_data);
@@ -1219,7 +1225,9 @@ void MsgCenterNotifyCat1CallEndedProc(const Topic topic, Request* req)
         cat1_call_hungup();
 
         cat1_phone_state_change_cb(OPERATE_WATCH_FINISH);
-cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLENDED,NULL);
+        #ifdef SUPPORT_CAT1_HFP_AG_SERV
+            cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLENDED,NULL);
+        #endif
 
         CustomEventPublish(TOPIC_EVENT_CAT1_CALL_FAIL,NULL,0);
 
@@ -1245,14 +1253,17 @@ cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLENDED,NULL);
     {
        
        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "no OPERATE_WATCH_FINISH");
-cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLENDED,NULL);
-       
+       #ifdef SUPPORT_CAT1_HFP_AG_SERV
+        cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLENDED,NULL);
+        #endif       
     } 
     else
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OPERATE_WATCH_FINISH");
         cat1_phone_state_change_cb(OPERATE_WATCH_FINISH);
-cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLENDED,NULL);
+        #ifdef SUPPORT_CAT1_HFP_AG_SERV
+        cat1_ag_send_call_event(TOPIC_EVENT_CAT1_CALLENDED,NULL);
+        #endif
     }
 
     free(call_data);
index 284f6d2..0f0e341 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang differ
index df38abf..76985f3 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang differ
index 600037f..a5b0c52 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang differ
index f3c0dd2..78a86a9 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang differ
index 721e551..94fdcdf 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.lang differ
index 7ad41e7..e16d0c4 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ
index 36ef223..110fc48 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/es.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/es.lang differ
index 0a812ab..06dffe9 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang differ
index 52acbc2..973c9ca 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang differ
index 9afc5ab..7155f87 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang differ
index 2f1aab6..cbf1747 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang differ
index 96d0f3b..834c483 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang differ
index 222b417..fa9fc66 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang differ
index abbf200..fca0233 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang differ
index 3dc6a32..62ab8f9 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.lang differ
index bc488e1..6a718d6 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang differ
index 9feb312..14303ba 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ko.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ko.lang differ
index c026b5c..17f04c6 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang differ
index 50161cf..11d7231 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang differ
index aa80e02..8bbce9a 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang differ
index 1b9ff21..06fa00b 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang differ
index d8d8f36..5cfefd7 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang differ
index e5e2e7e..0772c88 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang differ
index 888c8c3..4d99b7b 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang differ
index cc32f70..fcc7083 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang differ
index 08e89fb..a122977 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.lang differ
index 8c60a07..05a9b80 100755 (executable)
@@ -650,7 +650,8 @@ enum UIResourceTextId : uint16_t {
     STR_DELETE_ALL = 637,\r
     STR_FRE_CONTACT = 638,\r
     STR_RECORD_MAX = 639,\r
-    STR_MAX_ID = 640,\r
+    STR_CLEAR_ALL_RECORDS = 640,\r
+    STR_MAX_ID = 641,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 7c9b1dc..6d40546 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang differ
index 4b37138..f62890b 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang differ
index 40bdda4..f463391 100755 (executable)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang differ
index 43b530b..2e9368a 100755 (executable)
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
index 210818b..3b89c68 100755 (executable)
@@ -416,7 +416,7 @@ STR_NO_CALLS$No Calls
 STR_MISSED_CALLS$Missed Calls\r
 STR_DIALED_CALLS$Dialed Calls\r
 STR_RECEIVED_CALLS$Received Calls\r
-STR_NOTE_RECENT_CALLS_LIMITATION$Note: Only the last 20 calls are saved\r
+STR_NOTE_RECENT_CALLS_LIMITATION$Note: Only the last 20 call records are reserved. Long press on the call history to delete them\r
 STR_NO_CONTACTS_ADDED$No contacts added, please set up in APP\r
 STR_DIAL_MODE$Dial Mode\r
 STR_DIAL_VIA_WATCH_SIM$Dial via Watch SIM\r
@@ -639,4 +639,5 @@ STR_CALLING$On the phone
 STR_CALL_LIST$Call log\r
 STR_DELETE_ALL$Clear all\r
 STR_FRE_CONTACT$Frequent contact\r
-STR_RECORD_MAX$The recording space is full
\ No newline at end of file
+STR_RECORD_MAX$The recording space is full\r
+STR_CLEAR_ALL_RECORDS$Clear all records
\ No newline at end of file
index 9606f22..27a1119 100755 (executable)
@@ -416,7 +416,7 @@ STR_NO_CALLS$暂无通话
 STR_MISSED_CALLS$未接来电\r
 STR_DIALED_CALLS$拨出电话\r
 STR_RECEIVED_CALLS$拨入电话\r
-STR_NOTE_RECENT_CALLS_LIMITATION$注:只保留最近20条通话记录\r
+STR_NOTE_RECENT_CALLS_LIMITATION$注:只保留最近20条通话记录在通话记录上长按可删除\r
 STR_NO_CONTACTS_ADDED$尚未添加联系人,请前往APP进行设置\r
 STR_DIAL_MODE$拨号方式\r
 STR_DIAL_VIA_WATCH_SIM$通过手表SIM卡拨号\r
@@ -639,4 +639,5 @@ STR_CALLING$正在通话
 STR_CALL_LIST$通话记录\r
 STR_DELETE_ALL$全部清除\r
 STR_FRE_CONTACT$常用联系人\r
-STR_RECORD_MAX$录音空间已满
\ No newline at end of file
+STR_RECORD_MAX$录音空间已满\r
+STR_CLEAR_ALL_RECORDS$清除全部记录
\ No newline at end of file
index b7bc9d7..d19277e 100755 (executable)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ
index ec02f97..71b1e8c 100755 (executable)
        <lanstr id="STR_MISSED_CALLS" value="Missed Calls"/>
        <lanstr id="STR_DIALED_CALLS" value="Dialed Calls"/>
        <lanstr id="STR_RECEIVED_CALLS" value="Received Calls"/>
-       <lanstr id="STR_NOTE_RECENT_CALLS_LIMITATION" value="Note: Only the last 20 calls are saved"/>
+       <lanstr id="STR_NOTE_RECENT_CALLS_LIMITATION" value="Note: Only the last 20 call records are reserved. Long press on the call history to delete them"/>
        <lanstr id="STR_NO_CONTACTS_ADDED" value="No contacts added, please set up in APP"/>
        <lanstr id="STR_DIAL_MODE" value="Dial Mode"/>
        <lanstr id="STR_DIAL_VIA_WATCH_SIM" value="Dial via Watch SIM"/>
        <lanstr id="STR_DELETE_ALL" value="Clear all"/>
        <lanstr id="STR_FRE_CONTACT" value="Frequent contact"/>
        <lanstr id="STR_RECORD_MAX" value="The recording space is full"/>
+       <lanstr id="STR_CLEAR_ALL_RECORDS" value="Clear all records"/>
 </language>
index e03d871..19692f1 100755 (executable)
        <lanstr id="STR_MISSED_CALLS" value="未接来电"/>
        <lanstr id="STR_DIALED_CALLS" value="拨出电话"/>
        <lanstr id="STR_RECEIVED_CALLS" value="拨入电话"/>
-       <lanstr id="STR_NOTE_RECENT_CALLS_LIMITATION" value="注:只保留最近20条通话记录"/>
+       <lanstr id="STR_NOTE_RECENT_CALLS_LIMITATION" value="注:只保留最近20条通话记录在通话记录上长按可删除"/>
        <lanstr id="STR_NO_CONTACTS_ADDED" value="尚未添加联系人,请前往APP进行设置"/>
        <lanstr id="STR_DIAL_MODE" value="拨号方式"/>
        <lanstr id="STR_DIAL_VIA_WATCH_SIM" value="通过手表SIM卡拨号"/>
        <lanstr id="STR_DELETE_ALL" value="全部清除"/>
        <lanstr id="STR_FRE_CONTACT" value="常用联系人"/>
        <lanstr id="STR_RECORD_MAX" value="录音空间已满"/>
+       <lanstr id="STR_CLEAR_ALL_RECORDS" value="清除全部记录"/>
 </language>
index 284f6d2..0f0e341 100755 (executable)
Binary files a/tools/language_tool/font/ar.lang and b/tools/language_tool/font/ar.lang differ
index df38abf..76985f3 100755 (executable)
Binary files a/tools/language_tool/font/az.lang and b/tools/language_tool/font/az.lang differ
index 600037f..a5b0c52 100755 (executable)
Binary files a/tools/language_tool/font/cs.lang and b/tools/language_tool/font/cs.lang differ
index f3c0dd2..78a86a9 100755 (executable)
Binary files a/tools/language_tool/font/de.lang and b/tools/language_tool/font/de.lang differ
index 721e551..94fdcdf 100755 (executable)
Binary files a/tools/language_tool/font/el.lang and b/tools/language_tool/font/el.lang differ
index 7ad41e7..e16d0c4 100755 (executable)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ
index 36ef223..110fc48 100755 (executable)
Binary files a/tools/language_tool/font/es.lang and b/tools/language_tool/font/es.lang differ
index 0a812ab..06dffe9 100755 (executable)
Binary files a/tools/language_tool/font/fa.lang and b/tools/language_tool/font/fa.lang differ
index 52acbc2..973c9ca 100755 (executable)
Binary files a/tools/language_tool/font/fi.lang and b/tools/language_tool/font/fi.lang differ
index 9afc5ab..7155f87 100755 (executable)
Binary files a/tools/language_tool/font/fr.lang and b/tools/language_tool/font/fr.lang differ
index 2f1aab6..cbf1747 100755 (executable)
Binary files a/tools/language_tool/font/he.lang and b/tools/language_tool/font/he.lang differ
index 96d0f3b..834c483 100755 (executable)
Binary files a/tools/language_tool/font/hi.lang and b/tools/language_tool/font/hi.lang differ
index 222b417..fa9fc66 100755 (executable)
Binary files a/tools/language_tool/font/hr.lang and b/tools/language_tool/font/hr.lang differ
index abbf200..fca0233 100755 (executable)
Binary files a/tools/language_tool/font/id.lang and b/tools/language_tool/font/id.lang differ
index 3dc6a32..62ab8f9 100755 (executable)
Binary files a/tools/language_tool/font/it.lang and b/tools/language_tool/font/it.lang differ
index bc488e1..6a718d6 100755 (executable)
Binary files a/tools/language_tool/font/ja.lang and b/tools/language_tool/font/ja.lang differ
index 9feb312..14303ba 100755 (executable)
Binary files a/tools/language_tool/font/ko.lang and b/tools/language_tool/font/ko.lang differ
index c026b5c..17f04c6 100755 (executable)
Binary files a/tools/language_tool/font/ms.lang and b/tools/language_tool/font/ms.lang differ
index 50161cf..11d7231 100755 (executable)
Binary files a/tools/language_tool/font/nl.lang and b/tools/language_tool/font/nl.lang differ
index aa80e02..8bbce9a 100755 (executable)
Binary files a/tools/language_tool/font/pl.lang and b/tools/language_tool/font/pl.lang differ
index 1b9ff21..06fa00b 100755 (executable)
Binary files a/tools/language_tool/font/pt.lang and b/tools/language_tool/font/pt.lang differ
index d8d8f36..5cfefd7 100755 (executable)
Binary files a/tools/language_tool/font/ro.lang and b/tools/language_tool/font/ro.lang differ
index e5e2e7e..0772c88 100755 (executable)
Binary files a/tools/language_tool/font/ru.lang and b/tools/language_tool/font/ru.lang differ
index 888c8c3..4d99b7b 100755 (executable)
Binary files a/tools/language_tool/font/sv.lang and b/tools/language_tool/font/sv.lang differ
index cc32f70..fcc7083 100755 (executable)
Binary files a/tools/language_tool/font/th.lang and b/tools/language_tool/font/th.lang differ
index 08e89fb..a122977 100755 (executable)
Binary files a/tools/language_tool/font/tr.lang and b/tools/language_tool/font/tr.lang differ
index 8c60a07..05a9b80 100755 (executable)
@@ -650,7 +650,8 @@ enum UIResourceTextId : uint16_t {
     STR_DELETE_ALL = 637,\r
     STR_FRE_CONTACT = 638,\r
     STR_RECORD_MAX = 639,\r
-    STR_MAX_ID = 640,\r
+    STR_CLEAR_ALL_RECORDS = 640,\r
+    STR_MAX_ID = 641,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
index 7c9b1dc..6d40546 100755 (executable)
Binary files a/tools/language_tool/font/uk.lang and b/tools/language_tool/font/uk.lang differ
index 4b37138..f62890b 100755 (executable)
Binary files a/tools/language_tool/font/uz.lang and b/tools/language_tool/font/uz.lang differ
index 40bdda4..f463391 100755 (executable)
Binary files a/tools/language_tool/font/vi.lang and b/tools/language_tool/font/vi.lang differ
index 43b530b..2e9368a 100755 (executable)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ