From 78101816a4d131682ac15c6293082b32477cb217 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 3 Mar 2025 20:42:57 +0800 Subject: [PATCH 1/9] =?UTF-8?q?6mipi=20=E7=89=88=E6=9C=AC=E7=9A=84?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=9C=80=E8=A6=81=E6=89=93=E5=BC=80=20131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/GPIOControl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/cpp/GPIOControl.h b/app/src/main/cpp/GPIOControl.h index 2f3ea947..dce30dba 100644 --- a/app/src/main/cpp/GPIOControl.h +++ b/app/src/main/cpp/GPIOControl.h @@ -580,7 +580,7 @@ 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) + PowerControl(CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE/* Only for wp6*/, closeDelayTime) #endif // USING_PLZ #endif // USING_N938 { From d8ab5050b3fff105a29bca6d8cfa8cf6fbb80b55 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 3 Mar 2025 21:23:19 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/GPIOControl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/cpp/GPIOControl.h b/app/src/main/cpp/GPIOControl.h index dce30dba..2399ba29 100644 --- a/app/src/main/cpp/GPIOControl.h +++ b/app/src/main/cpp/GPIOControl.h @@ -580,6 +580,7 @@ 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 + // Micro Photo PowerControl(CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE/* Only for wp6*/, closeDelayTime) #endif // USING_PLZ #endif // USING_N938 From 876ab5ab0549459b65fffa490d11d9eca6838740 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 3 Mar 2025 21:23:40 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=8B=8D=E7=85=A7?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=AC=A1=E6=95=B0=E5=A2=9E=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=BD=91=E7=BB=9C=E4=B8=8D=E7=A8=B3=E5=AE=9A?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8B=8D=E7=85=A7=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 45cbe277..c611c0b7 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1620,7 +1620,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c std::vector img; bool netCaptureResult = false; - for (int idx = 0; idx < 3; idx++) + for (int idx = 0; idx < 64; idx++) { netHandle = GetEthnetHandle(); netPhotoInfo.netHandle = netHandle; From 3db0d0387bb9583655194cb1bd332b9f0618d9f1 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 3 Mar 2025 21:24:34 +0800 Subject: [PATCH 4/9] Update version to 1.3.41 Based Core Version to 1.4.28 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d875392d..0f663262 100644 --- a/app/build.gradle +++ b/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 = 41 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From e66667eb1192716c955ffad782d5b881c03e1bcb Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 4 Mar 2025 14:31:11 +0800 Subject: [PATCH 5/9] Update version to 1.3.42 Based Core Version to 1.4.29 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0f663262..ac1fc262 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ plugins { // 10,00,000 major-minor-build def AppMajorVersion = 1 def AppMinorVersion = 3 -def AppBuildNumber = 41 +def AppBuildNumber = 42 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From 148ce5cb57dc0966179bae164f485f0b448457db Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 4 Mar 2025 15:13:19 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=80=BB=E7=BA=BF=E7=94=B5=E5=8E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xypower/mpmaster/MpMasterService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index c5b90bbb..bab3c046 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -1060,7 +1060,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); } From 515864c93d52f2958bd77d5c6340b90527917b84 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 4 Mar 2025 15:28:59 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=BF=83=E8=B7=B3=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/xypower/mpapp/MicroPhotoService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index f0c312e8..19d6aede 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/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); From 2c46504b364415dd87da788c74de7e3c7de47121 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 4 Mar 2025 15:29:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=88=87=E5=9B=9E=E5=8D=A11=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=BB=E5=8A=A8=E5=8F=91=E8=B5=B7=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E5=BF=83=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xypower/mpmaster/MpMasterService.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index bab3c046..6087ba31 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/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"; @@ -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) { From 853e556d8aa982c8266d1b8dac3956d924acd2c6 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 4 Mar 2025 15:30:31 +0800 Subject: [PATCH 9/9] Update version to 1.3.43 Based Core Version to 1.4.29 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ac1fc262..1c36f365 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ plugins { // 10,00,000 major-minor-build def AppMajorVersion = 1 def AppMinorVersion = 3 -def AppBuildNumber = 42 +def AppBuildNumber = 43 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber