Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp

app/src/main/cpp/SensorsProtocol.cpp

@@ -2055,7 +2055,7 @@ void CameraPhotoPortDataProcess(int devno)
 						pPortParam->SerialCmdidx = -1;
 					}
 					else
-						pPortParam->SerialCmdidx = iNo;
+						pPortParam->SerialCmdidx = iNo+1;
 //					pPortParam->SerialCmdidx = iNo + 1;
 				}
 				srdt.errorPhotoNoCnt = 0;
@@ -2063,7 +2063,7 @@ void CameraPhotoPortDataProcess(int devno)
 			}
 			srdt.errorPhotoNoCnt++;
 			sprintf(szbuf, "问询第%d包图片摄像机应答第%d包,连续错误%d次!",
-					pPortParam->SerialCmdidx-1, iNo, srdt.errorPhotoNoCnt);
+					pPortParam->SerialCmdidx-2, iNo, srdt.errorPhotoNoCnt);
 			DebugLog(devparam[devno].commid, szbuf, 'E');
 			if (srdt.errorPhotoNoCnt > 5)
 			{