xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

通道设置增加短视频相关的配置项

Browse Source
serial
BlueMatthew 1 year ago
parent f873808940
commit 5fef870e05
3 changed files with 125 additions and 55 deletions
Show Stats Download Patch File Download Diff File

31
app/src/main/java/com/xypower/mpapp/ChannelActivity.java
Unescape Escape View File

@ -173,6 +173,21 @@ public class ChannelActivity extends AppCompatActivity {
} else { } else {
binding.quality.setText(""); binding.quality.setText("");
} }
if (jsonObject.has("videoCX")) {
binding.videoCX.setText(Integer.toString(jsonObject.optInt("videoCX")));
} else {
binding.videoCX.setText("");
}
if (jsonObject.has("videoCY")) {
binding.videoCY.setText(Integer.toString(jsonObject.optInt("videoCY")));
} else {
binding.videoCY.setText("");
}
if (jsonObject.has("videoDuration")) {
binding.videoDuration.setText(Integer.toString(jsonObject.optInt("videoDuration")));
} else {
binding.videoDuration.setText("");
}
JSONObject osdJsonObj = jsonObject.optJSONObject("osd"); JSONObject osdJsonObj = jsonObject.optJSONObject("osd");
if (osdJsonObj != null) { if (osdJsonObj != null) {
@ -236,6 +251,22 @@ public class ChannelActivity extends AppCompatActivity {
jsonObject.remove("quality"); jsonObject.remove("quality");
} }
if (!TextUtils.isEmpty(binding.videoCX.getText().toString())) {
jsonObject.put("videoCX", Integer.parseInt(binding.videoCX.getText().toString()));
} else {
jsonObject.remove("videoCX");
}
if (!TextUtils.isEmpty(binding.videoCY.getText().toString())) {
jsonObject.put("videoCY", Integer.parseInt(binding.videoCY.getText().toString()));
} else {
jsonObject.remove("videoCY");
}
if (!TextUtils.isEmpty(binding.videoDuration.getText().toString())) {
jsonObject.put("videoDuration", Integer.parseInt(binding.videoDuration.getText().toString()));
} else {
jsonObject.remove("videoDuration");
}
JSONObject osdJsonObj = jsonObject.optJSONObject("osd"); JSONObject osdJsonObj = jsonObject.optJSONObject("osd");
if (osdJsonObj == null) { if (osdJsonObj == null) {
osdJsonObj = jsonObject.put("osd", new JSONObject()); osdJsonObj = jsonObject.put("osd", new JSONObject());

146
app/src/main/res/layout/activity_channel.xml
Unescape Escape View File

@ -12,8 +12,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Widget.AppCompat.Spinner.Underlined" style="@style/Widget.AppCompat.Spinner.Underlined"
android:entries="@array/channels" android:entries="@array/channels"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/activity_vertical_margin"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -23,9 +23,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/channel_cfg_camera_id" android:hint="@string/channel_cfg_camera_id"
android:inputType="numberDecimal" android:inputType="none|numberDecimal"
android:layout_marginStart="6dp" android:layout_marginStart="@dimen/activity_horizontal_margin_small"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin"
app:layout_constraintStart_toEndOf="@+id/channels" app:layout_constraintStart_toEndOf="@+id/channels"
app:layout_constraintTop_toTopOf="@+id/channels" app:layout_constraintTop_toTopOf="@+id/channels"
app:layout_constraintBottom_toBottomOf="@+id/channels" /> app:layout_constraintBottom_toBottomOf="@+id/channels" />
@ -34,8 +34,8 @@
android:id="@+id/btnUsbCamera" android:id="@+id/btnUsbCamera"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin"
android:text="@string/channel_cfg_usb_camera" android:text="@string/channel_cfg_usb_camera"
app:layout_constraintStart_toEndOf="@+id/cameraId" app:layout_constraintStart_toEndOf="@+id/cameraId"
app:layout_constraintTop_toTopOf="@+id/cameraId" /> app:layout_constraintTop_toTopOf="@+id/cameraId" />
@ -44,33 +44,33 @@
android:id="@+id/btnSave" android:id="@+id/btnSave"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="12dp" android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin"
android:text="@string/btn_save" android:text="@string/btn_save"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<EditText <EditText
android:id="@+id/resolutionCX" android:id="@+id/resolutionCX"
android:layout_width="120dp" android:layout_width="80dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/channel_cfg_width" android:hint="@string/channel_cfg_width"
android:inputType="numberDecimal" android:inputType="none|numberDecimal"
android:layout_marginStart="6dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnSave" /> app:layout_constraintTop_toBottomOf="@+id/btnSave" />
<EditText <EditText
android:id="@+id/resolutionCY" android:id="@+id/resolutionCY"
android:layout_width="120dp" android:layout_width="80dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/channel_cfg_height" android:hint="@string/channel_cfg_height"
android:inputType="numberDecimal" android:inputType="none|numberDecimal"
android:layout_marginStart="6dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
app:layout_constraintStart_toEndOf="@+id/resolutionCX" app:layout_constraintStart_toEndOf="@+id/resolutionCX"
app:layout_constraintTop_toBottomOf="@+id/btnSave" /> app:layout_constraintTop_toBottomOf="@+id/btnSave" />
@ -80,18 +80,42 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/channel_cfg_quality" android:hint="@string/channel_cfg_quality"
android:inputType="numberDecimal" android:inputType="none|numberDecimal"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
app:layout_constraintStart_toEndOf="@+id/resolutionCY" app:layout_constraintStart_toEndOf="@+id/resolutionCY"
app:layout_constraintTop_toBottomOf="@+id/btnSave" /> app:layout_constraintTop_toBottomOf="@+id/btnSave" />
<EditText
android:id="@+id/videoCX"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/channel_cfg_video_width"
android:inputType="none|numberDecimal"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin_small"
app:layout_constraintStart_toEndOf="@id/quality"
app:layout_constraintTop_toBottomOf="@+id/btnSave" />
<EditText
android:id="@+id/videoCY"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/channel_cfg_video_height"
android:inputType="none|numberDecimal"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin_small"
app:layout_constraintStart_toEndOf="@+id/videoCX"
app:layout_constraintTop_toBottomOf="@+id/btnSave" />
<Switch <Switch
android:id="@+id/btnAutoExplosure" android:id="@+id/btnAutoExplosure"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
android:text="@string/channel_cfg_auto_exposure" android:text="@string/channel_cfg_auto_exposure"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/resolutionCX" /> app:layout_constraintTop_toBottomOf="@+id/resolutionCX" />
@ -100,8 +124,8 @@
android:id="@+id/btnAutoFocus" android:id="@+id/btnAutoFocus"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
android:text="@string/channel_cfg_auto_focus" android:text="@string/channel_cfg_auto_focus"
app:layout_constraintStart_toEndOf="@+id/btnAutoExplosure" app:layout_constraintStart_toEndOf="@+id/btnAutoExplosure"
app:layout_constraintTop_toBottomOf="@+id/resolutionCX" /> app:layout_constraintTop_toBottomOf="@+id/resolutionCX" />
@ -110,8 +134,8 @@
android:id="@+id/btnHdrMode" android:id="@+id/btnHdrMode"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
android:text="HDR" android:text="HDR"
app:layout_constraintStart_toEndOf="@+id/btnAutoFocus" app:layout_constraintStart_toEndOf="@+id/btnAutoFocus"
app:layout_constraintTop_toBottomOf="@+id/resolutionCX" /> app:layout_constraintTop_toBottomOf="@+id/resolutionCX" />
@ -120,8 +144,8 @@
android:id="@+id/btnNightMode" android:id="@+id/btnNightMode"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
android:text="Night" android:text="Night"
app:layout_constraintStart_toEndOf="@+id/btnHdrMode" app:layout_constraintStart_toEndOf="@+id/btnHdrMode"
app:layout_constraintTop_toBottomOf="@+id/resolutionCX" /> app:layout_constraintTop_toBottomOf="@+id/resolutionCX" />
@ -131,7 +155,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="曝光时间(ms)" android:text="曝光时间(ms)"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/exposuretime" app:layout_constraintTop_toTopOf="@+id/exposuretime"
app:layout_constraintBottom_toBottomOf="@+id/exposuretime" /> app:layout_constraintBottom_toBottomOf="@+id/exposuretime" />
@ -141,9 +165,9 @@
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="numberDecimal" android:inputType="none|numberDecimal"
android:layout_marginStart="6dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
app:layout_constraintStart_toEndOf="@+id/textViewExplosure" app:layout_constraintStart_toEndOf="@+id/textViewExplosure"
app:layout_constraintTop_toBottomOf="@+id/btnAutoExplosure" /> app:layout_constraintTop_toBottomOf="@+id/btnAutoExplosure" />
@ -152,7 +176,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="ISO" android:text="ISO"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
app:layout_constraintStart_toEndOf="@+id/exposuretime" app:layout_constraintStart_toEndOf="@+id/exposuretime"
app:layout_constraintTop_toTopOf="@+id/exposuretime" app:layout_constraintTop_toTopOf="@+id/exposuretime"
app:layout_constraintBottom_toBottomOf="@+id/exposuretime" /> app:layout_constraintBottom_toBottomOf="@+id/exposuretime" />
@ -162,18 +186,30 @@
android:layout_width="96dp" android:layout_width="96dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="numberDecimal" android:inputType="none|numberDecimal"
android:layout_marginStart="4dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
app:layout_constraintStart_toEndOf="@+id/textViewSensitivity" app:layout_constraintStart_toEndOf="@+id/textViewSensitivity"
app:layout_constraintTop_toTopOf="@+id/exposuretime" app:layout_constraintTop_toTopOf="@+id/exposuretime"
app:layout_constraintBottom_toBottomOf="@+id/exposuretime" /> app:layout_constraintBottom_toBottomOf="@+id/exposuretime" />
<EditText
android:id="@+id/videoDuration"
android:layout_width="96dp"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="none|numberDecimal"
android:hint="@string/channel_cfg_video_duration"
android:layout_marginStart="@dimen/activity_horizontal_margin"
app:layout_constraintStart_toEndOf="@+id/sensitivity"
app:layout_constraintTop_toTopOf="@+id/exposuretime"
app:layout_constraintBottom_toBottomOf="@+id/exposuretime" />
<TextView <TextView
android:id="@+id/textViewOrientations" android:id="@+id/textViewOrientations"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="旋转角度:" android:text="旋转角度:"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/orientations" app:layout_constraintTop_toTopOf="@+id/orientations"
app:layout_constraintBottom_toBottomOf="@+id/orientations" /> app:layout_constraintBottom_toBottomOf="@+id/orientations" />
@ -184,8 +220,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Widget.AppCompat.Spinner.Underlined" style="@style/Widget.AppCompat.Spinner.Underlined"
android:entries="@array/orientations" android:entries="@array/orientations"
android:layout_marginStart="6dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
app:layout_constraintStart_toEndOf="@+id/textViewOrientations" app:layout_constraintStart_toEndOf="@+id/textViewOrientations"
app:layout_constraintTop_toBottomOf="@+id/exposuretime" /> app:layout_constraintTop_toBottomOf="@+id/exposuretime" />
@ -195,7 +231,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Widget.AppCompat.Spinner.Underlined" style="@style/Widget.AppCompat.Spinner.Underlined"
android:entries="@array/recog_options" android:entries="@array/recog_options"
android:layout_marginStart="6dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
app:layout_constraintStart_toEndOf="@+id/orientations" app:layout_constraintStart_toEndOf="@+id/orientations"
app:layout_constraintTop_toTopOf="@+id/orientations" /> app:layout_constraintTop_toTopOf="@+id/orientations" />
@ -204,10 +240,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="text" android:inputType="none|text"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="12dp" android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
android:hint="@string/osd_left_top" android:hint="@string/osd_left_top"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -218,10 +254,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="text" android:inputType="none|text"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="12dp" android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
android:hint="@string/osd_right_top" android:hint="@string/osd_right_top"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -232,10 +268,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="text" android:inputType="none|text"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="12dp" android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
android:hint="@string/osd_right_bottom" android:hint="@string/osd_right_bottom"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -246,10 +282,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="text" android:inputType="none|text"
android:layout_marginStart="12dp" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="12dp" android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginTop="6dp" android:layout_marginTop="@dimen/activity_vertical_margin_small"
android:hint="@string/osd_left_bottom" android:hint="@string/osd_left_bottom"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

3
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -35,8 +35,11 @@
<string name="channel_cfg_auto_focus">自动对焦</string> <string name="channel_cfg_auto_focus">自动对焦</string>
<string name="channel_cfg_width">照片宽</string> <string name="channel_cfg_width">照片宽</string>
<string name="channel_cfg_height">照片高</string> <string name="channel_cfg_height">照片高</string>
<string name="channel_cfg_video_width">短视频宽</string>
<string name="channel_cfg_video_height">短视频高</string>
<string name="channel_cfg_quality">压缩率(50-100)</string> <string name="channel_cfg_quality">压缩率(50-100)</string>
<string name="channel_cfg_usb_camera">USB Camera</string> <string name="channel_cfg_usb_camera">USB Camera</string>
<string name="channel_cfg_video_duration">短视频时长（分）</string>
<!-- TODO: Remove or change this placeholder text --> <!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment">Hello blank fragment</string>
<string name="record">Record</string> <string name="record">Record</string>

Write Preview
Loading…
Cancel
Save