From d199c7a345bf111cbec3ed5d721f36f2ad0b91f3 Mon Sep 17 00:00:00 2001
From: CYZ <2782394648@qq.com>
Date: Fri, 2 Jun 2023 01:37:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BAactivity=EF=BC=8C=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E4=BA=86activity=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../9668392b13e33166876f2a7d3f10eb5405e757ad  |   4 +-
 .../c99a584c2117ed2df42496451bb97ac1147f5ea0  |   0
 .../.idea/sonarlint/issuestore/index.pb       |  10 +-
 src/sixaunyi/app/src/main/AndroidManifest.xml |  41 ++---
 .../com/example/sixaunyi/ControlActivity.java |  14 ++
 .../main/res/layout-land/activity_control.xml | 155 ++++++++++++++++++
 .../src/main/res/layout/activity_control.xml  |   6 +
 .../app/src/main/res/values/strings.xml       |   9 +-
 8 files changed, 208 insertions(+), 31 deletions(-)
 create mode 100644 src/sixaunyi/.idea/sonarlint/issuestore/c/9/c99a584c2117ed2df42496451bb97ac1147f5ea0
 create mode 100644 src/sixaunyi/app/src/main/java/com/example/sixaunyi/ControlActivity.java
 create mode 100644 src/sixaunyi/app/src/main/res/layout-land/activity_control.xml
 create mode 100644 src/sixaunyi/app/src/main/res/layout/activity_control.xml

diff --git a/src/sixaunyi/.idea/sonarlint/issuestore/9/6/9668392b13e33166876f2a7d3f10eb5405e757ad b/src/sixaunyi/.idea/sonarlint/issuestore/9/6/9668392b13e33166876f2a7d3f10eb5405e757ad
index c0f8e8b..016bce6 100644
--- a/src/sixaunyi/.idea/sonarlint/issuestore/9/6/9668392b13e33166876f2a7d3f10eb5405e757ad
+++ b/src/sixaunyi/.idea/sonarlint/issuestore/9/6/9668392b13e33166876f2a7d3f10eb5405e757ad
@@ -10,9 +10,9 @@ java:S1604
 i
 java:S1104%"SMake TV_show a static final constant or non-public and provide accessors if needed.(úÀŸõ
 >
-java:S2189‡
""Add an end condition to this loop.(˜ïˆžÿÿÿÿÿ

->
 java:S2189±
""Add an end condition to this loop.(˜ïˆžÿÿÿÿÿ

+>
+java:S2189‡
""Add an end condition to this loop.(˜ïˆžÿÿÿÿÿ

 k	java:S116!"VRename this field "receive_Msg" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ŒßÙú
 g	java:S116%"RRename this field "TV_show" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(úÀŸõ
 ^
diff --git a/src/sixaunyi/.idea/sonarlint/issuestore/c/9/c99a584c2117ed2df42496451bb97ac1147f5ea0 b/src/sixaunyi/.idea/sonarlint/issuestore/c/9/c99a584c2117ed2df42496451bb97ac1147f5ea0
new file mode 100644
index 0000000..e69de29
diff --git a/src/sixaunyi/.idea/sonarlint/issuestore/index.pb b/src/sixaunyi/.idea/sonarlint/issuestore/index.pb
index b574ac0..71d94c1 100644
--- a/src/sixaunyi/.idea/sonarlint/issuestore/index.pb
+++ b/src/sixaunyi/.idea/sonarlint/issuestore/index.pb
@@ -15,13 +15,15 @@ j
 :app/src/main/java/com/example/sixaunyi/SecondFragment.java,1\2\12963d86ac5c2888cc2a9ae459de5665bc06b01f
 ?
 settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233
-P
- app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e
 @
 app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
 j
 :app/src/main/java/com/example/sixaunyi/DetectActivity.java,9\6\9668392b13e33166876f2a7d3f10eb5405e757ad
+i
+9app/src/main/java/com/example/sixaunyi/VideoActivity.java,7\1\71fd1993763df2214bbdad8cfee650733993fe44
 h
 8app/src/main/java/com/example/sixaunyi/MainActivity.java,7\c\7c120b7216f76ce98d1573d90803ab36f481640c
-i
-9app/src/main/java/com/example/sixaunyi/VideoActivity.java,7\1\71fd1993763df2214bbdad8cfee650733993fe44
\ No newline at end of file
+P
+ app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e
+k
+;app/src/main/java/com/example/sixaunyi/ControlActivity.java,c\9\c99a584c2117ed2df42496451bb97ac1147f5ea0
\ No newline at end of file
diff --git a/src/sixaunyi/app/src/main/AndroidManifest.xml b/src/sixaunyi/app/src/main/AndroidManifest.xml
index 9c3a353..5459665 100644
--- a/src/sixaunyi/app/src/main/AndroidManifest.xml
+++ b/src/sixaunyi/app/src/main/AndroidManifest.xml
@@ -2,26 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.example.sixaunyi">
-    <!--用于访问网络，网络定�需�上网-->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!--用于读�手机当�的状�-->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <!--用于写入缓存数�到扩展存储�-->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!--用于申请调用A-GPS模�-->
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <!--用于进行网络定�-->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <!--用于访问GPS定�-->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!--用于获���商信�，用于支��供��商信�相关的接�-->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!--用于访问wifi网络信�，wifi信�会用于进行网络定�-->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <!--用于获�wifi的获���，wifi信�会用�进行网络定�-->
+    <!-- 用于访问网络，网络定�需�上网 -->
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- 用于读�手机当�的状� -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- 用于写入缓存数�到扩展存储� -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 用于申请调用A-GPS模� -->
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <!-- 用于进行网络定� -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- 用于访问GPS定� -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 用于获���商信�，用于支��供��商信�相关的接� -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 用于访问wifi网络信�，wifi信�会用于进行网络定� -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 用于获�wifi的获���，wifi信�会用�进行网络定� -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 
-
     <application
         android:name=".MapApplication"
         android:allowBackup="true"
@@ -33,13 +24,15 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Sixaunyi"
         tools:targetApi="31">
-        <!--定�service-->
-        <service
-            android:name="com.amap.api.location.APSService"/>
-        <!--设置高德Key-->
+        <activity
+            android:name=".ControlActivity"
+            android:screenOrientation="landscape"
+            android:exported="false" />
+        <!-- 定�service -->
+        <service android:name="com.amap.api.location.APSService" /> <!-- 设置高德Key -->
         <meta-data
-            android:name="com.amap.api.v2.apikey" android:value="530a964ff05e45d9efb905abc9480690"/>
-
+            android:name="com.amap.api.v2.apikey"
+            android:value="530a964ff05e45d9efb905abc9480690" />
 
         <activity
             android:name=".VideoActivity"
diff --git a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/ControlActivity.java b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/ControlActivity.java
new file mode 100644
index 0000000..ce25d30
--- /dev/null
+++ b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/ControlActivity.java
@@ -0,0 +1,14 @@
+package com.example.sixaunyi;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+public class ControlActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_control);
+    }
+}
\ No newline at end of file
diff --git a/src/sixaunyi/app/src/main/res/layout-land/activity_control.xml b/src/sixaunyi/app/src/main/res/layout-land/activity_control.xml
new file mode 100644
index 0000000..5cbffa0
--- /dev/null
+++ b/src/sixaunyi/app/src/main/res/layout-land/activity_control.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- 显示无人机回传图�的控件 -->
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:scaleType="centerCrop"
+         />
+
+    <!-- 左侧竖直轴按钮 -->
+    <RelativeLayout
+        android:id="@+id/left_vertical_button_layout"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_below="@+id/imageView">
+
+        <!-- 上�按钮 -->
+        <ImageButton
+            android:id="@+id/up_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentTop="true"
+            android:background="@null"
+            android:contentDescription="@string/up_button"
+            android:src="@drawable/img" />
+
+        <!-- 下�按钮 -->
+        <ImageButton
+            android:id="@+id/down_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true"
+            android:background="@null"
+            android:contentDescription="@string/down_button"
+            android:src="@drawable/img" />
+
+        <!-- 左旋转按钮 -->
+        <ImageButton
+            android:id="@+id/rotate_left_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentStart="true"
+            android:background="@null"
+            android:contentDescription="@string/turn_left_button"
+            android:src="@drawable/img" />
+
+        <!-- �旋转按钮 -->
+        <ImageButton
+            android:id="@+id/rotate_right_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:background="@null"
+            android:contentDescription="@string/turn_right_button"
+            android:src="@drawable/img" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/top_horizontal_button_layout"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_below="@+id/imageView"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_alignParentEnd="true">
+
+        <!-- �左按钮 -->
+        <!-- �一个与image相关，都需�设置contentDescription，对其进行�述-->
+        <ImageButton
+            android:id="@+id/left_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:background="@null"
+            android:contentDescription="@string/move_left_button"
+            android:src="@drawable/img" />
+
+        <!-- ��按钮 -->
+        <ImageButton
+            android:id="@+id/right_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="@null"
+            android:contentDescription="@string/move_right_button"
+            android:src="@drawable/img" />
+
+        <!-- ��移动按钮 -->
+        <ImageButton
+            android:id="@+id/forward_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_centerHorizontal="true"
+            android:background="@null"
+            android:contentDescription="@string/move_forward_button"
+            android:src="@drawable/img" />
+
+        <!-- ��移动按钮 -->
+        <ImageButton
+            android:id="@+id/backward_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:contentDescription="@string/move_back_button"
+            android:layout_marginEnd="50dp"
+            android:background="@null"
+            android:src="@drawable/img" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/takeoff_landing_buttons_layout"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+
+        <!-- ��按钮 -->
+        <Button
+            android:id="@+id/landing_button"
+            android:layout_width="80dp"
+            android:layout_height="61dp"
+            android:layout_gravity="left"
+            android:layout_marginRight="10dp"
+            android:layout_weight="1"
+            android:text="��" />
+        <!-- 起飞按钮 -->
+        <Button
+            android:id="@+id/takeoff_button"
+            android:layout_width="80dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:layout_weight="1"
+            android:text="起飞" />
+
+    </LinearLayout>
+</RelativeLayout>
diff --git a/src/sixaunyi/app/src/main/res/layout/activity_control.xml b/src/sixaunyi/app/src/main/res/layout/activity_control.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/src/sixaunyi/app/src/main/res/layout/activity_control.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/sixaunyi/app/src/main/res/values/strings.xml b/src/sixaunyi/app/src/main/res/values/strings.xml
index 9f8476a..d943ab7 100644
--- a/src/sixaunyi/app/src/main/res/values/strings.xml
+++ b/src/sixaunyi/app/src/main/res/values/strings.xml
@@ -6,7 +6,14 @@
     <string name="second_fragment_label">Second Fragment</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
-
+    <string name="down_button">下�按钮</string>
+    <string name="up_button">上�旋转</string>
+    <string name="move_left_button">�左按钮</string>
+    <string name="move_right_button">��按钮</string>
+    <string name="move_forward_button">��按钮</string>
+    <string name="move_back_button">��按钮</string>
+    <string name="turn_left_button">�左旋转</string>
+    <string name="turn_right_button">��旋转</string>
     <string name="hello_first_fragment">Hello first fragment</string>
     <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
 </resources>
\ No newline at end of file