From 7a1caa42ad3282ff22513785fa997953e084b188 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 16 十二月 2024 15:50:31 +0800
Subject: [PATCH] 1.修改app的Icon。 2.优化取水口加载本地数据,改为异步加载。 3.添加取水口点击后显示取水口信息。 4.美化登录界面。

---
 app/src/main/java/com/dayu/pipirrapp/bean/db/MarkerBean.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/dayu/pipirrapp/bean/db/MarkerBean.java b/app/src/main/java/com/dayu/pipirrapp/bean/db/MarkerBean.java
index e259685..c922e95 100644
--- a/app/src/main/java/com/dayu/pipirrapp/bean/db/MarkerBean.java
+++ b/app/src/main/java/com/dayu/pipirrapp/bean/db/MarkerBean.java
@@ -1,5 +1,6 @@
 package com.dayu.pipirrapp.bean.db;
 
+import androidx.annotation.Nullable;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
@@ -12,20 +13,63 @@
 @Entity
 public class MarkerBean {
     @PrimaryKey(autoGenerate = true)
-    public long id;
-
-    String blockId;
+    public long localid;
+    @Nullable
+    String id;//鏈嶅姟鍣ㄨ繑鍥炵殑鍙栨按鍙d
+    @Nullable
+    String blockId;//鍖哄煙id
+    @Nullable
     String deleted;//閫昏緫鍒犻櫎鏍囪瘑
+    @Nullable
     String divideId;//string
+
     String lat;//缁忓害
     String lng;//绾害
+    @Nullable
     String name;//鍙栨按鍙e悕绉�
+    @Nullable
     String operateDt;//鎿嶄綔鏃堕棿
+    @Nullable
     String operator;//鎿嶄綔浜虹紪鍙�
+    @Nullable
     String remarks;//澶囨敞
+    @Nullable
     String townId;//鎵�鍦ㄩ晣缂栧彿
+    @Nullable
     String villageId;//鎵�鍦ㄦ潙缂栧彿
+    @Nullable
     String countyId;//鎵�鍦ㄥ幙缂栧彿
+    @Nullable
+    String address;//鍦板潃
+    @Nullable
+    String blockName;//鐗囧尯鍚嶇О
+
+    @Nullable
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(@Nullable String address) {
+        this.address = address;
+    }
+
+    @Nullable
+    public String getBlockName() {
+        return blockName;
+    }
+
+    public void setBlockName(@Nullable String blockName) {
+        this.blockName = blockName;
+    }
+
+    @Nullable
+    public String getId() {
+        return id;
+    }
+
+    public void setId(@Nullable String id) {
+        this.id = id;
+    }
 
     public String getBlockId() {
         return blockId;

--
Gitblit v1.8.0