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

app/build.gradle

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

app/src/main/cpp/PhoneDevice.cpp

@@ -1235,7 +1235,7 @@ IDevice::timer_uid_t CPhoneDevice::RegisterTimer(unsigned int timerType, unsigne
     context->uid = (unsigned long)timer;
     ts.it_value.tv_sec = (timeout / 1000);
     ts.it_value.tv_nsec = (timeout % 1000) * 1000;
-    if (times != 1)
+    if (times > 1)
     {
         ts.it_interval.tv_sec = ts.it_value.tv_sec;
         ts.it_interval.tv_nsec = ts.it_value.tv_nsec;
@@ -2924,7 +2924,7 @@ bool CPhoneDevice::PostProcessPhoto(const PHOTO_INFO& photoInfo, const vector<ID
 #endif
 
         textSize = ft2->getTextSize(it->text, fontSize, thickness, &baseline);
-        XYLOG(XYLOG_SEVERITY_DEBUG, "%s font Size=%d height: %d baseline=%d", it->text.c_str(), fontSize, textSize.height, baseline);
+        // XYLOG(XYLOG_SEVERITY_DEBUG, "%s font Size=%d height: %d baseline=%d", it->text.c_str(), fontSize, textSize.height, baseline);
 
         if (it->alignment == OSD_ALIGNMENT_TOP_LEFT)
         {

app/src/main/cpp/PhoneDevice.h

@@ -212,7 +212,7 @@ public:
     virtual timer_uid_t RegisterHeartbeat(unsigned int timerType, unsigned int timeout, time_t tsForNextPhoto);
 	virtual bool TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<OSD_INFO>& osds, const std::string& path);
 	virtual bool CloseCamera();
-    virtual timer_uid_t RegisterTimer(unsigned int timerType, unsigned int timeout, void* data, unsigned long times = 0);
+    virtual timer_uid_t RegisterTimer(unsigned int timerType, unsigned int timeout, void* data, unsigned long times = 1);
     virtual bool UnregisterTimer(timer_uid_t uid);
     virtual unsigned long RequestWakelock(unsigned long timeout);
     virtual bool ReleaseWakelock(unsigned long wakelock);

app/src/main/java/com/xypower/mpapp/MicroPhotoService.java

@@ -688,12 +688,13 @@ public class MicroPhotoService extends Service {
                 ex.printStackTrace();
             }
 
+            alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + timeout, pendingIntent);
+
             long currentTimeMillis = System.currentTimeMillis();
             Date date = new Date(currentTimeMillis + timeout);
             String dateStr = (String) DateFormat.format("MM-dd kk:mm:ss", date);
-            Log.d(TAG, "PhotoTimer Reg: " + dateStr + " currentTimeMillis=" + currentTimeMillis + " timeout=" + timeout + " CH-PR=" + channelStr.toString());
-
-            alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + timeout, pendingIntent);
+            // Log.d(TAG, "PhotoTimer Reg: " + dateStr + " currentTimeMillis=" + currentTimeMillis + " timeout=" + timeout + " CH-PR=" + channelStr.toString());
+            infoLog( "PhotoTimer Reg: " + dateStr + " TS=" + currentTimeMillis + " Timeout=" + timeout + " " + channelStr.toString());
         }
     }