From: hcj <1224667075@qq.com>
Date: Sat, 3 Aug 2024 09:34:57 +0000 (+0800)
Subject: 合并
X-Git-Tag: release_V1.2.70_20241020_135402~690^2~12
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F638%2F2;p=mirrors%2FFD230.git

合并
---

9ce952d6369fabf4519a1d97efdd9861ba35bffc
diff --cc code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
index 9ffebc46a,e5ea2d70d..0b9be51ee
--- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
@@@ -1138,9 -1141,26 +1143,26 @@@ void set_dmp_cm_address_toCat1(char *ad
  }
  void send_dtfm_number_toCat1(char ch)//发送dtfm 
  {
 -    // printf("ch:%s\r\n",&ch);
 +    printf("ch:%c\r\n",ch);
      udp_send_msg_toCat1(UDP_MSG_SEND_DTMF_NUMBER,&ch);
  }
+ void send_volte_switch_toCat1(void)//发送VOLTE->CAT1
+ {
+     bool Cat1_4G = OHOS::ConfigModel::GetInstance()->GetCat1_4Gability();
+     if (Cat1_4G == 0)
+         return;
+ 
+     bool volte = OHOS::ConfigModel::GetInstance()->GetVoLTE_Call();
+     char send_str[5] = {0};
+     sprintf_s((char *)send_str,5, "%d", volte);
+     udp_send_msg_toCat1(UDP_MSG_SEND_VOLTE_SWITCH,send_str);
+ }
+ bool get_volte_switch(void)//
+ {
+     bool volte = OHOS::ConfigModel::GetInstance()->GetVoLTE_Call();
+     return volte;
+ }
+ 
  static int udp_packet_parse(char *rx_buffer, int len)
  {