eg800ak 获取ICCID 方法，更新固件和getSignal函数

diff --git a/cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1011_LN_PY_SRV_V23_20251011-1802.zip b/cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1011_LN_PY_SRV_V25_20251014-1132.zip
similarity index 99%
rename from cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1011_LN_PY_SRV_V23_20251011-1802.zip
rename to cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1011_LN_PY_SRV_V25_20251014-1132.zip
index 9eae837..662237e 100644 (file)
Binary files a/cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1011_LN_PY_SRV_V23_20251011-1802.zip and b/cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1011_LN_PY_SRV_V25_20251014-1132.zip differ

diff --git a/cat1modem/src/LeiNiao/cat1Service.py b/cat1modem/src/LeiNiao/cat1Service.py
index 440907d..4ccf74e 100644 (file)
--- a/cat1modem/src/LeiNiao/cat1Service.py
+++ b/cat1modem/src/LeiNiao/cat1Service.py
@@ -81,7 +81,7 @@ sms.setCallback(msg_cb)#sms注册回调
 CAT1_SERVICE_HEAD = 'FE' #固定head 
 
 PROJECT_NAME = "Cat1SlipUDPService"
-PROJECT_VERSION = "PY_SRV_V23"
+PROJECT_VERSION = "PY_SRV_V25"
 CONFIG_JSON="/usr/system_config.json"
 CURRENT_APP_TYPE="pysrv"
 
@@ -347,6 +347,7 @@ class Cat1Service:
             clog.info("cmd ==== 07!")
             # UDP_CMD_GET_RECV_NETWORKSTAT
             simstat = sim.getStatus()
+            iccid = sim.getIccid()
             imei = modem.getDevImei()
             netstat = "0,10,0,10"
             netstat_ = net.getState()
@@ -355,8 +356,8 @@ class Cat1Service:
             # ([voice_state, voice_lac, voice_cid, voice_rat, voice_reject_cause, voice_psc], [data_state, data_lac, data_cid, data_rat, data_reject_cause, data_psc])
             operator =  net.operatorName()
             signal = net.csqQueryPoll()
-            clog.info("imei:{0},sim:{1},oper:{2},signal:{3},net:{4}".format(imei,simstat,operator,signal,netstat))
-            self.reply_cmd('07',"imei:{0}@sim:{1}@oper:{2}@signal:{3}@net:{4}".format(imei,simstat,operator,signal,netstat))
+            clog.info("imei:{0}@sim:{1}@iccid:{2}@oper:{3}@signal:{4}@net:{5}".format(imei,simstat,iccid,operator,signal,netstat))
+            self.reply_cmd('07',"imei:{0}@sim:{1}@iccid:{2}@oper:{3}@signal:{4}@net:{5}".format(imei,simstat,iccid,operator,signal,netstat))
         elif cmd == "09":
             clog.info("{},{}".format(cmd,parm))
             # UDP_CMD_ATCMD

diff --git a/code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c b/code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c
index 1151dc7..5bf66d1 100644 (file)
--- a/code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c
+++ b/code/sdk/zhihui/4g/cat1Service/Service/cat1_server.c
@@ -609,6 +609,7 @@ static int decodeVersion(char* msg)
 // ([rssi, bitErrorRate, rscp, ecno], [rssi, rsrp, rsrq, cqi, sinr])
 // const char* msgnet ="imei:860132060352796@sim:0@oper:-1@signal:99@net:([99, 0, 0, 0], [0, 0, 0, 0, 0])";
 // const char* msgnetfull = "imei:864430010001091@sim:1@oper:('CHN-CT', 'CT', '460', '11')@signal:22@net:([99, 99, 255, 255], [-71, -103, -12, 255, 4])";
+// imei:861106079800325@sim:1@iccid:89860441192590308552@oper:('CHINA MOBILE', 'CMCC', '460', '00')@signal:24@net:0,0,1,7 
 static int decodeNetStat(char* msg)
 {
     int update = 0;
@@ -694,6 +695,17 @@ static int decodeNetStat(char* msg)
                 cat1_api_runtime_set_cat1_signal(signals);
             }  
             continue;
+        }else if(strncmp(s,"iccid:",6) == 0)
+        {
+            ppbuf=s+6;
+            char *iccids = cat1_api_runtime_get_cat1_iccid();
+            cat1_print_dbg("=== iccid = %s\r\n",ppbuf);
+            if ( strcmp(iccids,ppbuf) != 0)
+            {
+                update++;
+                cat1_api_runtime_set_cat1_iccid(ppbuf);
+            }  
+            continue;
         }  
 
         if(g_py_ver >= 6 && strncmp(s,"net:",4) == 0)