From 5f21f5e7be861b538e2ac7930541c9144629c559 Mon Sep 17 00:00:00 2001
From: zhenghaoyuan20 <735827001@qq.com>
Date: Sun, 25 Jun 2023 17:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...��件系统软件设计规格说明书.doc | Bin 11374929 -> 11374973 bytes
 .../.idea/deploymentTargetDropDown.xml        |  17 ------
 src/sixaunyi/.idea/misc.xml                   |   5 ++
 src/sixaunyi/app/build.gradle                 |   2 +
 .../com/example/sixaunyi/SettingActivity.java |  33 ++++++++++-
 .../com/example/sixaunyi/VideoActivity.java   |  54 +++++++++++++++++-
 .../res/drawable-v24/selector_toggle_icon.xml |   5 ++
 .../src/main/res/drawable-v24/shoudong.png    | Bin 0 -> 1339 bytes
 .../main/res/drawable-v24/zidongkongzhi.png   | Bin 0 -> 1627 bytes
 .../res/drawable/selector_toggle_icon.xml     |   5 ++
 .../main/res/layout-land/activity_control.xml |  17 ++++++
 .../src/main/res/layout/activity_login.xml    |   6 +-
 12 files changed, 121 insertions(+), 23 deletions(-)
 delete mode 100644 src/sixaunyi/.idea/deploymentTargetDropDown.xml
 create mode 100644 src/sixaunyi/app/src/main/res/drawable-v24/selector_toggle_icon.xml
 create mode 100644 src/sixaunyi/app/src/main/res/drawable-v24/shoudong.png
 create mode 100644 src/sixaunyi/app/src/main/res/drawable-v24/zidongkongzhi.png
 create mode 100644 src/sixaunyi/app/src/main/res/drawable/selector_toggle_icon.xml

diff --git a/doc/“哨兵”软件系统软件设计规格说明书.doc b/doc/“哨兵”软件系统软件设计规格说明书.doc
index 492d53f869da2921e07a15510e127ea76000ccc5..46f3be78fbb75ee0772f0445e522685ad9736279 100644
GIT binary patch
delta 2137
zcmZwG3s6*57zglkVUgFeype^)SXo&`l;sgF<^xTXNOV;eaZND-LDK{UL=a^~mvtW~
zlKX{*k6j^k@0l?fxu#Q-H8$Fla?0s3jxl4+WUncw$(pAASF_QX?w#Mc=brDp@3|j)
zhlBotGaD2^?Auv?ULR^uWCkgYBp`P@)F%YY95*ySJSQ-?eHxRm-ss3I8o9kMruR*i
zQTU+quBz*<N`L?e1O)`a7zl<C2!${R2PH&++%6KLAR1yI7UCct5@0MOf*O(_88nar
z<KQt!1ucw+G|<5WNC!Pkgh`MAlOYqPz*NWr17t%E<U$@i4*4(*j8Fj6;R%=lGhr6Y
zhC-MFbKyyt2SqR+7C<pP1tst_EQC^61dG80OJFH1gEBBfIV^_?SOFGT3D3YPSPhl1
z2A+i~cn+$e2G&9?)WJGf56{B}*a$DcCa8x7*bG~s5t^VGwn7VRgH~vR?a&T8U?+5d
z6?Q=<?1nvHgD$YcUT}aDT;PUo*a!Qe2M$0lya)%u0|YNY9~^?i@G|tn5jYCR;J9>G
z<qbCn9!wIbXLg;MQmeh0baJ9mnY>7WLmS4}5DWkLLu7Zd4%~a>qf8sCy=saotW#2n
z@2H9nReSf-uS4A#QgMy<Skz#%Hz0AH-D$VS*XirOqSdYIYVP(WoqMmwdS<$<#XH>M
zvxWo?OaBhp-{H%o*)>H<p_CTZ6r~6nDs;!{Dbng2bHCSItFJ$5@PJQ2BRxKY&Ep&P
zoEVV?7Y!(Bq;$YwvkcfQgEq@6Hp@wy<&@2Gdf4J0QF|Kw?<&f5m~O*&hm(2@iZEe4
z{o3f)N36(T>;{%MEsL>)UacZoQ;J++5M%B<##{np>U_qoV5M#NcggyFSSC4|{Kta4
z=uM($H~S~Ze{y=z*Qj=gF5TW&D}B@KFBAk(Lgl%F99<$^*ybOt6pT{;=l<sh=V_KO
zHV#r@Jm_F56hjFt1QY!5<yC2**IH|yoi6Y7BbUc2{y<l)qV9i^{D^S5c^TA$XP1~5
zGJ5%>^MxgOW69JZ#?$^tF_cpGh}mR{5QE9kDSk+%PEkw#PBE2wJH(9%EX25svFR`a
z=0ZJqc8jUXKiE&7UOet`wyd0`eYC#{+P_;IOFM018nx^ZZDiji=E+HEbl*fTGlvLF
zX)0sv0C;SohIBRzI;Bhem`q)wQ*O8_jD-}N8QTFKyO^gMz5M#QJ}YakU%RH<WR$l!
zo!%<I0DXJK2#VV)9t>Q3(?^B^F<mZF(v7`X!_p2h_P=FT1TYmD>|!D*9AZ@Htq<P2
z^3KKA*fF`Y2KftB$;k{l>l7E#X1lmKfQ1gb#G-34@;=J@AWvGJ)p@hDypqQR3cpC}
ztN8m0h4%Dttu(!s|EMHGBiASQKm3)tAAV`4orzqnUj1;{;)h=7-9~;SB#p6{>N-K7
z`Yl`=tzdaN;c=aiuVcA7p;#x7tBLEVqlqWdnI^tCGW3^n#_qsx@OwE;E#n#~!y}#%
zXml&rDsX@qUCKN#Szh2csknvD6|{#ZFeZ~P0r!LagXaMGxADJc<W?<EDpNjFwnnKV
z?zEnWm=mUtUY*tx9o%*yx^P)tY<zoDT(Y(;uF~X=(`O9Dy{XTRH)q_6&uYFjmcD4^
zI?bJ&Luq}Q!L+reBf1vhO1i3~N3V*#HtB3pY9^`L`1!=qP4AmaD&otxMHE%UOd7K6
zZalSeMeG}E=#w^H99~smZtYz4OskP~Nh#ZTTsW<8@+iSTscxQ3bGmpLz1qb!!Ae%i
z%Gjo1I~M{XpJPUr%?gm_uzZ&9aqubB@8C)yk8V16JmosDd7TcPaKE!0xincY%8wL^
zb|Lt-gJ)1EMxtCNPoh%}o+M18MNV#}eR4jZqFh`}7v&oFdM=QI_a>wfvgP0en(RjK
vx|3^!ocqCc7Yef6_vW#~^<b!vT--=A-CRSl-I!5|8zakWl(x9}jlh2Z*my~_

delta 2260
zcmbW%c}x^n90%|>yR&jEtQ?E(!d5^L5La2eIBXU1!W*i1pa_chRYgD$!R3(EWw9c5
zf1-l0D^%TiRZDbwCDkUTrfFJ@|5QzlG0`^016yNjOposrQ2K{y(wTf_-n^an`@L)S
z57!0FH8{IT)a2>CDz<lS6U`bi?bGt@oozmDK{Y#~bDDOP+AA}WDMw>q|9Co^crd8(
zqAp2ju707jz0e7u0yT)Bfqvix-rxhipannh2c=zq2!KEcf?&`?2n>LMU;rb8LKv9f
zEf@sh5CM@e7=}O;425Wjfmj#@aWEXrFakzGJXjzBM!{$p17l$vBtjA-Lkf(Cx8WU_
z023h<CP5lZhAA)=ronVbhZ!&vX2EQj19M>>WI!go3-e(CWWhpM1dCw_WW!Qe205@C
zav={^z)Hx6Rj?Y?z*<-b>tO?IgiWv+w!nL^6}CYEY==T9f@0VKB~S`Gp$v9GIaI)I
zutFtNK{eFC9;gKy?1g<`hdOXTJ?w|~;Q%ziL1=_S@Bui1;4n175jYCRpcz`=IJ82W
z{6go_W~s|V1!|bM&PWlfT;}9w*sdRozFpq9&lPd;#r9>|uCGws&8#@ZNnt2!DpQpj
zA(kbvF9m@GQo|}&yC#?oe%g;RQ`Z^gyw$GO0B4EI&{6DC*$gEv*-+xH^j5dXJ^9XC
z-R99N5v4cZoSuC7$Y)Wa_vAD6$;4OyMO3<teKX}(x|;)>PPe7wpj)(AoNn3TJaJWa
zX17~9=C=FUEZObQ0UyFiI0dI=OSb2#ky_6+4Q{lEI%lEh8!;}5G1~UvXeerYg$eX)
zp(n<FL>yzc(Kl^8V*?r^#V}JON~s#gR*YfHAu#r6EMr&D%X#?Tsq&$(ne0WLR!uRY
z$<$Eb8QPmg)SMs3*b!<t*Oc&2o$|M!m+u#QQU$>(qiLGZUEk9!fBCag&)r-hQEtBB
z+1L>~GLx}%m<h8X0~WwmsDMYeE}dzz=1-%9S-KDm!k^M=q+rVMm%PYQEyd6ts}w+O
z)l!a-K$+FjAlhh^zN5SfDM;`kzbeT<VvVHtxqJC!-In!i`4qZTRiw;@hEDI1#weFL
zn#x!g%c9m=$w=W7B@Nx#hd3G4QY1CkNak0`y#D=|tzy2UuaP1G4lZD<1@7Ja{)^*P
ztJCRe{|b{b<4R{UX?LxZ(l@Y88u;eNt{SOU#eB%SRx)WSvKX^cWUUnS<^~xyDN{xY
zt)ODw<h>Vz677;c@V6(|KWAr8w;nlQFIb#9VSF-H+DMK%sercbl`gBp@3_g5EJf4u
zeUdqp1wLHJ*kkB|=kPl``-R=;v$o0_zFy7$C}AUnP->ktTgAi+4r%K3AZ0xZ=66q(
z6(f7NP+pYFgVe%vdBaNnttbv|zc5`+S<4^$`8@0C#Se7gE|z7}P064B+%JX39>TVK
zbyUA9p-|NKVGZRxK)Y)v+JZIM&`h9Xg}lYb4|_aHt&URDz9Jq&hl}`HUv2MbpZ?#W
zzMdBhI*@Md;1Trm*Pi};zKHY^o+d;d8H$eultaMTTYhyXPbvS4KHA9*hLG|ieOP3f
zJ~yLY9~0N9zZjDck`;F^gzoR;Q2|Y+jv;F@TB1sXE77`{4KWm5#y|0!xj1BD(6G+z
zn!-~{>3JDXS6AmOlV|MWdM%aO_$u0L<9_tg&I9O28#htB9hbIxKJda`E~qHb&ds#M
z&Ii#MJ0H;fUbCGC(GKM?S!p)8j)&3{JC7reo$G{Tig0kFdK62f)_QKFoI1o;UKGYr
zmz{@EX&p~dG8pKmIy5g=@^5o+6Ta4w_#FY1cEafHx5FJ=M`bny9@AZM%7I4j*txHI
iEVC%N!h})XnO-`0Qg`6B^*ok_<HepR^6`3pTm3hK`;7nq

diff --git a/src/sixaunyi/.idea/deploymentTargetDropDown.xml b/src/sixaunyi/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 72cc687..0000000
--- a/src/sixaunyi/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\郑皓原\.android\avd\Pixel_2_XL_API_22_2.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-06-22T00:46:45.782451800Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/sixaunyi/.idea/misc.xml b/src/sixaunyi/.idea/misc.xml
index 383b5f0..a4d20bc 100644
--- a/src/sixaunyi/.idea/misc.xml
+++ b/src/sixaunyi/.idea/misc.xml
@@ -3,12 +3,17 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/drawable/icon_favorite_red.xml" value="0.1235" />
+        <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/drawable/selector_toggle_icon.xml" value="0.2265" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/drawable/txt_radiuborder.xml" value="0.2505" />
+        <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout-land/activity_control.xml" value="0.21472663139329806" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout-v26/activity_setting.xml" value="0.264" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/activity_control.xml" value="0.25364583333333335" />
+        <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/activity_login.xml" value="0.25364583333333335" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/activity_main.xml" value="0.25364583333333335" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/activity_setting.xml" value="0.1" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/activity_video.xml" value="0.25364583333333335" />
+        <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/content_detect.xml" value="0.25364583333333335" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/custom_info_contents.xml" value="0.1125" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/custom_info_window.xml" value="0.1125" />
         <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/fragment_second.xml" value="0.1125" />
diff --git a/src/sixaunyi/app/build.gradle b/src/sixaunyi/app/build.gradle
index b7e2f29..2f70020 100644
--- a/src/sixaunyi/app/build.gradle
+++ b/src/sixaunyi/app/build.gradle
@@ -28,6 +28,8 @@ android {
     buildFeatures {
         viewBinding true
     }
+    buildToolsVersion '30.0.3'
+    ndkVersion '21.1.6352462'
 }
 
 dependencies {
diff --git a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/SettingActivity.java b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/SettingActivity.java
index 3c2d1be..6d56607 100644
--- a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/SettingActivity.java
+++ b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/SettingActivity.java
@@ -37,7 +37,7 @@ public class SettingActivity extends AppCompatActivity {
 
     private final static String SEND_to_IP = "192.168.39.47";
     private SeekBar Speed_btn;
-    private Button Battery_btn;
+    private Switch Battery_btn;
     private ImageButton return_btn;
     private final static int SEND_PORT = 8888;
     private ExecutorService mThreadPool = Executors.newCachedThreadPool();
@@ -51,6 +51,7 @@ public class SettingActivity extends AppCompatActivity {
         Speed_btn= findViewById(R.id.speed);
         return_btn=findViewById(R.id.returns);
         photo_btn = findViewById(R.id.photo);
+        Battery_btn=findViewById(R.id.Battery_warning);
         TextView tvProgress = (TextView) findViewById(R.id.tvProgress);
         sharedPreferences = getSharedPreferences("control_state", MODE_PRIVATE);
         boolean photo_btn_state= sharedPreferences.getBoolean("photo_btn_state", false);
@@ -59,6 +60,8 @@ public class SettingActivity extends AppCompatActivity {
         int speedProgress = sharedPreferences.getInt("speed_progress", 0);
         Speed_btn.setProgress(speedProgress);
         tvProgress.setText(String.valueOf(speedProgress+10));
+        boolean battery_btn_state= sharedPreferences.getBoolean("battery_btn_state", false);
+        Battery_btn.setChecked(battery_btn_state);
         photo_btn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -68,6 +71,15 @@ public class SettingActivity extends AppCompatActivity {
                 editor.apply();
             }
         });
+        Battery_btn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                // 保存Switch状态
+                SharedPreferences.Editor editor = sharedPreferences.edit();
+                editor.putBoolean("battery_btn_state", isChecked);
+                editor.apply();
+            }
+        });
         Speed_btn.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -118,6 +130,25 @@ public class SettingActivity extends AppCompatActivity {
                 }
             }
         });
+        Battery_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (Battery_btn.isChecked()) {
+                    try {
+                        sendCommand("battery_warning");
+                    } catch (UnknownHostException e) {
+                        e.printStackTrace();
+                    }
+                }else
+                {
+                    try {
+                        sendCommand("warning_cancel");
+                    } catch (UnknownHostException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        });
     }
     /*
      *   UDP数据发送线程
diff --git a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/VideoActivity.java b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/VideoActivity.java
index a10e82f..d8de414 100644
--- a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/VideoActivity.java
+++ b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/VideoActivity.java
@@ -3,7 +3,8 @@ package com.example.sixaunyi;
 import static androidx.constraintlayout.motion.utils.Oscillator.TAG;
 
 import androidx.appcompat.app.AppCompatActivity;
-
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -35,8 +36,6 @@ import android.widget.Toast;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.*;
 import java.util.concurrent.ExecutorService;
@@ -75,6 +74,7 @@ public class VideoActivity extends AppCompatActivity {
     private float mdistance;
     // 创建一个可缓存的线程池
     private ExecutorService mThreadPool = Executors.newCachedThreadPool();
+    private UdpDataThread warning_thread;
     //ReceiveData()显示到imageView
     //manager部分：打开线程，接收
     //model部分：发送视频流
@@ -224,6 +224,54 @@ public class VideoActivity extends AppCompatActivity {
             }
         });
     }
+
+    public class UdpDataThread extends Thread {
+        private DatagramSocket socket;
+        private boolean isRunning;
+
+        public UdpDataThread() {
+            isRunning = true;
+        }
+
+        @Override
+        public void run() {
+            byte[] buffer = new byte[1024];
+
+            try {
+                // 创建DatagramSocket对象并绑定指定的端口
+                socket = new DatagramSocket(6666);
+
+                while (isRunning) {
+                    // 创建空的DatagramPacket对象用于接收数据
+                    DatagramPacket packet = new DatagramPacket(buffer, buffer.length);
+
+                    // 接收数据
+                    socket.receive(packet);
+
+                    // 从接收到的数据包中提取数据并进行处理
+                    String receivedData = new String(packet.getData(), 0, packet.getLength());
+                    // 进行数据处理操作...
+                    Toast.makeText(VideoActivity.this,receivedData, Toast.LENGTH_SHORT).show();
+                    // 打印接收到的数据包内容
+                    System.out.println("Received: " + receivedData);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                if (socket != null) {
+                    // 关闭Socket
+                    socket.close();
+                }
+            }
+        }
+
+        public void stopReceiver() {
+            isRunning = false;
+        }
+    }
+
+
+
     class ReceiveHandler extends Handler{
         @Override
         public void handleMessage(Message msg) {
diff --git a/src/sixaunyi/app/src/main/res/drawable-v24/selector_toggle_icon.xml b/src/sixaunyi/app/src/main/res/drawable-v24/selector_toggle_icon.xml
new file mode 100644
index 0000000..d1f3a63
--- /dev/null
+++ b/src/sixaunyi/app/src/main/res/drawable-v24/selector_toggle_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/zidongkongzhi" android:state_checked="false" /> <!-- 当未选中时的图标 -->
+    <item android:drawable="@drawable/shoudong" android:state_checked="true" /> <!-- 当选中时的图标 -->
+</selector>
\ No newline at end of file
diff --git a/src/sixaunyi/app/src/main/res/drawable-v24/shoudong.png b/src/sixaunyi/app/src/main/res/drawable-v24/shoudong.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d091981003cadab13b2f86d153e4c74b530b1cd
GIT binary patch
literal 1339
zcmV-B1;qM^P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&000F7Nkl<Zc%1E+
z>vh^#6ot1ch*E)Z1(7S5>k3RN7*v6A1tTi(O$8$=FjNpxK}ZFoR1moW&v$$w7DQtt
zA+UeUx7J=8?zxY%c?u#O!QI{6&C}D<n48H)#@ZA`(c=F8e#z~#&@0GvI(3r%MkBpW
zDJk{d7dkN!>I5Ms3L&=Gqh5$-0T~H$l5Wrz3zO@FbPBQ;;yW69?@Kkn+>xXO`h<*=
zhG`vS)7Uo@qa~WqScSg|>lWAzGA>zD>I8HNl1us%{XmIt5yD_yjIGfHnzL@A6A+<;
zY?}FrjFe__ZJ_2P{e_$YrKFrWGyECmO!V@S{79|B2PHxWsWtLQ6EXfwZM+E!lj6@X
zx57T4od;qlB6JX%$P^y+6-_t+V<Wx1XI3avV2o~&kupCQFu#!W2bwXKX<#CB5Sqvo
zf-Gsm8nv-0c8`9b#MfRflyZgl(~5B?sEy4S%QP?%ItWc9m`79Z{TjEiOd;Hyv59I>
z8)FZs^4@>MZ7jh&n)=NiL((cp6Ev171ewuTrW(|oq_0TSdY{pS-iOd^rvHNsPwzu$
zHdBirTm_H0LQc3DbGzjBocR^^2j%2J8n6&4YZmxmoGZu*l?vZ6A5ev^SXXKwBGe0-
z&D1W)HT6Qkc#IVaSHugnMoxiJ;iJ4z4^ACqMa`)OwTb@wvc^bRldB_d5yUCfj7Q{=
z;S?@mjB8{(-`{*lEZM8#ZX*%u1r237E{KIleC>Tgtx#y*8jew&3VmjNp$6VENK<X1
z-Iv`8843D;Ds;uVQhP+G7aW>t_#jT9W_+f;z->In*60Gw8J}p6_Zp<BHc@!CN@|z*
z4iRdE|E&Ie3jbNfXpO$GL8%RFoawwloI*|1e(U?U0T#rVElAKlDVyX1=4Cn@WJzs|
z|Dsk~QFE%%ver7t1GYVUj!K35pOBHVQO-Qi?OQbCex@4KVk{TG8mX=EUr=)j4Xvm-
z)o580wFui`XMo9L>;V}m3vz9smMi?iGjfG+F}h=($6LWZPNAVW%O<K(tF5Rx)u`24
z1+j*1(UQqyd<W{eUcwkZP~u<tqH2PDoOs{)y>*-MujuF?3+x8Xn4GBr=8Q3?@R`oE
z-DZw~y+<M-V%y#GsX28Bk}14_OD139?*@8v>JVfk=^tc#VZjuC7toti+aLxDGKFWw
zxMoqIcL04kbqQjysL;#B+a(Ll-xPXs>JcQyN`(uxf`!-kn?g@cU4s}b9Agj2xMQ)$
z-wgV3>J!9Zu{D2-j4L)+<8K1JIQ0!;uz@xI36%<AD*WuwhtrWk60A^ozvOI^;%A3G
zoI;RCdWi8IB6JWonJD}gFj6+kb!O-xQ}|j~alX?Yt%4YAw7_mqg|67F)EVLYT;V!z
z$=PFkhb}>4Y>h6^+IxS6pAF9ciNz@8>|A@a4q~ubf_+2A7dD*YCx>$<dU<Jo<lGA1
zp;HipO*4hps&UPxg-!_P#h5*KBQ^Yn*%G17uz8`EOPFgmU*ji%v%X?Zd|IIqXI1!b
z^bHbYg~Insg+6mYp#j;P@qnBHcE$p4q*oAQb5N=9{bG1D<FE=pip@VbnWT{dDf{Mn
zg$VVAFeC9Lsqiw}vOsJ8uPxM#5zQy~7>yKoL=!?R@K=e@(GX~AhAz-h%uz;&QZ0zk
xV322wnMUGI3ABCLwc$G|72bOb-!j0Ke*v1=)=}!=WJ~}6002ovPDHLkV1l6!al`-s

literal 0
HcmV?d00001

diff --git a/src/sixaunyi/app/src/main/res/drawable-v24/zidongkongzhi.png b/src/sixaunyi/app/src/main/res/drawable-v24/zidongkongzhi.png
new file mode 100644
index 0000000000000000000000000000000000000000..479e8d1e08eb302a9ad021cc88a84458a07cd57c
GIT binary patch
literal 1627
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
Z<9}U#<58Vni*x`0002ovPDHLkV1mM64MG3_

literal 0
HcmV?d00001

diff --git a/src/sixaunyi/app/src/main/res/drawable/selector_toggle_icon.xml b/src/sixaunyi/app/src/main/res/drawable/selector_toggle_icon.xml
new file mode 100644
index 0000000..d1f3a63
--- /dev/null
+++ b/src/sixaunyi/app/src/main/res/drawable/selector_toggle_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/zidongkongzhi" android:state_checked="false" /> <!-- 当未选中时的图标 -->
+    <item android:drawable="@drawable/shoudong" android:state_checked="true" /> <!-- 当选中时的图标 -->
+</selector>
\ 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
index 08c7341..74cbcd7 100644
--- a/src/sixaunyi/app/src/main/res/layout-land/activity_control.xml
+++ b/src/sixaunyi/app/src/main/res/layout-land/activity_control.xml
@@ -230,7 +230,24 @@
             />
 
     </LinearLayout>
+    <LinearLayout
+        android:id="@+id/top_right_buttons_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        android:layout_gravity="right|top">
 
+        <ToggleButton
+            android:id="@+id/toggleButton2"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_weight="2"
+            android:background="@drawable/selector_toggle_icon"
+            android:text="ToggleButton"
+            android:textOff=""
+            android:textOn="" />
+    </LinearLayout>
 </FrameLayout>
 
 
diff --git a/src/sixaunyi/app/src/main/res/layout/activity_login.xml b/src/sixaunyi/app/src/main/res/layout/activity_login.xml
index 62157a2..e79a365 100644
--- a/src/sixaunyi/app/src/main/res/layout/activity_login.xml
+++ b/src/sixaunyi/app/src/main/res/layout/activity_login.xml
@@ -29,7 +29,8 @@
         android:hint="密码："
         android:layout_marginTop="10dp"
         android:layout_marginLeft="30dp"
-        android:layout_marginRight="30dp"/>
+        android:layout_marginRight="30dp"
+        android:maxLines="1"/>
     <CheckBox
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -46,7 +47,8 @@
             android:layout_width="295dp"
             android:layout_height="57dp"
             android:layout_marginLeft="175dp"
-            android:text="登录" />
+            android:text="登录"
+            android:maxLines="1"/>
 
     </LinearLayout>