From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
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;//鍙栨按鍙ｅ悕绉�
+ @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