From 2aef7bcc33e8d912dc6fef79fec508d8d569b326 Mon Sep 17 00:00:00 2001
From: BlueMatthew <wakinchau@msn.com>
Date: Fri, 12 Jan 2024 13:48:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                   |  2 +-
 .../main/java/com/xypower/mpapp/MainActivity.java  | 14 ++++++++------
 .../java/com/xypower/mpapp/MicroPhotoService.java  |  4 ++++
 mpmaster/build.gradle                              |  2 +-
 mpmaster/src/main/AndroidManifest.xml              |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 637b49bb..4251ba39 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 = 0
-def AppBuildNumber = 48
+def AppBuildNumber = 49
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber
diff --git a/app/src/main/java/com/xypower/mpapp/MainActivity.java b/app/src/main/java/com/xypower/mpapp/MainActivity.java
index e86e3412..191c0fe3 100644
--- a/app/src/main/java/com/xypower/mpapp/MainActivity.java
+++ b/app/src/main/java/com/xypower/mpapp/MainActivity.java
@@ -426,7 +426,7 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        if (!TextUtils.isEmpty(appConfig.cmdid) && !TextUtils.isEmpty(appConfig.server) && appConfig.port != 0) {
+        if (!MicroPhotoService.isRunning && !TextUtils.isEmpty(appConfig.cmdid) && !TextUtils.isEmpty(appConfig.server) && appConfig.port != 0) {
             Handler handler = new Handler();
             Runnable runnable = new Runnable() {
                 @Override
@@ -436,8 +436,10 @@ public class MainActivity extends AppCompatActivity {
                     }
                 }
             };
-            handler.postDelayed(runnable, noDelay != 0 ? 100 : 5000);
+            handler.postDelayed(runnable, noDelay != 0 ? 1000 : 5000);
         }
+        binding.btnStartServ.setEnabled(!MicroPhotoService.isRunning);
+        binding.btnStopServ.setEnabled(MicroPhotoService.isRunning);
 
         binding.tcpudp.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -559,9 +561,9 @@ public class MainActivity extends AppCompatActivity {
     }
 
     @Override
-    protected void onStart() {
+    protected void onResume() {
         // call the superclass method first
-        super.onStart();
+        super.onResume();
 
         String logFilePath = MicroPhotoContext.buildAppDir(this.getApplicationContext());
         logFilePath += "logs/log.txt";
@@ -572,9 +574,9 @@ public class MainActivity extends AppCompatActivity {
     }
 
     @Override
-    protected void onStop() {
+    protected void onPause() {
         // call the superclass method first
-        super.onStop();
+        super.onPause();
 
         if (mLogFileObserver != null) {
             mLogFileObserver.stopWatching();
diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index acda8280..7e1c9901 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -137,6 +137,8 @@ public class MicroPhotoService extends Service {
 
     private String mModelName = null;
 
+    public static boolean isRunning = false;
+
     public MicroPhotoService() {
     }
     @Override
@@ -215,6 +217,7 @@ public class MicroPhotoService extends Service {
         if (mNativeHandle != 0) {
             uninit(mNativeHandle);
             mNativeHandle = 0;
+            isRunning = false;
         }
 
         getApplicationContext().unregisterReceiver(mAlarmReceiver);
@@ -686,6 +689,7 @@ public class MicroPhotoService extends Service {
                 service.mNativeHandle = init(appPath, server, port, cmdid, protocol, networkProtocol, 0);
 
                 if (service.mNativeHandle !=0) {
+                    isRunning = true;
                     service.mCmdid = cmdid;
                     Date date = new Date();
                     long nowTs = date.getTime() / 1000;
diff --git a/mpmaster/build.gradle b/mpmaster/build.gradle
index 621ee70e..63a36de6 100644
--- a/mpmaster/build.gradle
+++ b/mpmaster/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 def AppMajorVersion = 1
 def AppMinorVersion = 0
-def AppBuildNumber = 8
+def AppBuildNumber = 9
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber
diff --git a/mpmaster/src/main/AndroidManifest.xml b/mpmaster/src/main/AndroidManifest.xml
index a4819bbe..b91d32cb 100644
--- a/mpmaster/src/main/AndroidManifest.xml
+++ b/mpmaster/src/main/AndroidManifest.xml
@@ -114,7 +114,7 @@
             android:enabled="true"
             android:exported="true"
             android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
-            <intent-filter android:priority="90000">
+            <intent-filter android:priority="80000">
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.REBOOT" />