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

app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 // 10,00,000 major-minor-build
 def AppMajorVersion = 1
 def AppMinorVersion = 3
-def AppBuildNumber = 135
+def AppBuildNumber = 136
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

app/src/main/cpp/MicroPhoto.cpp

@@ -544,6 +544,7 @@ Java_com_xypower_mpapp_MicroPhotoService_sendHeartbeat(
     pTerminal->SendHeartbeat();
 
 #ifdef OUTPUT_DBG_INFO
+#if 0
     std::thread t([]()
     {
         time_t ts = time(NULL);
@@ -557,6 +558,7 @@ Java_com_xypower_mpapp_MicroPhotoService_sendHeartbeat(
 
     });
     t.detach();
+#endif
 #endif
 
     return JNI_TRUE;

app/src/main/cpp/PhoneDevice.cpp

@@ -1019,7 +1019,14 @@ bool CPhoneDevice::QuerySystemProperties(std::map<std::string, std::string>& pro
                 {
                     continue;
                 }
-                snprintf(str, sizeof(str), "%.1f", (val / 1000.0));
+                if (val < 3000)
+                {
+                    strcpy(str, "0");
+                }
+                else
+                {
+                    snprintf(str, sizeof(str), "%.1f", (val / 1000.0));
+                }
                 it->second = std::string(str);
                 break;
             }
@@ -1728,22 +1735,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
 
         img.clear();
         netCaptureResult = requestCapture(localPhotoInfo.channel, localPhotoInfo.preset, netPhotoInfo, img);
-        if (netCaptureResult)
+
-        {
-            m_ethernetFailures = 0;
-        }
-        else
-        {
-            m_ethernetFailures++;
-            if (m_ethernetFailures > 3)
-            {
-                time_t rebootTime = GetRebootTime();
-                if (ts - rebootTime > 1800)
-                {
-                    Reboot(REBOOT_TYPE_DEVICE, true, "Ethernet Not Existing");
-                }
-            }
-        }
         if (netCaptureResult && !img.empty())
         {
             if(img.size() <= 1000)
@@ -1764,6 +1756,23 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
     ethernetPowerCtrl.reset();
     XYLOG(XYLOG_SEVERITY_DEBUG, "Ethernet Power OFF");
 
+    if (netCaptureResult)
+    {
+        m_ethernetFailures = 0;
+    }
+    else
+    {
+        m_ethernetFailures++;
+        if (m_ethernetFailures > 3)
+        {
+            time_t rebootTime = GetRebootTime();
+            if (ts - rebootTime > 1800)
+            {
+                Reboot(REBOOT_TYPE_DEVICE, true, "Ethernet Not Existing");
+            }
+        }
+    }
+
     if (!rgb.empty())
     {
         time_t takingTime = ts;

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

@@ -1367,6 +1367,7 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
                 mstatus = AImage_getTimestamp(image, &frameTs);
 
 #ifdef OUTPUT_DBG_INFO
+#if 0
 				if (mWidth == 1920)
 				{
 					std::string dt = FormatLocalDateTime("%d%02d%02d%02d%02d%02d", time(NULL));
@@ -1374,6 +1375,7 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
 					fileName += "_" + mCameraId + std::to_string(frameTs) + ".yuv";
 					saveYuvToFile(image, fileName.c_str());
 				}
+#endif
 #endif
 				AImage_delete(image);