From dc4c3a93c9b03f74312b8ff7fe357b5db3104be9 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Tue, 23 Apr 2024 12:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=8D=E7=85=A7=E6=94=BE?=
 =?UTF-8?q?=E5=A4=A7=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xypower/mpapp/ChannelActivity.java    | 15 +++++++++++++
 app/src/main/res/layout/activity_channel.xml  | 22 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/values/zoom_ratios.xml       | 12 ++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values/zoom_ratios.xml

diff --git a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
index b1d31b46..9a39066d 100644
--- a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
+++ b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java
@@ -26,6 +26,8 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
+import java.text.NumberFormat;
+
 import android.widget.AdapterView;
 
 public class ChannelActivity extends AppCompatActivity {
@@ -161,6 +163,19 @@ public class ChannelActivity extends AppCompatActivity {
             }
             binding.exposuretime.setText(Integer.toString(jsonObject.optInt("exposureTime", 0)));
             binding.sensitivity.setText(Integer.toString(jsonObject.optInt("sensibility", 0)));
+            binding.btnZoom.setChecked(jsonObject.optInt("zoom", 0) == 1);
+
+            NumberFormat nf = NumberFormat.getNumberInstance();
+            nf.setMaximumFractionDigits(1);
+            nf.setMinimumFractionDigits(1);
+            String zoomRatio = nf.format(jsonObject.optDouble("zoomRatio", 1.0));
+            for (int idx = 0; idx < binding.zoomRatio.getCount(); idx++) {
+                String text = (String)binding.zoomRatio.getItemAtPosition(idx);
+                if (TextUtils.equals(text, zoomRatio)) {
+                    binding.zoomRatio.setSelection(idx);
+                    break;
+                }
+            }
             binding.orientations.setSelection(jsonObject.optInt("orientation", 0));
             binding.recognization.setSelection(jsonObject.optInt("recognization", 0));
             if (jsonObject.has("cameraId")) {
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index 7b5eddf1..f5d1986c 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -226,6 +226,26 @@
         app:layout_constraintStart_toEndOf="@+id/orientations"
         app:layout_constraintTop_toTopOf="@+id/orientations" />
 
+    <Switch
+        android:id="@+id/btnZoom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin_small"
+        android:text="@string/channel_zoom"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/orientations" />
+
+    <Spinner
+        android:id="@+id/zoomRatio"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/Widget.AppCompat.Spinner.Underlined"
+        android:entries="@array/zoom_ratios"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        app:layout_constraintStart_toEndOf="@+id/btnZoom"
+        app:layout_constraintTop_toTopOf="@+id/btnZoom" />
+
     <EditText
         android:id="@+id/osdLeftTop"
         android:layout_width="match_parent"
@@ -238,7 +258,7 @@
         android:hint="@string/osd_left_top"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/recognization" />
+        app:layout_constraintTop_toBottomOf="@+id/zoomRatio" />
 
     <EditText
         android:id="@+id/osdRightTop"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eeaa527c..c822271e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="confirm_change_protocol">修改规约</string>
     <string name="confirm_change_protocol_text">修改规约后，图像参数、采样参数、拍照时间表、短视频参数将被清除，确认要修改吗？</string>
 
-
+    <string name="channel_zoom">放大</string>
     <string name="activity_channel_title">通道设置</string>
     <string name="osd_left_top">左上 OSD</string>
     <string name="osd_right_top">右上 OSD</string>
diff --git a/app/src/main/res/values/zoom_ratios.xml b/app/src/main/res/values/zoom_ratios.xml
new file mode 100644
index 00000000..285c8a61
--- /dev/null
+++ b/app/src/main/res/values/zoom_ratios.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="zoom_ratios">
+        <item>1.0</item>
+        <item>1.5</item>
+        <item>2.0</item>
+        <item>2.5</item>
+        <item>3.0</item>
+        <item>3.5</item>
+        <item>4.0</item>
+    </string-array>
+</resources>
\ No newline at end of file