Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

app/src/main/cpp/SensorsProtocol.cpp

@@ -642,7 +642,7 @@ char Gm_GetSensorsPowerState(int port)
 void BytestreamLOG(int commid, char* describe, u_char* buf, int len, char flag)
 {
 	int     i;
-	char    szbuf[4096];
+	char    szbuf[8192];
 
 	memset(szbuf, 0, sizeof(szbuf));
 	if (NULL != describe)
@@ -1893,11 +1893,11 @@ void CameraPhotoPortDataProcess(SIO_PARAM_SERIAL_DEF *curserial)
 					}
 					else
 					{
+                        memset(&serialport[0].image, 0, sizeof(PHOTO_DEF));
+                        memmove((void *)&serialport[0].image, (void*)&curserial->image, sizeof(PHOTO_DEF));
 						if ((1 == SaveImageDataTofile(curserial)) && (SER_SAMPLE == curserial->image.state))
 						{
 							curserial->image.state = PHOTO_SAVE_SUCC;
-							memset(&serialport[0].image, 0, sizeof(PHOTO_DEF));
-							memmove((void *)&serialport[0].image, (void*)&curserial->image, sizeof(PHOTO_DEF));
 						}
 						recvend = 1;
 					}
@@ -3570,16 +3570,27 @@ int GM_IsCloseCamera(SIO_PARAM_SERIAL_DEF *pPortParam)
 
 void GM_CameraSerialComRecv(SIO_PARAM_SERIAL_DEF *pPortParam)
 {
-	int	recvlen;
+	int	i, recvlen;
 	u_char	recvbuf[RECVDATA_MAXLENTH];
 	char		buf[256];
+    int64_t  t0, t1;
 
+   t0 = get_msec();
 	memset(recvbuf, 0, sizeof(recvbuf));
 	if (pPortParam->fd <= 0)
 		return;
-	//for(;;)
-	recvlen = read(pPortParam->fd, recvbuf, sizeof(recvbuf));/* 在串口读取字符串 */
+    i=0;
+    recvlen = 0;
+	for(;;)
+    {
+        i += recvlen;
+        recvlen = read(pPortParam->fd, &recvbuf[i], sizeof(recvbuf)-i);/* 在串口读取字符串 */
+        t1 = get_msec();
+        if(t1-t0 >= 500)
+            break;
+    }
 
+    recvlen = i;
 	if (recvlen < 1)
 		return;
 #if 1
@@ -3596,7 +3607,7 @@ int GM_CameraSerialTimer(SIO_PARAM_SERIAL_DEF *pPortParam)
 
 	GM_CameraSerialComRecv(pPortParam);
 	Gm_FindCameraCommand(pPortParam);
-	GM_CameraSerialComRecv(pPortParam);
+	//GM_CameraSerialComRecv(pPortParam);
 	flag = GM_IsCloseCamera(pPortParam);
 	return  flag;
 }