From 03feef076e951a3f7926ceff9601d5669b07d475 Mon Sep 17 00:00:00 2001
From: niushuai233 <niushuai951101@gmail.com>
Date: Thu, 20 Oct 2022 15:32:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/ic_add_bg.xml       |  9 ++++
 .../res/layout/main_nav_fragment_device.xml   | 43 +++++++++++++------
 iconfront/add.svg                             |  1 +
 3 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_add_bg.xml
 create mode 100644 iconfront/add.svg

diff --git a/app/src/main/res/drawable/ic_add_bg.xml b/app/src/main/res/drawable/ic_add_bg.xml
new file mode 100644
index 0000000..c18ef6a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_bg.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M512,149.33c200.3,0 362.67,162.37 362.67,362.67s-162.37,362.67 -362.67,362.67S149.33,712.3 149.33,512 311.7,149.33 512,149.33zM512,213.33c-164.95,0 -298.67,133.72 -298.67,298.67s133.72,298.67 298.67,298.67 298.67,-133.72 298.67,-298.67 -133.72,-298.67 -298.67,-298.67zM544,320v160L704,480v64h-160L544,704h-64v-160.02L320,544v-64l160,-0.02L480,320h64z"/>
+</vector>
diff --git a/app/src/main/res/layout/main_nav_fragment_device.xml b/app/src/main/res/layout/main_nav_fragment_device.xml
index 196816a..4280038 100644
--- a/app/src/main/res/layout/main_nav_fragment_device.xml
+++ b/app/src/main/res/layout/main_nav_fragment_device.xml
@@ -3,32 +3,51 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".ui.nav.device.NavDeviceFragment">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.gridlayout.widget.GridLayout
-            android:id="@+id/device_gridLayout"
+        <LinearLayout
+            android:id="@+id/main_activity_layout_title"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:columnCount="2">
+            android:layout_height="50dp"
+            android:background="@color/main_bg_color"
+            android:gravity="center">
 
-        </androidx.gridlayout.widget.GridLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="15"
+                android:gravity="center_vertical"
+                android:text="@string/app_name"
+                android:textSize="24dp" />
+
+            <!--标题栏 更多设置-->
+            <androidx.appcompat.widget.AppCompatImageButton
+                android:id="@id/activity_title_more_set"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginRight="5dp"
+                android:layout_weight="1"
+                android:background="@color/empty"
+                android:scaleType="centerInside"
+                android:src="@drawable/ic_add_bg" />
+        </LinearLayout>
 
         <GridView
             android:id="@id/device_gv"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:numColumns="2"
-            android:verticalSpacing="12dp"
-            android:horizontalSpacing="12dp"
+            android:layout_below="@id/main_activity_layout_title"
             android:background="@color/main_bg_color"
-            />
+            android:horizontalSpacing="12dp"
+            android:numColumns="2"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:verticalSpacing="12dp" />
 
     </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/iconfront/add.svg b/iconfront/add.svg
new file mode 100644
index 0000000..79c5642
--- /dev/null
+++ b/iconfront/add.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1666249178268" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2525" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 149.333333c200.298667 0 362.666667 162.368 362.666667 362.666667s-162.368 362.666667-362.666667 362.666667S149.333333 712.298667 149.333333 512 311.701333 149.333333 512 149.333333z m0 64c-164.949333 0-298.666667 133.717333-298.666667 298.666667s133.717333 298.666667 298.666667 298.666667 298.666667-133.717333 298.666667-298.666667-133.717333-298.666667-298.666667-298.666667z m32 106.666667v160H704v64h-160V704h-64v-160.021333L320 544v-64l160-0.021333V320h64z" p-id="2526"></path></svg>
\ No newline at end of file