From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001 From: Linjiajia <319408893@qq.com> Date: 星期二, 25 七月 2023 22:18:27 +0800 Subject: [PATCH] 基本功能完成 --- app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java | 123 +++++++++++++++++++++++++--------------- 1 files changed, 76 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java index 4ee7a4f..d492e81 100644 --- a/app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java +++ b/app/src/main/java/com/application/zhangshi_app_android/bean/CleanStorageBean.java @@ -1,5 +1,8 @@ package com.application.zhangshi_app_android.bean; +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; + import java.io.Serializable; /** @@ -10,33 +13,27 @@ public class CleanStorageBean implements Serializable { //搴忓彿 private int id; - //绫诲瀷 - private String type; + //绫诲瀷 0.淇濇磥 1.鏀剁撼 + private int kind; //閫傜敤浜� - private String suitablePeople; + private String suitable; //绫诲埆 - private String category; + private String type; //淇濇磥鏂规硶 - private String cleanMethod; + private String method; //鏉愭枡瀛樻斁鍦� - private String materialStorageLocation; + private String place; //鏀剧疆鍦扮偣 - private String placementLocation; + private String location; //澶囨敞 private String remark; private String url; - - public CleanStorageBean(int id, String type, String suitablePeople, String category, String cleanMethod, String materialStorageLocation, String placementLocation, String remark, String url) { - this.id = id; - this.type = type; - this.suitablePeople = suitablePeople; - this.category = category; - this.cleanMethod = cleanMethod; - this.materialStorageLocation = materialStorageLocation; - this.placementLocation = placementLocation; - this.remark = remark; - this.url = url; - } + //瀹跺涵id + private String familyId; + //鍒涘缓鏃堕棿 + private String createTime; + //鍙戠敓鏃堕棿 + private String happenTime; public int getId() { return id; @@ -44,6 +41,30 @@ public void setId(int id) { this.id = id; + } + + + public void setKind(String kind) { + if (kind.equals("鏀剁撼")) { + this.kind = 1; + } else{ + this.kind = 0; + } + } + public String getKind() { + if (kind == 1) { + return "鏀剁撼"; + } else { + return "淇濇磥"; + } + } + + public String getSuitable() { + return suitable; + } + + public void setSuitable(String suitable) { + this.suitable = suitable; } public String getType() { @@ -54,44 +75,28 @@ this.type = type; } - public String getSuitablePeople() { - return suitablePeople; + public String getMethod() { + return method; } - public void setSuitablePeople(String suitablePeople) { - this.suitablePeople = suitablePeople; + public void setMethod(String method) { + this.method = method; } - public String getCategory() { - return category; + public String getPlace() { + return place; } - public void setCategory(String category) { - this.category = category; + public void setPlace(String place) { + this.place = place; } - public String getCleanMethod() { - return cleanMethod; + public String getLocation() { + return location; } - public void setCleanMethod(String cleanMethod) { - this.cleanMethod = cleanMethod; - } - - public String getMaterialStorageLocation() { - return materialStorageLocation; - } - - public void setMaterialStorageLocation(String materialStorageLocation) { - this.materialStorageLocation = materialStorageLocation; - } - - public String getPlacementLocation() { - return placementLocation; - } - - public void setPlacementLocation(String placementLocation) { - this.placementLocation = placementLocation; + public void setLocation(String location) { + this.location = location; } public String getRemark() { @@ -109,4 +114,28 @@ public void setUrl(String url) { this.url = url; } + + public String getFamilyId() { + return familyId; + } + + public void setFamilyId(String familyId) { + this.familyId = familyId; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getHappenTime() { + return happenTime; + } + + public void setHappenTime(String happenTime) { + this.happenTime = happenTime; + } } -- Gitblit v1.9.1