From 7c7cc3c4bd7cb04c7b829ca9f8f772202f293d29 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Wed, 10 Jul 2024 11:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=8D=E7=85=A7=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xypower/mpapp/ChannelActivity.java  | 16 ++++++++++++++++
 app/src/main/res/layout/activity_channel.xml     | 11 +++++++++++
 app/src/main/res/values/requestTemplates.xml     | 11 +++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 app/src/main/res/values/requestTemplates.xml

diff --git a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
index 812a12e8..bfb21938 100644
--- a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
+++ b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
@@ -171,6 +171,15 @@ public class ChannelActivity extends AppCompatActivity {
                     break;
                 }
             }
+            int requestTemplate = jsonObject.optInt("requestTemplate", 2);
+            String requestTemplateText = Integer.toString(requestTemplate) + "-";
+            for (int idx = 0; idx < binding.requestTemplates.getCount(); idx++) {
+                String text = (String)binding.requestTemplates.getItemAtPosition(idx);
+                if (text.startsWith(requestTemplateText)) {
+                    binding.requestTemplates.setSelection(idx);
+                    break;
+                }
+            }
             binding.exposuretime.setText(Integer.toString(jsonObject.optInt("exposureTime", 0)));
             binding.sensitivity.setText(Integer.toString(jsonObject.optInt("sensitivity", 0)));
             binding.btnZoom.setChecked(jsonObject.optInt("zoom", 0) == 1);
@@ -272,6 +281,13 @@ public class ChannelActivity extends AppCompatActivity {
             sceneModeText = sceneModeText.substring(0, sceneModeText.indexOf(" -"));
             sceneMode = Integer.parseInt(sceneModeText);
             jsonObject.put("sceneMode", sceneMode);
+
+            int requestTemplate = 2;
+            String requestTemplateText = (String)binding.requestTemplates.getSelectedItem();
+            requestTemplateText = requestTemplateText.substring(0, requestTemplateText.indexOf("-"));
+            requestTemplate = Integer.parseInt(requestTemplateText);
+            jsonObject.put("requestTemplate", requestTemplate);
+
             jsonObject.put("exposureTime", Integer.parseInt(binding.exposuretime.getText().toString()));
             jsonObject.put("sensitivity", Integer.parseInt(binding.sensitivity.getText().toString()));
             jsonObject.put("zoom", binding.btnZoom.isChecked() ? 1 : 0);
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index 449745a6..221a13c4 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -40,6 +40,17 @@
         app:layout_constraintStart_toEndOf="@+id/cameraId"
         app:layout_constraintTop_toTopOf="@+id/cameraId" />
 
+    <Spinner
+        android:id="@+id/requestTemplates"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/Widget.AppCompat.Spinner.Underlined"
+        android:entries="@array/requestTemplate"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        app:layout_constraintStart_toEndOf="@+id/btnUsbCamera"
+        app:layout_constraintTop_toTopOf="@+id/cameraId" />
+
     <Button
         android:id="@+id/btnSave"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/requestTemplates.xml b/app/src/main/res/values/requestTemplates.xml
new file mode 100644
index 00000000..b55c192c
--- /dev/null
+++ b/app/src/main/res/values/requestTemplates.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="requestTemplates">
+        <item>1-预览</item>
+        <item>2-静态抓拍</item>
+        <item>3-录像</item>
+        <item>4-快照</item>
+        <item>5-零延时拍照</item>
+        <item>6-手工</item>
+    </string-array>
+</resources>
\ No newline at end of file