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

app/src/main/cpp/camera2/ndkcamera.cpp

@@ -1317,7 +1317,7 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
 
 			if (captureCompleted && captureDispatchable)
 			{
-				XYLOG(XYLOG_SEVERITY_DEBUG,"onOneCapture from onImageAvailable");
+				XYLOG(XYLOG_SEVERITY_INFO,"onOneCapture from onImageAvailable");
 				onOneCapture(mCharacteristics, result, mFinalLdr, ts - m_startTime, mOneFrame);
 			}
 		}
@@ -1797,7 +1797,7 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
 
 			if (captureCompleted && captureDispatchable)
 			{
-				XYLOG(XYLOG_SEVERITY_DEBUG,"onOneCapture from onCaptureCompleted");
+				XYLOG(XYLOG_SEVERITY_INFO,"onOneCapture from onCaptureCompleted");
 				onOneCapture(mCharacteristics, captureResult, mFinalLdr, ts - m_startTime, mOneFrame);
 			}
 		}

app/src/main/cpp/netcamera/httpclient.cpp

@@ -10,6 +10,7 @@ static size_t OnWriteData(void* buffer, size_t size, size_t nmemb, void* lpVoid)
     std::vector<uint8_t>* data = (std::vector<uint8_t>*)lpVoid;
     if( NULL == data || NULL == buffer )
     {
+        XYLOG(XYLOG_SEVERITY_ERROR,"OnWriteData callback -1");
         return -1;
     }
     uint8_t* begin = (uint8_t *)buffer;
@@ -27,6 +28,7 @@ static int SockOptCallback(void *clientp, curl_socket_t curlfd, curlsocktype pur
     {
         int errcode = errno;
         printf("android_setsocknetwork errno=%d", errcode);
+        XYLOG(XYLOG_SEVERITY_ERROR,"setsocknetwork -1, errcode=%d",errcode);
     }
     return res == 0 ? CURL_SOCKOPT_OK : CURL_SOCKOPT_ERROR;
 }