p9vt2p3ui
/
ISRR
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

更新主界面布局、重构设置页面将其修改为关于页面，上传相关美术素材

Browse Source
chenghonghao_branch
Marcus 1 year ago
parent 8dbd0d8819
commit d525a4828d
8 changed files with 58 additions and 581 deletions
Show Stats Download Patch File Download Diff File

BIN
src/app/src/main/res/drawable-hdpi/background.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 90 KiB

BIN
src/app/src/main/res/drawable-hdpi/settings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
src/app/src/main/res/drawable-hdpi/settings_background.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 148 KiB

15
src/app/src/main/res/drawable/back_circle.xml
Unescape View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
>
<corners
android:radius="100dp"
/>
<solid
android:color="#ffffff"
/>
<size
android:width="100dp"
android:height="100dp"
/>
</shape>

13
src/app/src/main/res/drawable/corner_rectangle.xml
Unescape View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffffff"
/>
<stroke
android:width="1dp"
android:color="#bbbbbb" />
<corners
android:bottomLeftRadius="15dp"
android:bottomRightRadius="15dp"
android:topLeftRadius="15dp"
android:topRightRadius="15dp" />
</shape>

12
src/app/src/main/res/drawable/small_corner_rectangle.xml
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffffff" />
<stroke
android:width="1dp"
android:color="#bbbbbb" />
<corners
android:bottomLeftRadius="7dp"
android:bottomRightRadius="7dp"
android:topLeftRadius="7dp"
android:topRightRadius="7dp" />
</shape>

573
src/app/src/main/res/layout/activity_settings.xml
Unescape View File

@ -4,579 +4,14 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/settings_background"
tools:context="wificar.SettingsActivity"> tools:context="wificar.SettingsActivity">
<TextView
android:id="@+id/textView57"
android:layout_width="139dp"
android:layout_height="30dp"
android:layout_marginStart="15dp"
android:gravity="center"
android:text="云台水平反转："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/textView56"
app:layout_constraintStart_toEndOf="@+id/checkBox"
app:layout_constraintTop_toTopOf="@+id/textView56"
app:layout_constraintVertical_bias="0.0" />
<CheckBox
android:id="@+id/checkBox3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/textView57"
app:layout_constraintStart_toEndOf="@+id/textView57"
app:layout_constraintTop_toTopOf="@+id/textView57" />
<Button
android:id="@+id/button6"
android:layout_width="100dp"
android:layout_height="35dp"
android:layout_marginStart="130dp"
android:text="绝对位置模式"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/textView" />
<LinearLayout
android:id="@+id/poseCheckLayout"
android:layout_width="270dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@+id/button7"
app:layout_constraintStart_toEndOf="@+id/button7"
app:layout_constraintTop_toTopOf="@+id/button7"
app:layout_constraintVertical_bias="1.0">
<Button
android:id="@+id/save"
android:layout_width="135dp"
android:layout_height="40dp"
android:text="保存"
android:textSize="15sp"
android:textStyle="bold" />
<Button
android:id="@+id/defaultsetting"
android:layout_width="135dp"
android:layout_height="40dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="50dp"
android:text="恢复默认设置"
android:textSize="15sp"
android:textStyle="bold"
android:visibility="visible" />
</LinearLayout>
<CheckBox
android:id="@+id/checkBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/textView56"
app:layout_constraintStart_toEndOf="@+id/textView56"
app:layout_constraintTop_toTopOf="@+id/textView56" />
<TextView
android:id="@+id/textView56"
android:layout_width="139dp"
android:layout_height="30dp"
android:layout_marginTop="25dp"
android:gravity="center"
android:text="开启触屏云台："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/textView54"
app:layout_constraintTop_toBottomOf="@+id/textView54" />
<Button
android:id="@+id/button7"
android:layout_width="100dp"
android:layout_height="35dp"
android:layout_marginStart="5dp"
android:text="相对位置模式"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/button6"
app:layout_constraintStart_toEndOf="@+id/button6"
app:layout_constraintTop_toTopOf="@+id/button6"
app:layout_constraintVertical_bias="1.0" />
<CheckBox
android:id="@+id/checkBox4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/textView58"
app:layout_constraintStart_toEndOf="@+id/textView58"
app:layout_constraintTop_toTopOf="@+id/textView58" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="68dp"
android:text="云台模式"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView56" />
<TextView
android:id="@+id/textView58"
android:layout_width="139dp"
android:layout_height="30dp"
android:layout_marginStart="4dp"
android:gravity="center"
android:text="云台竖直反转："
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/textView57"
app:layout_constraintStart_toEndOf="@+id/checkBox3"
app:layout_constraintTop_toTopOf="@+id/textView57"
app:layout_constraintVertical_bias="0.0" />
<CheckBox
android:id="@+id/checkBox2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="872dp"
android:layout_marginTop="376dp"
app:layout_constraintStart_toEndOf="@+id/textView56"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/controlPort"
android:layout_width="125dp"
android:layout_height="40dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:text="2001"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView55"
app:layout_constraintStart_toEndOf="@+id/textView55" />
<TextView
android:visibility="gone"
android:id="@+id/textView54"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="视频地址2"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/textView53"
app:layout_constraintTop_toBottomOf="@+id/textView53" />
<EditText
android:id="@+id/videoUrl"
android:layout_width="350dp"
android:layout_height="40dp"
android:clickable="true"
android:ems="10"
android:text="http://192.168.1.1:8080/?action=stream"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView53"
app:layout_constraintStart_toEndOf="@+id/textView53" />
<EditText
android:id="@+id/editTextText48"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView47"
app:layout_constraintStart_toEndOf="@+id/textView51" />
<TextView
android:id="@+id/textView46"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="云台灵敏度"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText25"
app:layout_constraintStart_toEndOf="@+id/editTextText25" />
<TextView
android:id="@+id/textView47"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="右后"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText37"
app:layout_constraintStart_toEndOf="@+id/editTextText37" />
<EditText
android:id="@+id/editTextText44"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView50"
app:layout_constraintStart_toEndOf="@+id/textView50" />
<TextView
android:id="@+id/textView49"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="后退"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/editTextText_left"
app:layout_constraintStart_toEndOf="@+id/editText_forward" />
<EditText
android:id="@+id/editTextText45"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView46"
app:layout_constraintStart_toEndOf="@+id/textView46" />
<TextView
android:id="@+id/textView50"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="右转"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText_left"
app:layout_constraintStart_toEndOf="@+id/editTextText_left" />
<EditText
android:id="@+id/editTextText46"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView47"
app:layout_constraintStart_toEndOf="@+id/textView47" />
<EditText
android:id="@+id/editTextText47"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView52"
app:layout_constraintStart_toEndOf="@+id/textView52" />
<EditText
android:id="@+id/editTextText49"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView49"
app:layout_constraintStart_toEndOf="@+id/textView49" />
<TextView
android:id="@+id/textView52"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="右旋转"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText42"
app:layout_constraintStart_toEndOf="@+id/editTextText42" />
<TextView
android:id="@+id/textView51"
android:layout_width="100dp"
android:layout_height="25dp"
android:gravity="center"
android:text="右前"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/editTextText38"
app:layout_constraintStart_toEndOf="@+id/editTextText38" />
<EditText
android:id="@+id/editTextText38"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView30"
app:layout_constraintStart_toEndOf="@+id/textView41" />
<EditText
android:id="@+id/controlIp"
android:layout_width="125dp"
android:layout_height="40dp"
android:clickable="true"
android:ems="10"
android:text="192.168.1.1"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView44"
app:layout_constraintStart_toEndOf="@+id/textView44" />
<EditText
android:id="@+id/editTextText42"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView45"
app:layout_constraintStart_toEndOf="@+id/textView42" />
<EditText
android:id="@+id/editTextText_left"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView41"
app:layout_constraintStart_toEndOf="@+id/textView25" />
<EditText
android:id="@+id/editTextText25"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView45"
app:layout_constraintStart_toEndOf="@+id/textView45" />
<EditText
android:id="@+id/editText_forward"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toTopOf="@+id/textView25"
app:layout_constraintStart_toEndOf="@+id/textView25" />
<EditText
android:id="@+id/editTextText37"
android:layout_width="125dp"
android:layout_height="25dp"
android:clickable="true"
android:ems="10"
android:includeFontPadding="false"
android:inputType="text"
android:paddingLeft="16dp"
android:paddingTop="8dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textSize="16dp"
app:layout_constraintBottom_toBottomOf="@+id/textView30"
app:layout_constraintStart_toEndOf="@+id/textView30" />
<TextView
android:id="@+id/textView30"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="左后"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView41" />
<TextView
android:id="@+id/textView42"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="左旋转"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView30" />
<TextView
android:id="@+id/textView45"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="停止"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView42" />
<TextView
android:id="@+id/textView55"
android:layout_width="100dp"
android:layout_height="40dp"
android:gravity="center"
android:text="控制端口"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/controlIp"
app:layout_constraintStart_toEndOf="@+id/controlIp" />
<TextView
android:id="@+id/textView44"
android:layout_width="100dp"
android:layout_height="40dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="控制地址"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView45" />
<TextView
android:id="@+id/textView53"
android:layout_width="100dp"
android:layout_height="40dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="视频地址"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView44" />
<TextView
android:id="@+id/textView41"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="左前"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView25" />
<TextView
android:id="@+id/textView25"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:gravity="center"
android:text="左转"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView_forward" />
<TextView
android:id="@+id/textView_forward"
android:layout_width="100dp"
android:layout_height="25dp"
android:layout_marginStart="48dp"
android:layout_marginTop="52dp"
android:gravity="center"
android:text="前进"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/back" android:id="@+id/back"
android:layout_width="80dp" android:layout_width="50dp"
android:layout_height="40dp" android:layout_height="50dp"
android:background="@drawable/back_circle"
android:text="返回" android:text="返回"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"

26
src/app/src/main/res/layout/mymainfrm.xml
Unescape View File

@ -5,25 +5,25 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/background"
> >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_marginEnd="116dp"
android:gravity="center" android:orientation="vertical"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintVertical_bias="0.497">
<LinearLayout <LinearLayout
android:id="@+id/button_go" android:id="@+id/button_go"
android:layout_width="wrap_content" android:layout_width="200dp"
android:layout_height="wrap_content" android:layout_height="70dp"
android:layout_marginRight="120dp" android:background="@drawable/corner_rectangle"
android:gravity="center"> android:gravity="center">
<ImageView <ImageView
@ -40,8 +40,10 @@
<LinearLayout <LinearLayout
android:id="@+id/button_set" android:id="@+id/button_set"
android:layout_width="wrap_content" android:layout_width="200dp"
android:layout_height="wrap_content" android:layout_height="70dp"
android:layout_marginTop="30dp"
android:background="@drawable/corner_rectangle"
android:gravity="center"> android:gravity="center">
<ImageView <ImageView
@ -53,7 +55,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="设置" /> android:text="关于" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

Write Preview
Loading…
Cancel
Save