From b3823d01a4275d4993c58dcf782844912b1a4bb3 Mon Sep 17 00:00:00 2001
From: niushuai233 <niushuai951101@gmail.com>
Date: Fri, 28 Oct 2022 08:55:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=A4=A9=E6=95=B0=E5=B1=95=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devcontrol/db/entity/DeviceLog.java       | 48 +++++++++++++++++++
 .../res/layout/main_nav_fragment_set_up.xml   |  4 +-
 app/src/main/res/values/setup_styles.xml      |  4 +-
 3 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/cc/niushuai/project/devcontrol/db/entity/DeviceLog.java

diff --git a/app/src/main/java/cc/niushuai/project/devcontrol/db/entity/DeviceLog.java b/app/src/main/java/cc/niushuai/project/devcontrol/db/entity/DeviceLog.java
new file mode 100644
index 0000000..ff12d1c
--- /dev/null
+++ b/app/src/main/java/cc/niushuai/project/devcontrol/db/entity/DeviceLog.java
@@ -0,0 +1,48 @@
+package cc.niushuai.project.devcontrol.db.entity;
+
+import org.greenrobot.greendao.annotation.Entity;
+import org.greenrobot.greendao.annotation.Id;
+import org.greenrobot.greendao.annotation.Index;
+
+import java.io.Serializable;
+
+/**
+ * 设备日志
+ *
+ * @author niushuai233
+ * @date 2022/10/26 11:56
+ */
+//@Entity(nameInDb = "tb_dc_device_log")
+public class DeviceLog implements Serializable {
+
+    private static final long serialVersionUID = 1175396508635274219L;
+
+    @Id
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @Index
+    private Long deviceId;
+
+    /**
+     * key
+     */
+    private String typeKey;
+
+    /**
+     * key
+     */
+    private String typeName;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+}
diff --git a/app/src/main/res/layout/main_nav_fragment_set_up.xml b/app/src/main/res/layout/main_nav_fragment_set_up.xml
index 3bdb04c..ec1c607 100644
--- a/app/src/main/res/layout/main_nav_fragment_set_up.xml
+++ b/app/src/main/res/layout/main_nav_fragment_set_up.xml
@@ -134,8 +134,8 @@
                 <TextView
                     android:id="@+id/setup_log_keep_day_display"
                     style="@style/SetupExt"
-                    android:text="7"
-                    />
+                    android:layout_marginRight="10dp"
+                    android:text="7" />
             </LinearLayout>
 
         </RelativeLayout>
diff --git a/app/src/main/res/values/setup_styles.xml b/app/src/main/res/values/setup_styles.xml
index ca3e64a..9272a80 100644
--- a/app/src/main/res/values/setup_styles.xml
+++ b/app/src/main/res/values/setup_styles.xml
@@ -52,8 +52,8 @@
         <item name="android:layout_width">128dp</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:textSize">12dp</item>
+        <item name="android:textSize">16dp</item>
         <item name="android:textColor">@color/gray</item>
-        <item name="android:gravity">center_vertical</item>
+        <item name="android:gravity">center_vertical|right</item>
     </style>
 </resources>
\ No newline at end of file