From 6e337a986f1e23cf684eb6d3369b0a9d45aababf Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Tue, 7 Jan 2025 11:53:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BF=83=E8=B7=B3=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E5=B0=8F=E4=BA=8E10min=E6=97=B6=EF=BC=8C=E8=BF=90=E7=BB=B4580?= =?UTF-8?q?=E7=A7=92=E6=9C=AA=E6=94=B6=E5=88=B0=E5=BF=83=E8=B7=B3=E6=89=8D?= =?UTF-8?q?=E9=87=8D=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xypower/mpmaster/MpMasterService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 0b9219f2..2ba8944a 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -390,9 +390,6 @@ public class MpMasterService extends Service { public boolean shouldSyncTime() { return mSyncTime; } public void startMpApp() { - if (true) { - return; - } try { final Context context = getApplicationContext(); long ts = System.currentTimeMillis(); @@ -422,7 +419,7 @@ public class MpMasterService extends Service { long tempduration = mMpHeartbeatDuration; if(mMpHeartbeatDuration < 600000) - tempduration = 300000; + tempduration = 290000; if (mPreviousMpHbTime <= ts && ts - mPreviousMpHbTime > tempduration * 2) { // MpApp is not running if (ts - mTimeToStartMpApp >= 1800000) { From 8dbe00c8f961abb74c94f0743a9db9ab6c60a4c8 Mon Sep 17 00:00:00 2001 From: jxjajs Date: Tue, 7 Jan 2025 16:28:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=EF=BC=8C=E5=8C=85=E5=8F=B7?= =?UTF-8?q?=E4=B8=8D=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/SensorsProtocol.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index c57bff12..69624008 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -1901,7 +1901,7 @@ void CameraPhotoPortDataProcess(SIO_PARAM_SERIAL_DEF *curserial) iNo = rtumsg.MsgData[i + 1] + rtumsg.MsgData[i] * 256; if((0xFF == rtumsg.MsgData[i+2]) && (3 == datalen)) { - curserial->SerialCmdidx = iNo + 1; + curserial->SerialCmdidx = iNo; break; }