From d23051a10b0af06dcff4550b6345b5e512b86ffb Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Wed, 15 May 2024 19:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E9=81=93=E8=AE=BE=E7=BD=AE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE=E6=94=B9=E6=88=90=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=B9=B6=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/xypower/mpapp/ChannelActivity.java | 9 +++++++++
 app/src/main/res/layout/activity_channel.xml             | 2 +-
 app/src/main/res/values/strings.xml                      | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
index 9fb165ca..812a12e8 100644
--- a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
+++ b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -69,6 +70,14 @@ public class ChannelActivity extends AppCompatActivity {
                 int channel = binding.channels.getSelectedItemPosition() + 1;
                 saveChannelParams(channel);
                 MicroPhotoService.updateConfigs(ChannelActivity.this.getApplicationContext());
+                Handler handler = new Handler();
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        ChannelActivity.this.finish();
+                    }
+                }, 200);
+
             }
         });
 
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index 45f4db33..449745a6 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -46,7 +46,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:text="@string/btn_save"
+        android:text="@string/btn_save_close"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c636520..1fe8f48b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
     <string name="osd_left_bottom">左下 OSD</string>
     <string name="channel_cfg_camera_id">Camera Id</string>
     <string name="btn_save">保存</string>
+    <string name="btn_save_close">保存并关闭</string>
     <string name="btn_ok">确定</string>
     <string name="btn_cancel">取消</string>
     <string name="btn_tp_ch1">通道1</string>