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 @@ + android:layout_marginRight="10dp" + android:text="7" /> 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 @@ 128dp match_parent 1 - 12dp + 16dp @color/gray - center_vertical + center_vertical|right \ No newline at end of file