Merge branch 'main' of http://61.169.135.146: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 = 40
+def AppBuildNumber = 43
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

app/src/main/cpp/GPIOControl.h

@@ -580,7 +580,8 @@ public:
 #ifdef USING_PLZ
     PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_100M_ENABLE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime)
 #else // USING_PLZ
-    PowerControl(CMD_SET_OTG_STATE, closeDelayTime)
+    // Micro Photo
+    PowerControl(CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE/* Only for wp6*/, closeDelayTime)
 #endif // USING_PLZ
 #endif // USING_N938
     {

app/src/main/cpp/PhoneDevice.cpp

@@ -1620,7 +1620,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
     std::vector<uint8_t> img;
 
     bool netCaptureResult = false;
-    for (int idx = 0; idx < 3; idx++)
+    for (int idx = 0; idx < 64; idx++)
     {
         netHandle = GetEthnetHandle();
         netPhotoInfo.netHandle = netHandle;

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

@@ -316,6 +316,7 @@ public class MicroPhotoService extends Service {
             intentFilter.addAction(ACTION_UPDATE_CONFIGS);
             intentFilter.addAction(ACTION_IMP_PUBKRY);
             intentFilter.addAction(ACTION_TAKE_PHOTO_MANUALLY);
+            intentFilter.addAction(ACTION_HEARTBEAT_MANUALLY);
             intentFilter.addAction(ACTION_GPS_TIMEOUT);
             intentFilter.addAction(ACTION_RESTART);
             getApplicationContext().registerReceiver(mAlarmReceiver, intentFilter, Context.RECEIVER_EXPORTED | Context.RECEIVER_VISIBLE_TO_INSTANT_APPS);

mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java

@@ -81,6 +81,7 @@ public class MpMasterService extends Service {
 
     private static final String ACTION_HEARTBEAT = "com.xypower.mpmaster.ACT_HB";
     private static final String ACTION_TAKE_PHOTO = "com.xypower.mpapp.ACT_TP";
+    private static final String ACTION_MP_HEARTBEAT_MANUALLY = "com.xypower.mpapp.ACT_HB_M";
 
     public static final String ACTION_MP_RESTART = "com.xypower.mpapp.ACT_RESTART";
     public static final String ACTION_IMP_PUBKRY = "com.xypower.mpapp.ACT_IMP_PUBKEY";
@@ -1060,7 +1061,7 @@ public class MpMasterService extends Service {
     public static String getBatteryVoltage() {
         int val = 0;
         for (int idx = 0; idx < 3; idx++) {
-            val = MpMasterService.getInt(115);
+            val = MpMasterService.getInt(117);
             if (val > 0) {
                 return Integer.toString(val / 1000) + "." + Integer.toString((val % 1000) / 100);
             }
@@ -1192,6 +1193,20 @@ public class MpMasterService extends Service {
         } else {
             SysApi.selectSimCard4Data(context, num);
         }
+
+        if (num == 1) {
+            // If it's back to card 1, let MpAPP send heartbeat manully after 10s
+            mHander.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    Intent intent = new Intent();
+                    intent.setAction(ACTION_MP_HEARTBEAT_MANUALLY);
+                    intent.setPackage(MicroPhotoContext.PACKAGE_NAME_MPAPP);
+                    sendBroadcast(intent);
+                }
+            }, 10000);
+
+        }
     }
 
     private void setDefaultDataSubId(int subId) {