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" />
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/zoomRatio" />
修改规约
修改规约后,图像参数、采样参数、拍照时间表、短视频参数将被清除,确认要修改吗?
-
+ 放大
通道设置
左上 OSD
右上 OSD
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 @@
+
+
+
+ - 1.0
+ - 1.5
+ - 2.0
+ - 2.5
+ - 3.0
+ - 3.5
+ - 4.0
+
+
\ No newline at end of file