From c227d10b5fb894a78218981edb40a843c8fefdf5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=AD=99=E6=98=A5=E9=98=B3?= Date: Fri, 22 Aug 2025 20:17:10 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=90=A5=E5=95=86?= =?utf8?q?=E8=B5=8B=E5=80=BC=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=20?= =?utf8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA4g?= =?utf8?q?=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../4g/cat1Service/Service/cat1_runtime.c | 11 ++-- code/sdk/zhihui/4gTest/cat1_porting.c | 5 +- code/sdk/zhihui/utils/custom_runtime.c | 54 +++++++------------ code/sdk/zhihui/utils/custom_runtime.h | 1 + 4 files changed, 32 insertions(+), 39 deletions(-) diff --git a/code/sdk/zhihui/4g/cat1Service/Service/cat1_runtime.c b/code/sdk/zhihui/4g/cat1Service/Service/cat1_runtime.c index c458fd822..173d1bcb0 100644 --- a/code/sdk/zhihui/4g/cat1Service/Service/cat1_runtime.c +++ b/code/sdk/zhihui/4g/cat1Service/Service/cat1_runtime.c @@ -1,7 +1,7 @@ #include "cat1_runtime.h" #include "chip_system_time.h" #include - +#include "cat1_log.h" /** * cat1_powerOn 0,1 @@ -23,7 +23,7 @@ typedef struct uint8_t cat1_network_type ; int sim ; int signal ; - char opera[20] ; + char opera[64] ; char imei[20] ; char pyVer[20] ; char modemVer[64] ; @@ -85,8 +85,13 @@ uint8_t cat1_api_runtime_get_cat1_networktype(void) void cat1_api_runtime_set_cat1_operator(char* cat1_operator) { - if (cat1_operator == NULL) return; + if (cat1_operator == NULL) + { + cat1_print_warning("cat1_operator is NULL"); + return; + } int len=strlen(cat1_operator); + // cat1_print_dbg("cat1_operator = %s,len = %d",cat1_operator,len); memset_s(g_runtime.opera,sizeof(g_runtime.opera),0,sizeof(g_runtime.opera)); memcpy_s(g_runtime.opera,sizeof(g_runtime.opera),cat1_operator,len); } diff --git a/code/sdk/zhihui/4gTest/cat1_porting.c b/code/sdk/zhihui/4gTest/cat1_porting.c index 3cceddf04..385552e61 100644 --- a/code/sdk/zhihui/4gTest/cat1_porting.c +++ b/code/sdk/zhihui/4gTest/cat1_porting.c @@ -185,12 +185,13 @@ errcode_t cat1_msg_callback(MESSAGE_4G_T msg, void *msg_buf, uint16_t msglen) cat1_print_warning("MESSAGE_4G_NETWORK_DISCONNECTED"); break; case MESSAGE_4G_NETWORK_STAT_CHANGED: //含signal，sim，运营商， - cat1_print_warning("MESSAGE_4G_NETWORK_STAT_CHANGED netstat(%d),signal(%d),sim(%d),network(%s),imei(%s)", + cat1_print_warning("MESSAGE_4G_NETWORK_STAT_CHANGED netstat(%d),signal(%d),sim(%d),network(%s),imei(%s),operator(%s)", cat1_api_runtime_get_cat1_networkstat(), cat1_api_runtime_get_cat1_signal(), cat1_api_runtime_get_cat1_simstat(), cat1_api_runtime_get_cat1_networktype()==0?"无网络":(cat1_api_runtime_get_cat1_networktype()==1?"GSM":(cat1_api_runtime_get_cat1_networktype()==2?"3G":"4G/LTE")), - cat1_api_runtime_get_cat1_imei() + cat1_api_runtime_get_cat1_imei(), + cat1_api_runtime_get_cat1_operator() ); break; case MESSAGE_4G_CALL_COMMING: //带电话号 diff --git a/code/sdk/zhihui/utils/custom_runtime.c b/code/sdk/zhihui/utils/custom_runtime.c index b7aa10a14..cfdb45d7e 100644 --- a/code/sdk/zhihui/utils/custom_runtime.c +++ b/code/sdk/zhihui/utils/custom_runtime.c @@ -3,7 +3,6 @@ #include - typedef struct { uint8_t bt_powerOn; @@ -68,7 +67,6 @@ typedef struct uint8_t stepcount; uint8_t vibmod; bt_runtime_status_t bt_runtime; - cat1_runtime_status_t cat1_runtime; char current_dial_name[32]; uint8_t time_hour_show_model; uint8_t sleep_monitoring_status;//睡眠监测 @@ -142,101 +140,89 @@ uint8_t uapi_dev_runtime_get_transmitting_status(void) void uapi_dev_runtime_set_cat1_powerstat(uint8_t cat1_powerOn) { - g_runtime.cat1_runtime.cat1_powerOn=cat1_powerOn; + cat1_api_runtime_set_cat1_powerstat(cat1_powerOn); } uint8_t uapi_dev_runtime_get_cat1_powerstat(void) { - return g_runtime.cat1_runtime.cat1_powerOn; + return cat1_api_runtime_get_cat1_powerstat(); } void uapi_dev_runtime_set_cat1_networkstat(uint8_t network_on) { - g_runtime.cat1_runtime.network_on=network_on; + cat1_api_runtime_set_cat1_networkstat(network_on); } //获取网络开启状态 uint8_t uapi_dev_runtime_get_cat1_networkstat(void) { - return g_runtime.cat1_runtime.network_on; + return cat1_api_runtime_get_cat1_networkstat(); } void uapi_dev_runtime_set_cat1_signal(int signal) { - g_runtime.cat1_runtime.signal=signal; + cat1_api_runtime_set_cat1_signal(signal); } //获取cat1信号强度 int uapi_dev_runtime_get_cat1_signal(void) { - return g_runtime.cat1_runtime.signal; + return cat1_api_runtime_get_cat1_signal(); } void uapi_dev_runtime_set_cat1_simstat(int simstat) { - g_runtime.cat1_runtime.sim=simstat; + cat1_api_runtime_set_cat1_simstat(simstat); } //获取cat1的sim卡状态 int uapi_dev_runtime_get_cat1_simstat(void) { - return g_runtime.cat1_runtime.sim; + return cat1_api_runtime_get_cat1_simstat(); } void uapi_dev_runtime_set_cat1_networktype(uint8_t networtype) { - g_runtime.cat1_runtime.cat1_network_type=networtype; + cat1_api_runtime_set_cat1_networktype(networtype); } //获取网络类型 uint8_t uapi_dev_runtime_get_cat1_networtype(void) { - return g_runtime.cat1_runtime.cat1_network_type; + return cat1_api_runtime_get_cat1_networktype(); } void uapi_dev_runtime_set_cat1_operator(char* cat1_operator) -{ - if (cat1_operator == NULL) return; - int len=strlen(cat1_operator); - memset_s(g_runtime.cat1_runtime.opera,sizeof(g_runtime.cat1_runtime.opera),0,sizeof(g_runtime.cat1_runtime.opera)); - memcpy_s(g_runtime.cat1_runtime.opera,sizeof(g_runtime.cat1_runtime.opera),cat1_operator,len); +{ + cat1_api_runtime_set_cat1_operator(cat1_operator); } char* uapi_dev_runtime_get_cat1_operator(void) -{ - return (char*)g_runtime.cat1_runtime.opera; +{ + return cat1_api_runtime_get_cat1_operator(); } void uapi_dev_runtime_set_cat1_imei(char* imei) { - if (imei == NULL) return; - int len=strlen(imei); - memset_s(g_runtime.cat1_runtime.imei,sizeof(g_runtime.cat1_runtime.imei),0,sizeof(g_runtime.cat1_runtime.imei)); - memcpy_s(g_runtime.cat1_runtime.imei,sizeof(g_runtime.cat1_runtime.imei),imei,len); + cat1_api_runtime_set_cat1_imei(imei); } char* uapi_dev_runtime_get_cat1_imei(void) { - return (char*)g_runtime.cat1_runtime.imei; + return cat1_api_runtime_get_cat1_imei(); } void uapi_dev_runtime_set_cat1_pyver(char* pyver) { - if (pyver == NULL) return; - int len=strlen(pyver); - memset_s(g_runtime.cat1_runtime.pyVer,sizeof(g_runtime.cat1_runtime.pyVer),0,sizeof(g_runtime.cat1_runtime.pyVer)); - memcpy_s(g_runtime.cat1_runtime.pyVer,sizeof(g_runtime.cat1_runtime.pyVer),pyver,len); + cat1_api_runtime_set_cat1_pyver(pyver); } char* uapi_dev_runtime_get_cat1_pyver(void) { - return (char*)g_runtime.cat1_runtime.pyVer; + return cat1_api_runtime_get_cat1_pyver(); } void uapi_dev_runtime_set_cat1_modemver(char* modemver) { - if (modemver == NULL) return; - int len=strlen(modemver); - memset_s(g_runtime.cat1_runtime.modemVer,sizeof(g_runtime.cat1_runtime.modemVer),0,sizeof(g_runtime.cat1_runtime.modemVer)); - memcpy_s(g_runtime.cat1_runtime.modemVer,sizeof(g_runtime.cat1_runtime.modemVer),modemver,len); + cat1_api_runtime_set_cat1_modemver(modemver); } char* uapi_dev_runtime_get_cat1_modemver(void) { - return (char*)g_runtime.cat1_runtime.modemVer; + return cat1_api_runtime_get_cat1_modemver(); } diff --git a/code/sdk/zhihui/utils/custom_runtime.h b/code/sdk/zhihui/utils/custom_runtime.h index 841544509..d902c4de6 100644 --- a/code/sdk/zhihui/utils/custom_runtime.h +++ b/code/sdk/zhihui/utils/custom_runtime.h @@ -13,6 +13,7 @@ #include #include "errcode.h" #include "soc_osal.h" +#include "cat1_runtime.h" #ifdef __cplusplus #if __cplusplus -- 2.17.1