优化EC200U获取ICCID的指令

air720u/air720u.c

@@ -190,7 +190,7 @@ int Air720U_ComInit()
   ret = comio_doCmd(&trans, WAIT_ACK_TIMEOUT);
   if(!(ret > 0 && strstr(trans.ack.data, ATOK) && xstrcasestr(trans.ack.data, "left", "Air72")))
   {
-    if(ret != 0) sw_log_error("[%s] failed to get module model!!", MODULE_NAME);
+    if(ret < 0) sw_log_error("[%s] failed to get module model!!", MODULE_NAME);
     Air720U_ComExit(); return -99+ret;
   }
 

ec200u/ec200u.c

@@ -22,7 +22,7 @@ static const char *AT_GET_CSQ    = "AT+CSQ"  ;
 // 获取SIM-PIN状态
 static const char *AT_GET_PINSTA = "AT+CPIN?";
 // 获取SIM-ICCID号
-static const char *AT_GET_ICCID  = "AT+ICCID";
+static const char *AT_GET_ICCID  = "AT+QCCID";
 // 激活USB网络模式
 static const char *AT_QCFG_CMD1  = "AT+QCFG=\"usbnet\",1";
 static const char *AT_QCFG_CMD2  = "AT+qnetdevctl=1,1,1" ;
@@ -193,7 +193,7 @@ int EC200U_ComInit()
   ret = comio_doCmd(&trans, WAIT_ACK_TIMEOUT);
   if(!(ret > 0 && strstr(trans.ack.data, ATOK) && xstrcasestr(trans.ack.data, "left", MODULE_NAME)))
   {
-    if(ret != 0) sw_log_error("[%s] failed to get module model!!", MODULE_NAME);
+    if(ret < 0) sw_log_error("[%s] failed to get module model!!", MODULE_NAME);
     EC200U_ComExit(); return -99+ret;
   }
 
@@ -405,8 +405,8 @@ lsa_p: // 行扫描, 逐行分析应答结果
     if(pLineE) { p = pLineE; goto lsa_p; } // 跳第一个CRLF, 继续分析下一行
     else goto end_p;
   }
-  //// 示例: "+ICCID: 89860117831003134201"
-  p1 = strstr(pLineS, "+ICCID:"); p2 = NULL;
+  //// 示例: "+QCCID: 89860436102480057245"
+  p1 = strstr(pLineS, "+QCCID:"); p2 = NULL;
   if(p1 && p1 < pLineE) { p1 += 7; p2 = pLineE; }
   if(p2)
   {

netmgrd/netmgrd.go

@@ -274,12 +274,12 @@ func openNetwork() {
 
 	if start4GNetwork() {
 		curNetType = NetLTE
-		baseapp.Logger.Infof("[%s] ✅ 蜂窝网络已连接", MODULE_NAME)
+		baseapp.Logger.Infof("[%s] ✅ 蜂窝网络已连接(%s)", MODULE_NAME, curModemType.String())
 		return
 	}
 
 	curNetType = NetNone
-	baseapp.Logger.Warnf("[%s] ⚠️ 当前无可用的网络", MODULE_NAME)
+	baseapp.Logger.Warnf("[%s] ⚠️ 注意: 当前无可用网络", MODULE_NAME)
 }
 
 // 得到当前联网类型: 有线、蜂窝