From b003dd17bb16d5d5863c17bdf11679586de225a2 Mon Sep 17 00:00:00 2001
From: niushuai233 <niushuai951101@gmail.com>
Date: Mon, 17 Oct 2022 14:14:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/nav/main/device/NavDeviceFragment.java |  9 ++-
 app/src/main/res/layout/device_item.xml       | 57 +++++++++++++------
 .../res/layout/main_nav_fragment_device.xml   |  6 +-
 app/src/main/res/values/colors.xml            |  2 +
 app/src/main/res/values/ids.xml               |  9 +++
 5 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceFragment.java b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceFragment.java
index 88c1994..7705df9 100644
--- a/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceFragment.java
+++ b/app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceFragment.java
@@ -60,13 +60,16 @@ public class NavDeviceFragment extends Fragment {
         for (int i = 0; i < 3; i++) {
             HashMap<String, Object> m1 = new HashMap<>();
 
-            m1.put("device_item_imageView", R.drawable.ic_mark_as_read);
-            m1.put("device_item_textView", "卧室灯" + i);
+            m1.put("device_item_cardView_image", R.drawable.ic_device_light_1);
+            m1.put("device_item_cardView_text", "卧室灯" + i);
             dataItem.add(m1);
         }
 
+//        SimpleAdapter gvAdapter = new SimpleAdapter(getContext(), dataItem, R.layout.device_item,
+//                new String[]{"device_item_cardView_text"}, new int[]{R.id.device_item_cardView_text});
+
         SimpleAdapter gvAdapter = new SimpleAdapter(getContext(), dataItem, R.layout.device_item,
-                new String[]{"device_item_imageView", "device_item_textView"}, new int[]{R.id.device_item_imageView, R.id.device_item_textView});
+                new String[]{"device_item_cardView_image", "device_item_cardView_text"}, new int[]{R.id.device_item_cardView_image, R.id.device_item_cardView_text});
 
         deviceGv.setAdapter(gvAdapter);
     }
diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml
index 7761cc2..4a04519 100644
--- a/app/src/main/res/layout/device_item.xml
+++ b/app/src/main/res/layout/device_item.xml
@@ -1,25 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@id/device_item"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_marginLeft="10dp"
+    android:layout_marginRight="10dp"
+    android:layout_height="100dp"
     >
 
+    <androidx.cardview.widget.CardView
+        android:id="@id/device_item_cardView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:cardCornerRadius="12dp"
+        android:layout_centerInParent="true">
 
-    <ImageView
-        android:id="@+id/device_item_imageView"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        app:srcCompat="@drawable/ic_home"
-        android:layout_centerHorizontal="true"
-        />
+        <RelativeLayout
+            android:id="@id/device_item_cardView_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            >
 
-    <TextView
-        android:id="@+id/device_item_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/device_item_imageView"
-        android:layout_centerHorizontal="true"
-        android:text="TextView"
-        />
-</RelativeLayout>
\ No newline at end of file
+            <ImageView
+                android:id="@id/device_item_cardView_image"
+                android:layout_width="55dp"
+                android:layout_height="55dp"
+                app:srcCompat="@drawable/ic_home" />
+
+            <TextView
+                android:id="@id/device_item_cardView_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/device_item_cardView_image"
+                android:layout_marginTop="10dp"
+                android:textSize="12dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:shadowColor="#000000"
+                android:shadowDx="0.3"
+                android:shadowDy="0.3"
+                android:shadowRadius="0.3"
+                android:text="TextView" />
+        </RelativeLayout>
+
+    </androidx.cardview.widget.CardView>
+</RelativeLayout>
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 52f20f6..8eadd04 100644
--- a/app/src/main/res/layout/main_nav_fragment_device.xml
+++ b/app/src/main/res/layout/main_nav_fragment_device.xml
@@ -19,10 +19,14 @@
         </androidx.gridlayout.widget.GridLayout>
 
         <GridView
-            android:id="@+id/device_gv"
+            android:id="@id/device_gv"
+            android:paddingTop="25dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:numColumns="2"
+            android:verticalSpacing="12dp"
+            android:horizontalSpacing="12dp"
+            android:background="@color/main_bg_color"
             />
 
     </RelativeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..cd2f8ae 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="gray">#FFAFAFAF</color>
+    <color name="main_bg_color">#F6F6F6</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 48a1b82..ec06172 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -6,4 +6,13 @@
     <item name="bottom_nav_set" type="id"/>
     <!-- 首页 底部导航栏 end-->
 
+    <!--设备页 start-->
+    <item name="device_gv" type="id"/>
+    <item name="device_item" type="id"/>
+    <item name="device_item_cardView" type="id"/>
+    <item name="device_item_cardView_content" type="id"/>
+    <item name="device_item_cardView_image" type="id"/>
+    <item name="device_item_cardView_text" type="id"/>
+    <!--设备页 end-->
+
 </resources>
\ No newline at end of file