diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index af25e1c1..02e4696b 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -154,6 +154,7 @@ android:layout_marginTop="@dimen/activity_vertical_margin_small" android:text="Start" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/heartbeat" @@ -165,6 +166,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:enabled="false" android:text="Stop" app:layout_constraintStart_toEndOf="@+id/btnStartServ" @@ -176,6 +178,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="Save" app:layout_constraintStart_toEndOf="@+id/btnStopServ" app:layout_constraintTop_toTopOf="@+id/btnStartServ" /> @@ -186,6 +189,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="通道设置" app:layout_constraintStart_toEndOf="@+id/btnSaveCfg" app:layout_constraintTop_toTopOf="@+id/btnStartServ" /> @@ -198,6 +202,7 @@ android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="@string/btn_tp_ch1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/btnStartServ" /> @@ -208,6 +213,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="@string/btn_tp_ch2" app:layout_constraintStart_toEndOf="@+id/btnTakePhoto" app:layout_constraintTop_toTopOf="@+id/btnTakePhoto" /> @@ -218,6 +224,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="@string/btn_tp_ch3" app:layout_constraintStart_toEndOf="@+id/btnTakePhoto2" app:layout_constraintTop_toTopOf="@+id/btnTakePhoto" /> @@ -228,6 +235,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="@string/btn_tp_ch4" app:layout_constraintStart_toEndOf="@+id/btnTakePhoto3" app:layout_constraintTop_toTopOf="@+id/btnTakePhoto" /> @@ -239,6 +247,7 @@ android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin_small" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="@string/btn_tv_ch1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/btnTakePhoto" /> @@ -249,6 +258,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="@string/btn_tv_ch2" app:layout_constraintStart_toEndOf="@+id/takeVideoBtn" app:layout_constraintTop_toTopOf="@+id/takeVideoBtn" /> @@ -259,6 +269,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="@string/btn_tv_ch3" app:layout_constraintStart_toEndOf="@+id/takeVideoBtn2" app:layout_constraintTop_toTopOf="@+id/takeVideoBtn" /> @@ -269,6 +280,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" android:text="@string/btn_tv_ch4" app:layout_constraintStart_toEndOf="@+id/takeVideoBtn3" app:layout_constraintTop_toTopOf="@+id/takeVideoBtn" /> @@ -281,6 +293,7 @@ android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin_small" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/takeVideoBtn" /> @@ -291,6 +304,7 @@ android:text="@string/main_restart_app" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" app:layout_constraintStart_toEndOf="@+id/btnSendHb" app:layout_constraintTop_toTopOf="@+id/btnSendHb" /> @@ -301,6 +315,7 @@ android:text="@string/main_reboot" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" app:layout_constraintStart_toEndOf="@+id/btnRestartApp" app:layout_constraintTop_toTopOf="@+id/btnSendHb" /> @@ -311,6 +326,7 @@ android:text="@string/main_camera_info" android:layout_marginStart="@dimen/activity_horizontal_margin" android:minWidth="@dimen/activity_btn_min_width" + android:minHeight="@dimen/activity_btn_min_height" app:layout_constraintStart_toEndOf="@+id/btnReboot" app:layout_constraintTop_toTopOf="@+id/btnSendHb" /> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 5991ad1a..dcd3a378 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -7,4 +7,5 @@ 8dp 8dp 72dp + 28dp