From 31b7700b976a46901f67c5d7a00281ca4745fc9f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期六, 07 十月 2023 21:44:35 +0800
Subject: [PATCH] 调整旅游模块功能
---
app/src/main/res/layout/activity_family_assets.xml | 20
app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java | 23
app/src/main/res/layout/pop_annual_health_status.xml | 2
app/src/main/res/layout/activity_personal_notepad.xml | 20
app/src/main/res/layout/pop_basic_information_single.xml | 2
app/src/main/res/layout/activity_genealogy.xml | 16
app/src/main/res/layout/activity_clean_storage.xml | 30
app/src/main/res/layout/activity_annual_health_status.xml | 22
app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java | 156 ++--
app/src/main/java/com/application/zhangshi_app_android/ui/function/PersonalNotepadActivityViewModel.java | 4
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java | 24
app/src/main/res/layout/activity_tourism_detail.xml | 295 ++-----
app/src/main/res/layout/item_daily_consume_record.xml | 1
app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java | 10
app/src/main/res/layout/activity_property.xml | 34
app/build.gradle | 4
app/src/main/res/layout/activity_annual_health_status_detail.xml | 6
app/src/main/java/com/application/zhangshi_app_android/bean/TourismRequestBean.java | 44
app/src/main/res/layout/activity_hundred_wish.xml | 20
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java | 170 +---
app/src/main/res/layout/activity_family_memorabilia_detail.xml | 4
app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java | 10
app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java | 2
app_base/src/main/java/com/android/app_base/base/adapter/databinding/ImageViewAdapter.java | 7
app/src/main/res/layout/activity_pet_memo.xml | 18
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java | 11
app/src/main/res/layout/activity_pet.xml | 54
app_base/src/main/java/com/android/app_base/utils/rxbus/MessageEvent.java | 6
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java | 42 +
app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java | 10
app/src/main/res/layout/item_tourism.xml | 27
app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceBean.java | 148 ++-
app/src/main/res/layout/activity_personal_notepad_detail.xml | 2
app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceRequestBean.java | 75 +
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivityViewModel.java | 15
app/src/main/res/values/themes.xml | 1
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java | 74 -
app/src/main/res/layout/activity_privacy.xml | 22
app/src/main/res/layout/activity_honor_collection.xml | 20
app/src/main/res/layout/activity_tourism_experience.xml | 36
app/src/main/res/layout/activity_family_memorabilia.xml | 18
app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java | 7
app/src/main/res/layout/activity_contacts.xml | 22
app/src/main/res/layout/activity_certificate_of_honor.xml | 12
app/src/main/res/layout/activity_tourism.xml | 28
app/src/main/res/layout/activity_home_devices.xml | 28
.idea/deploymentTargetDropDown.xml | 4
app/src/main/res/layout/activity_income_and_expenses_detail.xml | 4
app/src/main/res/layout/activity_home_devices_detail.xml | 2
app/src/main/res/layout/pop_basic_information_double.xml | 4
app/src/main/res/layout/item_tourism_experience.xml | 265 +++---
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java | 21
app/src/main/res/layout/activity_income_and_expenses.xml | 20
app/src/main/res/layout/activity_property_detail.xml | 2
app/src/main/res/layout/activity_little_doctor.xml | 16
app/src/main/res/layout/acitivity_tourism_experience_detail.xml | 253 ++++--
56 files changed, 1,118 insertions(+), 1,075 deletions(-)
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index a02f464..6f1b369 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
- <value value="D:\software\Android\.android\avd\Pixel_API_30.avd" />
+ <value value="D:\software\Android\.android\avd\Nexus_6_API_30.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
- <timeTargetWasSelectedWithDropDown value="2023-08-22T08:53:37.805871200Z" />
+ <timeTargetWasSelectedWithDropDown value="2023-10-06T11:49:32.134674900Z" />
</component>
</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2a017be..d0ea531 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@
applicationId "com.application.zhangshi_app_android"
minSdk 24
targetSdk 33
- versionCode 5
- versionName "1.0.31"
+ versionCode 6
+ versionName "1.0.32"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
//APP鐨刡uild.gradle璁剧疆鏀寔鐨凷O搴撴灦鏋�
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
index 5e1ab0c..070a590 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
@@ -173,6 +173,16 @@
notifyItemRangeChanged(0,getItemCount());
}
+ public void updateData(TourismBean tourismBean) {
+ for (int i = 0; i < mDataList.size(); i++) {
+ if (mDataList.get(i).getId().equals(tourismBean.getId())){
+ mDataList.set(i,tourismBean);
+ notifyItemChanged(i);
+ break;
+ }
+ }
+ }
+
public static class ViewHolder extends BaseViewHolder<ItemTourismBinding>{
public ViewHolder(ItemTourismBinding binding) {
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java
index c0825a1..20dcfe4 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java
@@ -7,37 +7,37 @@
/**
* @author Ljj
* @date 2023.04.28. 21:17
- * @desc 鏃呮父璐圭敤璁板綍
+ * @desc 瀹岀編鏃呴�旇褰�
*/
public class TourismBean implements Serializable {
//id
private String id;
- //鏍囬
- private String title;
- //寮�濮嬫椂闂�
- private String startTime;
- //缁撴潫鏃堕棿
- private String endTime;
- //鍒涘缓鏃堕棿
- private String createTime;
- //鎬诲ぉ鏁�
- private String totalDay;
- //鎬婚噾棰�
- private double totalCost;
- //椁愯垂
- private double eat;
- //浣忓璐�
- private double stay;
- //浜ら�氳垂
- private double traffic;
- //璐墿
- private double shopping;
- //闂ㄧエ
- private double entrance;
//鐢ㄦ埛id
- private String myId;
- //姣忔棩娑堣垂璇︾粏璁板綍
- private List<ConsumeRecordBean> detailList = new ArrayList<>();
+ private String uid;
+ //鏃呮父鍚嶇О
+ private String name;
+ //鏃呮父鍘诲悜锛堝浗鍐呫�佸浗澶栵級
+ private String destination;
+ //鏃呮父寮�濮嬫椂闂�
+ private String startTime;
+ //鏃呮父缁撴潫鏃堕棿
+ private String endTime;
+ //鏃呮父鎬ц川锛堣嚜璐广�佸叕璐广�侀個璇凤級
+ private String property;
+ //鏃呮父鏂瑰紡锛堝弬鍥€�佽嚜鐢辫銆佽嚜椹炬父銆佸崐鑷敱鍗婅嚜椹撅級
+ private String manner;
+ //鎬讳氦閫氳垂
+ private double travelTotal;
+ //鎬讳綇瀹胯垂
+ private double stayTotal;
+ //鎬婚楗垂
+ private double eatTotal;
+ //鎬婚棬绁ㄨ垂
+ private double entranceTotal;
+ //鍥㈣垂
+ private double groupTotal;
+ //鎬婚噾棰�
+ private double totalPrice;
public String getId() {
return id;
@@ -47,12 +47,28 @@
this.id = id;
}
- public String getTitle() {
- return title;
+ public String getUid() {
+ return uid;
}
- public void setTitle(String title) {
- this.title = title;
+ public void setUid(String uid) {
+ this.uid = uid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDestination() {
+ return destination;
+ }
+
+ public void setDestination(String destination) {
+ this.destination = destination;
}
public String getStartTime() {
@@ -71,83 +87,67 @@
this.endTime = endTime;
}
- public String getCreateTime() {
- return createTime;
+ public String getProperty() {
+ return property;
}
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
+ public void setProperty(String property) {
+ this.property = property;
}
- public String getTotalDay() {
- return totalDay;
+ public String getManner() {
+ return manner;
}
- public void setTotalDay(String totalDay) {
- this.totalDay = totalDay;
+ public void setManner(String manner) {
+ this.manner = manner;
}
- public double getTotalCost() {
- return totalCost;
+ public double getTravelTotal() {
+ return travelTotal;
}
- public void setTotalCost(double totalCost) {
- this.totalCost = totalCost;
+ public void setTravelTotal(double travelTotal) {
+ this.travelTotal = travelTotal;
}
- public double getEat() {
- return eat;
+ public double getStayTotal() {
+ return stayTotal;
}
- public void setEat(double eat) {
- this.eat = eat;
+ public void setStayTotal(double stayTotal) {
+ this.stayTotal = stayTotal;
}
- public double getStay() {
- return stay;
+ public double getEatTotal() {
+ return eatTotal;
}
- public void setStay(double stay) {
- this.stay = stay;
+ public void setEatTotal(double eatTotal) {
+ this.eatTotal = eatTotal;
}
- public double getTraffic() {
- return traffic;
+ public double getEntranceTotal() {
+ return entranceTotal;
}
- public void setTraffic(double traffic) {
- this.traffic = traffic;
+ public void setEntranceTotal(double entranceTotal) {
+ this.entranceTotal = entranceTotal;
}
- public double getShopping() {
- return shopping;
+ public double getGroupTotal() {
+ return groupTotal;
}
- public void setShopping(double shopping) {
- this.shopping = shopping;
+ public void setGroupTotal(double groupTotal) {
+ this.groupTotal = groupTotal;
}
- public double getEntrance() {
- return entrance;
+ public double getTotalPrice() {
+ return totalPrice;
}
- public void setEntrance(double entrance) {
- this.entrance = entrance;
- }
-
- public String getMyId() {
- return myId;
- }
-
- public void setMyId(String myId) {
- this.myId = myId;
- }
-
- public List<ConsumeRecordBean> getDetailList() {
- return detailList;
- }
-
- public void setDetailList(List<ConsumeRecordBean> detailList) {
- this.detailList = detailList;
+ public void setTotalPrice(double totalPrice) {
+ this.totalPrice = totalPrice;
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceBean.java
index b0ce0c6..105a57c 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceBean.java
@@ -10,45 +10,55 @@
public class TourismExperienceBean implements Serializable{
//id
private int id;
- //鏍囬
- private String title;
- //鍙戠敓鏃堕棿
- private String happenTime;
- //鍦扮偣
+ //瀵瑰簲鐨勫畬缇庢梾閫攊d
+ private String cid;
+ //琛岀▼鏃堕棿
+ private String happenDate;
+ //琛岀▼鍦扮偣
private String address;
- //浜虹墿
- private String people;
- //鏃呮湡
- private String travelPeriod;
- //鎸佽瘉鏃呮父
- private String certificate;
- //璐圭敤
- private String totalPrice;
- //0.鍏垂 1.鑷垂
- private int self;
- //澶囨敞
- private String remark;
+ //鏅偣
+ private String scenic;
+ //闂ㄧエ璐�
+ private double entrance;
+ //浣忓閰掑簵
+ private String hotel;
+ //浣忓璐圭敤
+ private double stay;
+ //椁愯垂
+ private double eat;
+ //浜ら�氳垂
+ private double travel;
//鐢靛瓙鏂囦欢
private String url;
- //鍒涘缓鏃堕棿
- private String createTime;
- //璐圭敤璁板綍琛╥d
- private String feeId;
+ //鍑鸿鏂瑰紡
+ private String travelMode;
+ //杞︽or鑸彮
+ private String flight;
+ //浣跨敤璇佷欢
+ private String document;
- public String getTitle() {
- return title;
+ public int getId() {
+ return id;
}
- public void setTitle(String title) {
- this.title = title;
+ public void setId(int id) {
+ this.id = id;
}
- public String getHappenTime() {
- return happenTime;
+ public String getCid() {
+ return cid;
}
- public void setHappenTime(String happenTime) {
- this.happenTime = happenTime;
+ public void setCid(String cid) {
+ this.cid = cid;
+ }
+
+ public String getHappenDate() {
+ return happenDate;
+ }
+
+ public void setHappenDate(String happenDate) {
+ this.happenDate = happenDate;
}
public String getAddress() {
@@ -59,52 +69,44 @@
this.address = address;
}
- public String getPeople() {
- return people;
+ public double getEntrance() {
+ return entrance;
}
- public void setPeople(String people) {
- this.people = people;
+ public void setEntrance(double entrance) {
+ this.entrance = entrance;
}
- public String getTravelPeriod() {
- return travelPeriod;
+ public String getHotel() {
+ return hotel;
}
- public void setTravelPeriod(String travelPeriod) {
- this.travelPeriod = travelPeriod;
+ public void setHotel(String hotel) {
+ this.hotel = hotel;
}
- public String getCertificate() {
- return certificate;
+ public double getStay() {
+ return stay;
}
- public void setCertificate(String certificate) {
- this.certificate = certificate;
+ public void setStay(double stay) {
+ this.stay = stay;
}
- public String getTotalPrice() {
- return totalPrice;
+ public double getEat() {
+ return eat;
}
- public void setTotalPrice(String totalPrice) {
- this.totalPrice = totalPrice;
+ public void setEat(double eat) {
+ this.eat = eat;
}
- public int getSelf() {
- return self;
+ public double getTravel() {
+ return travel;
}
- public void setSelf(int self) {
- this.self = self;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
+ public void setTravel(double travel) {
+ this.travel = travel;
}
public String getUrl() {
@@ -115,27 +117,35 @@
this.url = url;
}
- public int getId() {
- return id;
+ public String getTravelMode() {
+ return travelMode;
}
- public void setId(int id) {
- this.id = id;
+ public void setTravelMode(String travelMode) {
+ this.travelMode = travelMode;
}
- public String getCreateTime() {
- return createTime;
+ public String getFlight() {
+ return flight;
}
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
+ public void setFlight(String flight) {
+ this.flight = flight;
}
- public String getFeeId() {
- return feeId;
+ public String getDocument() {
+ return document;
}
- public void setFeeId(String feeId) {
- this.feeId = feeId;
+ public void setDocument(String document) {
+ this.document = document;
+ }
+
+ public String getScenic() {
+ return scenic;
+ }
+
+ public void setScenic(String scenic) {
+ this.scenic = scenic;
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceRequestBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceRequestBean.java
index 463e6cf..9258771 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceRequestBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismExperienceRequestBean.java
@@ -1,25 +1,26 @@
package com.application.zhangshi_app_android.bean;
+import java.util.HashMap;
import java.util.Map;
/**
* @author Ljj
* @date 2023.06.11. 16:50
- * @desc
+ * @desc 鏃呮父缁忓巻璇锋眰鍙傛暟
*/
-public class TourismExperienceRequestBean extends PageRequestBean{
+public class TourismExperienceRequestBean{
//璐圭敤id
- private String fid;
+ private String cid;
//寮�濮嬫椂闂�
private String happenStartTime;
//缁撴潫鏃堕棿
private String happenEndTime;
- //鏍囬
- private String title;
- //鍦扮偣
+ //琛岀▼鍦扮偣
private String address;
- //浜虹墿
- private String people;
+ //鏅偣
+ private String scenic;
+ //閰掑簵
+ private String hotel;
public String getHappenStartTime() {
return happenStartTime;
@@ -37,14 +38,6 @@
this.happenEndTime = happenEndTime;
}
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
public String getAddress() {
return address;
}
@@ -53,31 +46,49 @@
this.address = address;
}
- public String getPeople() {
- return people;
+ public String getScenic() {
+ return scenic;
}
- public void setPeople(String people) {
- this.people = people;
+ public void setScenic(String scenic) {
+ this.scenic = scenic;
}
- public String getFid() {
- return fid;
+ public String getHotel() {
+ return hotel;
}
- public void setFid(String fid) {
- this.fid = fid;
+ public void setHotel(String hotel) {
+ this.hotel = hotel;
}
- @Override
+ public String getCid() {
+ return cid;
+ }
+
+ public void setCid(String cid) {
+ this.cid = cid;
+ }
+
public Map<String, Object> toMap() {
- Map<String, Object> map = super.toMap();
- map.put("fid",fid == null ? "" : fid);
- map.put("happenStartTime",happenStartTime == null ? "" : happenStartTime);
- map.put("happenEndTime",happenEndTime == null ? "" : happenEndTime);
- map.put("title",title == null ? "" : title);
- map.put("address",address == null ? "" : address);
- map.put("people",people == null ? "" : people);
+ Map<String, Object> map = new HashMap<>();
+ map.put("cid", cid == null ? "" : cid);
+
+ if (happenStartTime != null) {
+ map.put("happenStartTime", happenStartTime);
+ }
+ if (happenEndTime != null) {
+ map.put("happenEndTime", happenEndTime);
+ }
+ if (address != null) {
+ map.put("address", address);
+ }
+ if (scenic != null) {
+ map.put("scenic", scenic);
+ }
+ if (hotel != null) {
+ map.put("hotel", hotel);
+ }
return map;
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismRequestBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismRequestBean.java
index dccf48c..a2f4c1f 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismRequestBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismRequestBean.java
@@ -1,5 +1,7 @@
package com.application.zhangshi_app_android.bean;
+import android.text.TextUtils;
+
import java.util.Map;
/**
@@ -8,40 +10,46 @@
* @desc
*/
public class TourismRequestBean extends PageRequestBean{
- private String start;
- private String end;
- private String totalDay;
+ private String happenStartTime;
+ private String happenEndTime;
+ private String name;
- public String getStart() {
- return start;
+ public String getHappenStartTime() {
+ return happenStartTime;
}
- public void setStart(String start) {
- this.start = start;
+ public void setHappenStartTime(String happenStartTime) {
+ this.happenStartTime = happenStartTime;
}
- public String getEnd() {
- return end;
+ public String getHappenEndTime() {
+ return happenEndTime;
}
- public void setEnd(String end) {
- this.end = end;
+ public void setHappenEndTime(String happenEndTime) {
+ this.happenEndTime = happenEndTime;
}
- public String getTotalDay() {
- return totalDay;
+ public String getName() {
+ return name;
}
- public void setTotalDay(String totalDay) {
- this.totalDay = totalDay;
+ public void setName(String name) {
+ this.name = name;
}
@Override
public Map<String, Object> toMap() {
Map<String, Object> map = super.toMap();
- map.put("start", start == null ? "" : start);
- map.put("end", end == null ? "" : end);
- map.put("totalDay",totalDay == null ? "" : totalDay);
+ if (!TextUtils.isEmpty(happenStartTime)) {
+ map.put("happenStartTime", happenStartTime);
+ }
+ if (!TextUtils.isEmpty(happenEndTime)) {
+ map.put("happenEndTime", happenEndTime);
+ }
+ if (!TextUtils.isEmpty(name)) {
+ map.put("name", name);
+ }
return map;
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java b/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
index 13101ed..b805a04 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
@@ -416,6 +416,14 @@
}
/**
+ * 鏍规嵁 id 鑾峰彇鏃呮父娑堣垂璁板綍
+ */
+ @Override
+ public Observable<ResultData<TourismBean>> getTourismById(String id) {
+ return mHttpDataSource.getTourismById(id);
+ }
+
+ /**
* 鏂板鏃呮父娑堣垂璁板綍
*/
@Override
@@ -442,7 +450,7 @@
/**
* 鑾峰彇鏃呮父缁忓巻
*/
- public Observable<ResultData<PageResponseBean<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) {
+ public Observable<ResultData<List<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) {
return mHttpDataSource.getTourismExperience(toMap);
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
index d72f0d4..a0f3b93 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
@@ -275,6 +275,11 @@
Observable<ResultData<PageResponseBean<TourismBean>>> getTourism(Map<String, Object> toMap);
/**
+ * 鏍规嵁 id 鑾峰彇鏃呮父璐圭敤璁板綍
+ */
+ Observable<ResultData<TourismBean>> getTourismById(String id);
+
+ /**
* 鏂板鏃呮父璐圭敤璁板綍
*/
Observable<ResultData<String>> addTourism(TourismBean tourismBean);
@@ -292,7 +297,7 @@
/**
* 鑾峰彇鏃呮父缁忓巻
*/
- Observable<ResultData<PageResponseBean<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap);
+ Observable<ResultData<List<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap);
/**
* 鏂板鏃呮父缁忓巻
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
index 5ff3268..96fc687 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
@@ -345,49 +345,54 @@
/**
* 鑾峰彇鏃呮父璐圭敤璁板綍
*/
- @GET("/zTravelPrice/all")
+ @GET("/travel/count/all")
Observable<ResultData<PageResponseBean<TourismBean>>> getTourism(@QueryMap Map<String, Object> toMap);
+
+ /**鏍规嵁id鑾峰彇鏃呮父璐圭敤璁板綍
+ */
+ @GET("/travel/count/{id}")
+ Observable<ResultData<TourismBean>> getTourismById(@Path("id") String id);
/**
* 娣诲姞鏃呮父璐圭敤璁板綍
*/
- @POST("/zTravelPrice")
+ @POST("/travel/count")
Observable<ResultData<String>> addTourism(@Body TourismBean tourismBean);
/**
* 鍒犻櫎鏃呮父璐圭敤璁板綍
*/
- @DELETE("/zTravelPrice/{ids}")
+ @DELETE("/travel/count/{ids}")
Observable<ResultData<String>> deleteTourism(@Path("ids") String ids);
/**
* 淇敼鏃呮父璐圭敤璁板綍
*/
- @PUT("/zTravelPrice")
+ @PUT("/travel/count")
Observable<ResultData<String>> updateTourism(@Body TourismBean tourismBean);
/**
* 鑾峰彇鏃呮父缁忓巻
*/
- @GET("/zTravelBase/all")
- Observable<ResultData<PageResponseBean<TourismExperienceBean>>> getTourismExperience(@QueryMap Map<String, Object> toMap);
+ @GET("/travel/detail")
+ Observable<ResultData<List<TourismExperienceBean>>> getTourismExperience(@QueryMap Map<String, Object> toMap);
/**
* 鏂板鏃呮父缁忓巻
*/
- @POST("/zTravelBase")
+ @POST("/travel/detail")
Observable<ResultData<String>> addTourismExperience(@Body TourismExperienceBean tourismExperienceBean);
/**
* 鍒犻櫎鏃呮父缁忓巻
*/
- @DELETE("/zTravelBase/{ids}")
+ @DELETE("/travel/detail/{ids}")
Observable<ResultData<String>> deleteTourismExperience(@Path("ids") String ids);
/**
* 淇敼鏃呮父缁忓巻
*/
- @PUT("/zTravelBase")
+ @PUT("/travel/detail")
Observable<ResultData<String>> updateTourismExperience(@Body TourismExperienceBean tourismExperienceBean);
/**
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
index 8c88527..f570b8f 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
@@ -446,6 +446,14 @@
}
/**
+ * 鏍规嵁 id 鑾峰彇鏃呮父璐圭敤璁板綍
+ */
+ @Override
+ public Observable<ResultData<TourismBean>> getTourismById(String id) {
+ return apiService.getTourismById(id);
+ }
+
+ /**
* 鏂板鏃呮父璐圭敤璁板綍
*/
@Override
@@ -473,7 +481,7 @@
* 鑾峰彇鏃呮父缁忓巻
*/
@Override
- public Observable<ResultData<PageResponseBean<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) {
+ public Observable<ResultData<List<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) {
return apiService.getTourismExperience(toMap);
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PersonalNotepadActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PersonalNotepadActivityViewModel.java
index 8a07503..1132b4f 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PersonalNotepadActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PersonalNotepadActivityViewModel.java
@@ -94,10 +94,6 @@
* 鍔犺浇鏇村
*/
public void getMorePersonalNotepads() {
- if (true){
- changeStateView(StateViewEnum.DATA_NULL);
- return;
- }
if (getRequestBeanLiveData().getValue() == null){
getRequestBeanLiveData().setValue(new PersonalNotepadRequestBean());
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java
index 9d24d5a..1dec1df 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java
@@ -16,6 +16,7 @@
import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.ScreenSizeUtils;
import com.android.app_base.utils.Utils;
+import com.android.app_base.utils.rxbus.MessageEvent;
import com.android.app_base.utils.rxbus.RxBus;
import com.android.app_base.widget.LinearItemDecoration;
import com.application.zhangshi_app_android.BR;
@@ -187,6 +188,9 @@
adapter.setData(beans);
}
);
+ viewModel.getBeanLiveData().observe(this, tourismBean -> {
+ adapter.updateData(tourismBean);
+ });
viewModel.getCheckListLiveData().observe(this, (Observer<List<TourismBean>>) beans -> {
if (viewModel.getOperateTypeLiveData().getValue() == 0){
return;
@@ -237,6 +241,13 @@
adapter.removeItem(bean);
}
});
+ //瑙傚療鏁版嵁鐨勫彉鍖�
+ RxBus.getInstance().toObservable(this, MessageEvent.class)
+ .subscribe(bean -> {
+ if (bean.getMessageEventCode() == MessageEvent.EVENT_TOURISM_CONSUME_CHANGE){
+ viewModel.getTourismById(bean.getMessageEventData().toString());
+ }
+ });
//瑙傚療鏁版嵁鐨勫彉鍖栵紝鏈夊彉鍖栧寘鎷坊鍔犮�佷慨鏀广�佸垹闄ら兘浼氬彂閫佹秷鎭紝鎺ユ敹鍒版秷鎭悗閲嶆柊鑾峰彇鏁版嵁
RxBus.getInstance().toObservable(this, TourismBean.class)
.subscribe(bean -> {
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java
index 7e8e6d5..fd3a1b0 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java
@@ -40,7 +40,7 @@
private MutableLiveData<List<TourismBean>> moreListLiveData;//涓嬫媺鍔犺浇鏁版嵁
private MutableLiveData<List<TourismBean>> finishDeleteListLiveData;//宸茬粡瀹屾垚鍒犻櫎鐨勬暟鎹紝鐢ㄤ簬adapter鐨剅emove鎿嶄綔
-
+ private MutableLiveData<TourismBean> beanLiveData;// 鏍规嵁id鑾峰彇鐨刡ean锛岀敤浜庢洿鏂版暟鎹�
public TourismActivityViewModel(@NonNull Application application) {
super(application);
}
@@ -48,6 +48,39 @@
@Override
protected DataRepository initModel() {
return DataRepository.getInstance();
+ }
+
+ /**
+ * 鏍规嵁 id 鑾峰彇
+ */
+ public void getTourismById(String id) {
+ model.getTourismById(id)
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<TourismBean>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<TourismBean> data) {
+ if (data.getCode() == CODE_SUCCESS) {
+ beanLiveData.postValue(data.getData());
+ } else {
+ messageLiveData.postValue(data.getMsg());
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
}
/**
@@ -292,6 +325,13 @@
this.finishDeleteListLiveData = finishDeleteListLiveData;
}
+ public MutableLiveData<TourismBean> getBeanLiveData() {
+ if (beanLiveData == null){
+ beanLiveData = new MutableLiveData<>();
+ }
+ return beanLiveData;
+ }
+
/**
* 鏀瑰彉鎺掑簭
* @param b true 闄嶅簭 false 鍗囧簭
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java
index f5f11a6..b9cb2a9 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java
@@ -24,11 +24,14 @@
import com.application.zhangshi_app_android.databinding.ActivityTourismDetailBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
import com.github.gzuliyujiang.wheelpicker.DatePicker;
+import com.github.gzuliyujiang.wheelpicker.OptionPicker;
import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener;
+import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.HashSet;
import java.util.List;
@@ -44,7 +47,6 @@
public class TourismDetailActivity extends DLBaseActivity<ActivityTourismDetailBinding,TourismDetailActivityViewModel> {
private int type;// 0 鏌ョ湅鍙慨鏀瑰垹闄� 1 鏂板 2 鐩存帴淇敼
private PopupWindow popupWindow;
- private DailyConsumeRecordRvAdapter adapter;
@Override
public int getLayoutId() {
@@ -69,13 +71,6 @@
@Override
public void initView() {
- adapter = new DailyConsumeRecordRvAdapter(this,viewModel);
- LinearItemDecoration itemDecoration = new LinearItemDecoration();
- itemDecoration.setBottomSpace(ScreenSizeUtils.dip2px(this,20));
- binding.rvDailyConsumeRecord.addItemDecoration(itemDecoration);
- binding.rvDailyConsumeRecord.setNestedScrollingEnabled(false);
- binding.rvDailyConsumeRecord.setAdapter(adapter);
-
if (type == 1){
viewModel.getTypeLiveData().setValue(true);
binding.titleBar.setTitle("鏂板鏃呮父璐圭敤璁板綍");
@@ -166,25 +161,54 @@
}
});
datePicker.show();
-
}
});
- binding.ivAddDailyConsumeRecord.setOnClickListener(new View.OnClickListener() {
+ binding.etWhereabouts.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- DatePicker datePicker = getDatePicker();
- datePicker.setTitle("閫夋嫨娑堣垂鏃ユ湡");
- datePicker.getWheelLayout().setDateMode(DateMode.MONTH_DAY);
- datePicker.setOnDatePickedListener(new OnDatePickedListener() {
+ List<String> list = Arrays.asList("鍥藉唴","鍥藉");
+ OptionPicker picker = getOptionPicker(list);
+ picker.setTitle("閫夋嫨鍘诲悜");
+ picker.setOnOptionPickedListener(new OnOptionPickedListener() {
@Override
- public void onDatePicked(int year, int month, int day) {
- DailyConsumeRecordBean dailyConsumeRecordBean = new DailyConsumeRecordBean();
- dailyConsumeRecordBean.setDate(month+"鏈�"+day+"鏃�");
- adapter.addItem(0,dailyConsumeRecordBean);
- adapter.setFold(true,0);
+ public void onOptionPicked(int position, Object item) {
+ binding.etWhereabouts.setText(item.toString());
+ binding.etWhereabouts.clearFocus();
}
});
- datePicker.show();
+ picker.show();
+ }
+ });
+ binding.etTourismNature.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ List<String> list = Arrays.asList("鍏垂","鑷垂","閭�璇�");
+ OptionPicker picker = getOptionPicker(list);
+ picker.setTitle("閫夋嫨鏃呮父鎬ц川");
+ picker.setOnOptionPickedListener(new OnOptionPickedListener() {
+ @Override
+ public void onOptionPicked(int position, Object item) {
+ binding.etTourismNature.setText(item.toString());
+ binding.etTourismNature.clearFocus();
+ }
+ });
+ picker.show();
+ }
+ });
+ binding.etTourismWay.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ List<String> list = Arrays.asList("鍙傚洟","鑷敱琛�","鑷┚娓�","鍗婅嚜鐢卞崐鑷┚","鍏朵粬");
+ OptionPicker picker = getOptionPicker(list);
+ picker.setTitle("閫夋嫨鏃呮父鏂瑰紡");
+ picker.setOnOptionPickedListener(new OnOptionPickedListener() {
+ @Override
+ public void onOptionPicked(int position, Object item) {
+ binding.etTourismWay.setText(item.toString());
+ binding.etTourismWay.clearFocus();
+ }
+ });
+ picker.show();
}
});
}
@@ -196,117 +220,25 @@
@Override
public void initLiveDataObserve() {
- viewModel.getBeanLiveData().observe(this,bean -> {
- if (bean!=null){
- if (bean.getDetailList()==null){
- return;
- }
- //鏍规嵁鏃堕棿鍒嗙粍
- Set<String> set = new HashSet<>();
- for (ConsumeRecordBean consumeRecordBean : bean.getDetailList()) {
- set.add(consumeRecordBean.getHappenTime());
- }
- List<DailyConsumeRecordBean> list = new ArrayList<>();
- for (String s : set) {
- DailyConsumeRecordBean dailyConsumeRecordBean = new DailyConsumeRecordBean();
- dailyConsumeRecordBean.setDate(s);
- List<ConsumeRecordBean> consumeRecordBeans = new ArrayList<>();
- for (ConsumeRecordBean consumeRecordBean : bean.getDetailList()) {
- if (s.equals(consumeRecordBean.getHappenTime())){
- consumeRecordBeans.add(consumeRecordBean);
- dailyConsumeRecordBean.setDailyMoney(consumeRecordBean.getDayCost());
- }
- }
- dailyConsumeRecordBean.setConsumeRecordBeans(consumeRecordBeans);
- list.add(dailyConsumeRecordBean);
- }
- adapter.setData(list);
- }
+ viewModel.getBeanLiveData().observe(this, bean -> {
+
});
- viewModel.getTypeLiveData().observe(this,operateType -> {
- if (operateType){
+ viewModel.getTypeLiveData().observe(this, operateType -> {
+ if (operateType) {
if (type == 1) {
binding.ivOperate.setOnClickListener(v -> {
- if (adapter.getData() != null){
- List<ConsumeRecordBean> list = new ArrayList<>();
- for (DailyConsumeRecordBean bean : adapter.getData()) {
- if (bean.getConsumeRecordBeans() != null){
- for (ConsumeRecordBean consumeRecordBean : bean.getConsumeRecordBeans()) {
- consumeRecordBean.setHappenTime(bean.getDate());
- }
- list.addAll(bean.getConsumeRecordBeans());
- }
- }
- if (viewModel.getBeanLiveData().getValue() == null){
- return;
- }
- viewModel.getBeanLiveData().getValue().setDetailList(list);
- }
viewModel.add();
});
- }else {
+ } else {
binding.ivOperate.setOnClickListener(v -> {
- if (adapter.getData() != null){
- List<ConsumeRecordBean> list = new ArrayList<>();
- for (DailyConsumeRecordBean bean : adapter.getData()) {
- if (bean.getConsumeRecordBeans() != null){
- for (ConsumeRecordBean consumeRecordBean : bean.getConsumeRecordBeans()) {
- consumeRecordBean.setHappenTime(bean.getDate());
- }
- list.addAll(bean.getConsumeRecordBeans());
- }
- }
- if (viewModel.getBeanLiveData().getValue() == null){
- return;
- }
- viewModel.getBeanLiveData().getValue().setDetailList(list);
- }
viewModel.update();
});
}
- }else {
+ } else {
binding.ivOperate.setOnClickListener(v -> {
- popupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,85) +binding.ivOperate.getWidth(),0);
+ popupWindow.showAsDropDown(binding.ivOperate, -ScreenSizeUtils.dip2px(this, 85) + binding.ivOperate.getWidth(), 0);
});
}
});
- RxBus.getInstance().toObservable(this, MessageEvent.class)
- .subscribe(messageEvent -> {
- if (messageEvent.getMessageEventCode() == MessageEvent.EVENT_TOURISM_CONSUME_CHANGE){
- if (adapter.getItemCount() == 0 || adapter.getData() == null){
- binding.etTotalCost.setText("0");
- binding.etTotalCost1.setText("0");
- binding.etTraffic.setText("0");
- binding.etStay.setText("0");
- binding.etShopping.setText("0");
- binding.etEntrance.setText("0");
- binding.etEat.setText("0");
- return;
- }
- Set<String> dateSet = new HashSet<>();
- double totalCost = 0,traffic = 0,stay = 0,shopping = 0,entrance = 0,eat = 0;
- for (DailyConsumeRecordBean dailyConsumeRecordBean : adapter.getData()) {
- dateSet.add(dailyConsumeRecordBean.getDate());
- totalCost += dailyConsumeRecordBean.getDailyMoney();
- if (dailyConsumeRecordBean.getConsumeRecordBeans() != null){
- for (ConsumeRecordBean consumeRecordBean : dailyConsumeRecordBean.getConsumeRecordBeans()){
- traffic += consumeRecordBean.getTraffic();
- stay += consumeRecordBean.getStay();
- shopping += consumeRecordBean.getShopping();
- entrance += consumeRecordBean.getEntrance();
- eat += consumeRecordBean.getEat();
- }
- }
- }
- binding.etTotalCost.setText(BigDecimal.valueOf(totalCost).stripTrailingZeros().toPlainString());
- binding.etTotalCost1.setText(BigDecimal.valueOf(totalCost).stripTrailingZeros().toPlainString());
- binding.etTraffic.setText(BigDecimal.valueOf(traffic).stripTrailingZeros().toPlainString());
- binding.etStay.setText(BigDecimal.valueOf(stay).stripTrailingZeros().toPlainString());
- binding.etShopping.setText(BigDecimal.valueOf(shopping).stripTrailingZeros().toPlainString());
- binding.etEntrance.setText(BigDecimal.valueOf(entrance).stripTrailingZeros().toPlainString());
- binding.etEat.setText(BigDecimal.valueOf(eat).stripTrailingZeros().toPlainString());
- binding.etTotalDay.setText(dateSet.size()+"");
- }
- });
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java
index 00e26c1..74b0c3b 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java
@@ -35,7 +35,6 @@
private TourismExperienceRvAdapter adapter;
private boolean isSearchLayoutVisible;
private PopupWindow mOperatePopupWindow;
- private String fid;
@Override
public int getLayoutId() {
return R.layout.activity_tourism_experience;
@@ -49,18 +48,21 @@
@Override
public void initParam() {
- fid = getIntent().getStringExtra("id");
- viewModel.getRequestBeanLiveData().getValue().setFid(fid);
+ String cid = getIntent().getStringExtra("id");
+ viewModel.getRequestBeanLiveData().getValue().setCid(cid);
+ viewModel.setCid(cid);
}
@Override
public void initView() {
//涓嬫媺鍒锋柊甯冨眬
- binding.refreshLayout.setEnableRefresh(false);
- binding.refreshLayout.setEnableLoadMore(true);
+ binding.refreshLayout.setEnableRefresh(true);
+ binding.refreshLayout.setEnableLoadMore(false);
binding.refreshLayout.setEnableOverScrollDrag(true);
binding.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
- viewModel.getMoreTourismExperience();
+ });
+ binding.refreshLayout.setOnRefreshListener(refreshLayout -> {
+ viewModel.getTourismExperience();
});
//recyclerView閫傞厤鍣�
adapter = new TourismExperienceRvAdapter(this,viewModel);
@@ -111,7 +113,7 @@
binding.fabAdd.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- AppManager.getAppManager().startActivity(new Intent(getSelfActivity(), TourismExperienceDetailActivity.class).putExtra(BaseConfig.EXTRA_TYPE,1).putExtra("fid",fid));
+ AppManager.getAppManager().startActivity(new Intent(getSelfActivity(), TourismExperienceDetailActivity.class).putExtra(BaseConfig.EXTRA_TYPE,1).putExtra("cid",viewModel.getCid()));
}
});
binding.etStartTime.addTextChangedListener(new TextWatcher() {
@@ -289,13 +291,14 @@
protected void dataFinish() {
super.dataFinish();
binding.refreshLayout.finishLoadMore();
+ binding.refreshLayout.finishRefresh();
}
@Override
protected void hide() {
super.hide();
binding.layoutDataNull.setVisibility(View.GONE);
- binding.recyclerView.setVisibility(View.VISIBLE);
+ binding.refreshLayout.setVisibility(View.VISIBLE);
binding.refreshLayout.finishLoadMore();
}
@@ -303,7 +306,7 @@
public void onClick(View v) {
int id = v.getId();
if (id == R.id.tv_add){
- AppManager.getAppManager().startActivity(new Intent(this, TourismExperienceDetailActivity.class).putExtra(BaseConfig.EXTRA_TYPE,1).putExtra("fid",fid));
+ AppManager.getAppManager().startActivity(new Intent(this, TourismExperienceDetailActivity.class).putExtra(BaseConfig.EXTRA_TYPE,1).putExtra("cid",viewModel.getCid()));
mOperatePopupWindow.dismiss();
}else if (id == R.id.tv_select){
viewModel.getOperateTypeLiveData().postValue(1);
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java
index e65b436..e256c17 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java
@@ -14,6 +14,8 @@
import com.android.app_base.http.ResultData;
import com.android.app_base.utils.RxUtils;
import com.android.app_base.utils.Utils;
+import com.android.app_base.utils.rxbus.MessageEvent;
+import com.android.app_base.utils.rxbus.RxBus;
import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.bean.TourismExperienceBean;
import com.application.zhangshi_app_android.bean.TourismExperienceRequestBean;
@@ -39,6 +41,7 @@
private MutableLiveData<TourismExperienceRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟
private MutableLiveData<List<TourismExperienceBean>> finishDeleteListLiveData;//宸茬粡瀹屾垚鍒犻櫎鐨勬暟鎹紝鐢ㄤ簬adapter鐨剅emove鎿嶄綔
private MutableLiveData<Integer> operateTypeLiveData;//鎿嶄綔绫诲瀷 0 閫夋嫨鎿嶄綔 1.瀹屾垚 2.鍒犻櫎
+ private String cid;//瀹岀編鏃呴�攊d
public TourismExperienceActivityViewModel(@NonNull Application application) {
super(application);
@@ -56,48 +59,6 @@
if (getRequestBeanLiveData().getValue() == null){
getRequestBeanLiveData().setValue(new TourismExperienceRequestBean());
}
- getRequestBeanLiveData().getValue().setPageNum(1);
- model.getTourismExperience(getRequestBeanLiveData().getValue().toMap())
- .compose(RxUtils.schedulersTransformer())
- .subscribe(new Observer<ResultData<PageResponseBean<TourismExperienceBean>>>() {
- @Override
- public void onSubscribe(Disposable d) {
- addSubscribe(d);
- }
-
- @Override
- public void onNext(ResultData<PageResponseBean<TourismExperienceBean>> data) {
- if (data.getCode() == CODE_SUCCESS){
- if (data.getData().getData().isEmpty()){
- changeStateView(StateViewEnum.DATA_NULL);
- }else {
- changeStateView(StateViewEnum.HIDE);
- dataListLiveData.postValue(data.getData().getData());
- }
- }else {
- messageLiveData.postValue(data.getMsg());
- }
- }
-
- @Override
- public void onError(Throwable e) {
- messageLiveData.postValue(e.getMessage());
- }
-
- @Override
- public void onComplete() {
-
- }
- });
- }
- /**
- * 鍔犺浇鏇村
- */
- public void getMoreTourismExperience() {
- if (getRequestBeanLiveData().getValue() == null){
- getRequestBeanLiveData().setValue(new TourismExperienceRequestBean());
- }
- getRequestBeanLiveData().getValue().setPageNum(getRequestBeanLiveData().getValue().getPageNum() + 1);
model.getTourismExperience(getRequestBeanLiveData().getValue().toMap())
.compose(RxUtils.schedulersTransformer())
.doFinally(new Action() {
@@ -106,20 +67,20 @@
changeStateView(StateViewEnum.DATA_FINISH);
}
})
- .subscribe(new Observer<ResultData<PageResponseBean<TourismExperienceBean>>>() {
+ .subscribe(new Observer<ResultData<List<TourismExperienceBean>>>() {
@Override
public void onSubscribe(Disposable d) {
addSubscribe(d);
}
@Override
- public void onNext(ResultData<PageResponseBean<TourismExperienceBean>> data) {
+ public void onNext(ResultData<List<TourismExperienceBean>> data) {
if (data.getCode() == CODE_SUCCESS){
- if (data.getData().getData().isEmpty()){
- messageLiveData.postValue("娌℃湁鏇村鏁版嵁浜�");
+ if (data.getData() == null || data.getData().isEmpty() ){
+ changeStateView(StateViewEnum.DATA_NULL);
}else {
changeStateView(StateViewEnum.HIDE);
- moreListLiveData.postValue(data.getData().getData());
+ dataListLiveData.postValue(data.getData());
}
}else {
messageLiveData.postValue(data.getMsg());
@@ -137,6 +98,7 @@
}
});
}
+
/**
* 鍒犻櫎澶氶�夐�変腑鐨勬暟鎹�
*/
@@ -162,6 +124,7 @@
messageLiveData.postValue("鍒犻櫎鎴愬姛");
finishDeleteListLiveData.postValue(checkListLiveData.getValue());
getCheckListLiveData().postValue(new ArrayList<>());
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -197,6 +160,7 @@
list.add(tourismExperienceBean);
finishDeleteListLiveData.postValue(list);
messageLiveData.postValue("鍒犻櫎鎴愬姛");
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -291,6 +255,14 @@
this.finishDeleteListLiveData = finishDeleteListLiveData;
}
+ public String getCid() {
+ return cid;
+ }
+
+ public void setCid(String cid) {
+ this.cid = cid;
+ }
+
/**
* 鏀瑰彉鎺掑簭
* @param b true 闄嶅簭 false 鍗囧簭
@@ -303,8 +275,8 @@
if (b) {
// 浠庢柊鍒版棫锛宯ull鎺掓渶鍚�
list.sort((o1, o2) -> {
- String happenTime1 = o1.getHappenTime();
- String happenTime2 = o2.getHappenTime();
+ String happenTime1 = o1.getHappenDate();
+ String happenTime2 = o2.getHappenDate();
if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
return 0;
} else if (TextUtils.isEmpty(happenTime1)) {
@@ -323,8 +295,8 @@
} else {
// 浠庢棫鍒版柊锛宯ull鎺掓渶鍓�
list.sort((o1, o2) -> {
- String happenTime1 = o1.getHappenTime();
- String happenTime2 = o2.getHappenTime();
+ String happenTime1 = o1.getHappenDate();
+ String happenTime2 = o2.getHappenDate();
if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
return 0;
} else if (TextUtils.isEmpty(happenTime1)) {
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java
index dd26841..1b9b00c 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java
@@ -73,10 +73,12 @@
TourismExperienceBean bean = (TourismExperienceBean) getIntent().getSerializableExtra("bean");
if (bean !=null){
viewModel.getBeanLiveData().setValue(bean);
+ viewModel.setCid(bean.getCid());
}
}else if (type == 1){
- String fid = getIntent().getStringExtra("fid");
- viewModel.getBeanLiveData().getValue().setFeeId(fid);
+ String cid = getIntent().getStringExtra("cid");
+ viewModel.getBeanLiveData().getValue().setCid(cid);
+ viewModel.setCid(cid);
}
}
@@ -201,24 +203,6 @@
}
});
datePicker.show();
- }
- });
- binding.etSelf.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- hideSoftKeyboard();
- List<String> list = Arrays.asList("鍏垂","鑷垂");
- OptionPicker picker = getOptionPicker(list);
- picker.setTitle("鑷垂鎴栧叕璐�");
- picker.setDefaultValue(binding.etSelf.getText().toString());
- picker.setOnOptionPickedListener(new OnOptionPickedListener() {
- @Override
- public void onOptionPicked(int position, Object item) {
- viewModel.getBeanLiveData().getValue().setSelf(position);
- viewModel.getBeanLiveData().setValue(viewModel.getBeanLiveData().getValue());
- }
- });
- picker.show();
}
});
activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivityViewModel.java
index 24bfd3d..f9791ee 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivityViewModel.java
@@ -12,6 +12,7 @@
import com.android.app_base.http.ResultData;
import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.RxUtils;
+import com.android.app_base.utils.rxbus.MessageEvent;
import com.android.app_base.utils.rxbus.RxBus;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.bean.TourismExperienceBean;
@@ -44,6 +45,7 @@
private MutableLiveData<Boolean> typeLiveData;//true 缂栬緫鐘舵�� false 灞曠ず鐘舵��
private final List<String> uploadFileList = new ArrayList<>();//闇�瑕佷笂浼犵殑鏂囦欢鍒楄〃
+ private String cid;
public TourismExperienceDetailActivityViewModel(@NonNull Application application) {
super(application);
}
@@ -122,6 +124,7 @@
AppManager.getAppManager().finishCurrentActivity();
RxBus.getInstance().post(beanLiveData.getValue());
messageLiveData.postValue("娣诲姞鎴愬姛");
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
} else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -152,6 +155,7 @@
AppManager.getAppManager().finishCurrentActivity();
RxBus.getInstance().post(beanLiveData.getValue());
messageLiveData.postValue("娣诲姞鎴愬姛");
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -191,6 +195,7 @@
AppManager.getAppManager().finishCurrentActivity();
RxBus.getInstance().post(beanLiveData.getValue());
messageLiveData.postValue("鍒犻櫎鎴愬姛");
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -276,6 +281,7 @@
AppManager.getAppManager().finishCurrentActivity();
RxBus.getInstance().post(beanLiveData.getValue());
messageLiveData.postValue("淇敼鎴愬姛");
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -306,6 +312,7 @@
AppManager.getAppManager().finishCurrentActivity();
RxBus.getInstance().post(beanLiveData.getValue());
messageLiveData.postValue("淇敼鎴愬姛");
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -357,4 +364,12 @@
public void addUploadFile(String url) {
uploadFileList.add(url);
}
+
+ public String getCid() {
+ return cid;
+ }
+
+ public void setCid(String cid) {
+ this.cid = cid;
+ }
}
diff --git a/app/src/main/res/layout/acitivity_tourism_experience_detail.xml b/app/src/main/res/layout/acitivity_tourism_experience_detail.xml
index 67134bc..7d75a1e 100644
--- a/app/src/main/res/layout/acitivity_tourism_experience_detail.xml
+++ b/app/src/main/res/layout/acitivity_tourism_experience_detail.xml
@@ -19,7 +19,7 @@
<com.android.app_base.widget.ExtendTitleBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{TextUtils.isEmpty(viewModel.beanLiveData.title)?`鏂板缓鏃呮父缁忓巻`:viewModel.beanLiveData.title}"
+ app:title="@{TextUtils.isEmpty(viewModel.beanLiveData.address)?`鏂板缓鏃呮父缁忓巻`:viewModel.beanLiveData.address}"
app:titleGravity="left"
app:leftIcon="@drawable/ic_back"
>
@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_height="@dimen/dp_20"
- android:text="鏍囬"
+ android:text="琛岀▼鍦扮偣"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -65,10 +65,10 @@
android:inputType="text"
android:autofillHints="creditCardNumber"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ爣棰榒:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヨ绋嬪湴鐐筦:``}"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@={viewModel.beanLiveData.title}"
+ android:text="@={viewModel.beanLiveData.address}"
android:enabled="@{viewModel.typeLiveData}"
/>
@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鏃堕棿"
+ android:text="琛岀▼鏃堕棿"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -89,17 +89,17 @@
android:inputType="text"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃堕棿`:``}"
- android:text="@={viewModel.beanLiveData.happenTime}"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨琛岀▼鏃堕棿`:``}"
+ android:text="@={viewModel.beanLiveData.happenDate}"
android:textSize="16sp"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
app:isEditable="@{false}"
/>
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鍦扮偣"
+ android:text="鏅偣"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -109,8 +109,8 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ湴鐐筦:``}"
- android:text="@={viewModel.beanLiveData.address}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ櫙鐐筦:``}"
+ android:text="@={viewModel.beanLiveData.scenic}"
android:textColor="#DE000000"
android:enabled="@{viewModel.typeLiveData}"
android:textSize="16sp"
@@ -119,7 +119,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="浜虹墿"
+ android:text="浣忓閰掑簵"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -129,9 +129,161 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ汉鐗ー:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ綇瀹块厭搴梎:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.people}"
+ android:text="@={viewModel.beanLiveData.hotel}"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣忓璐�"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <androidx.appcompat.widget.AppCompatEditText
+ android:id="@+id/et_stay"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.stay}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浜ら�氳垂"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_traffic"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.travel}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闂ㄧエ璐�"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_entrance"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.entrance}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="椁愯垂"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_eat"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.eat}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鍑鸿鏂瑰紡"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ嚭琛屾柟寮廯:``}"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.travelMode}"
android:textSize="16sp"
android:enabled="@{viewModel.typeLiveData}"
/>
@@ -139,7 +291,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鏃呮湡"
+ android:text="杞︽/鑸彮"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -149,9 +301,9 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ梾鏈焋:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヨ溅娆�/鑸彮`:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.travelPeriod}"
+ android:text="@={viewModel.beanLiveData.flight}"
android:textSize="16sp"
android:enabled="@{viewModel.typeLiveData}"
/>
@@ -159,7 +311,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鎸佽瘉鏃呮父"
+ android:text="浣跨敤璇佷欢"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -169,70 +321,9 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ寔璇佹梾娓竊:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ娇鐢ㄨ瘉浠禶:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.certificate}"
- android:textSize="16sp"
- android:enabled="@{viewModel.typeLiveData}"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_height="wrap_content"
- android:text="璐圭敤"
- android:textColor="#767375"
- android:textSize="12sp"
- />
- <EditText
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="numberDecimal"
- android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヨ垂鐢╜:``}"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.totalPrice}"
- android:textSize="16sp" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_height="wrap_content"
- android:text="鍏垂鎴栬嚜璐�"
- android:textColor="#767375"
- android:textSize="12sp"
- />
- <EditText
- android:id="@+id/et_self"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- tools:text="鑷垂"
- android:drawablePadding="10dp"
- app:isEditable="@{false}"
- android:clickable="@{viewModel.typeLiveData}"
- android:drawableStart="@drawable/ic_radio_button_selected"
- android:text="@{viewModel.beanLiveData.self==0?`鍏垂`:`鑷垂`}"
- android:textSize="16sp" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_height="wrap_content"
- android:text="澶囨敞"
- android:textColor="#767375"
- android:textSize="12sp"
- />
- <EditText
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ娉╜:``}"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.remark}"
+ android:text="@={viewModel.beanLiveData.document}"
android:textSize="16sp"
android:enabled="@{viewModel.typeLiveData}"
/>
diff --git a/app/src/main/res/layout/activity_annual_health_status.xml b/app/src/main/res/layout/activity_annual_health_status.xml
index dc6cb6b..f098a82 100644
--- a/app/src/main/res/layout/activity_annual_health_status.xml
+++ b/app/src/main/res/layout/activity_annual_health_status.xml
@@ -49,7 +49,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="骞村害鍋ュ悍鎯呭喌"
+ android:text="浣撴鎴栫湅鐥�"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="20sp"
@@ -192,7 +192,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -210,7 +210,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -238,7 +238,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -263,7 +263,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -285,7 +285,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -320,7 +320,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -338,7 +338,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -358,7 +358,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="灏辩梾鍖婚櫌"
android:textColor="#FF333333"
android:textSize="14sp"
@@ -366,7 +366,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -384,7 +384,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_annual_health_status_detail.xml b/app/src/main/res/layout/activity_annual_health_status_detail.xml
index 8413cc2..127a651 100644
--- a/app/src/main/res/layout/activity_annual_health_status_detail.xml
+++ b/app/src/main/res/layout/activity_annual_health_status_detail.xml
@@ -18,7 +18,7 @@
<com.android.app_base.widget.ExtendTitleBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{viewModel.beanLiveData.id==0?`鏂板缓骞村害鍋ュ悍鐘跺喌`:viewModel.beanLiveData.title}"
+ app:title="@{viewModel.beanLiveData.id==0?`鏂板缓浣撴鎴栫湅鐥卄:viewModel.beanLiveData.title}"
app:titleGravity="left"
app:leftIcon="@drawable/ic_back"
>
@@ -55,11 +55,13 @@
android:text="搴忓彿"
android:textColor="#767375"
android:textSize="12sp"
+ android:visibility="@{viewModel.typeLiveData}"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:visibility="@{viewModel.typeLiveData}"
>
<EditText
android:id="@+id/et_id"
@@ -109,7 +111,7 @@
android:text="@={viewModel.beanLiveData.checkTime}"
android:textSize="16sp"
app:isEditable="@{false}"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
diff --git a/app/src/main/res/layout/activity_certificate_of_honor.xml b/app/src/main/res/layout/activity_certificate_of_honor.xml
index f00f761..935d9d8 100644
--- a/app/src/main/res/layout/activity_certificate_of_honor.xml
+++ b/app/src/main/res/layout/activity_certificate_of_honor.xml
@@ -196,7 +196,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -214,7 +214,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -242,7 +242,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -260,7 +260,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -288,7 +288,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -306,7 +306,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_clean_storage.xml b/app/src/main/res/layout/activity_clean_storage.xml
index b43b181..16344a1 100644
--- a/app/src/main/res/layout/activity_clean_storage.xml
+++ b/app/src/main/res/layout/activity_clean_storage.xml
@@ -193,7 +193,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -211,7 +211,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -236,7 +236,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -254,7 +254,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -281,7 +281,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -299,7 +299,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -327,7 +327,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -345,7 +345,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -373,7 +373,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -391,7 +391,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -435,7 +435,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -461,7 +461,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -479,7 +479,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -505,7 +505,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -523,7 +523,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index b031623..30878d6 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -185,7 +185,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="鎴愬憳濮撳悕"
android:textColor="#FF333333"
android:textSize="14sp"
@@ -193,7 +193,7 @@
android:layout_gravity="center_vertical"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -211,7 +211,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -238,7 +238,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -256,7 +256,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -284,7 +284,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -302,7 +302,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -331,7 +331,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -349,7 +349,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -375,7 +375,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -393,7 +393,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_family_assets.xml b/app/src/main/res/layout/activity_family_assets.xml
index 75f72ec..1a24445 100644
--- a/app/src/main/res/layout/activity_family_assets.xml
+++ b/app/src/main/res/layout/activity_family_assets.xml
@@ -193,7 +193,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -211,7 +211,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -238,7 +238,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -256,7 +256,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -285,7 +285,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -310,7 +310,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -332,7 +332,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -360,7 +360,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="瀛樻斁鍦扮偣"
android:textColor="#FF333333"
android:textSize="14sp"
@@ -368,7 +368,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -386,7 +386,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_family_memorabilia.xml b/app/src/main/res/layout/activity_family_memorabilia.xml
index 263a4c1..5533cfe 100644
--- a/app/src/main/res/layout/activity_family_memorabilia.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia.xml
@@ -196,7 +196,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -214,7 +214,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -241,7 +241,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -259,7 +259,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -288,7 +288,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -313,7 +313,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -335,7 +335,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -371,7 +371,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -389,7 +389,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_family_memorabilia_detail.xml b/app/src/main/res/layout/activity_family_memorabilia_detail.xml
index 36d0157..e6b5232 100644
--- a/app/src/main/res/layout/activity_family_memorabilia_detail.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia_detail.xml
@@ -89,13 +89,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ椂闂�(鏍煎紡锛�2001-01-01)`:``}"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃堕棿`:``}"
android:inputType="text"
android:text="@={viewModel.beanLiveData.happenTime}"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="16sp"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
app:isEditable="@{false}"
/>
diff --git a/app/src/main/res/layout/activity_genealogy.xml b/app/src/main/res/layout/activity_genealogy.xml
index a5ea74d..81e7ff5 100644
--- a/app/src/main/res/layout/activity_genealogy.xml
+++ b/app/src/main/res/layout/activity_genealogy.xml
@@ -192,7 +192,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -210,7 +210,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
app:isEditable="@{false}"
@@ -238,7 +238,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -256,7 +256,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -284,7 +284,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -302,7 +302,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
app:isEditable="@{false}"
@@ -333,7 +333,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -352,7 +352,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
app:isEditable="@{false}"
diff --git a/app/src/main/res/layout/activity_home_devices.xml b/app/src/main/res/layout/activity_home_devices.xml
index 491d369..e423f57 100644
--- a/app/src/main/res/layout/activity_home_devices.xml
+++ b/app/src/main/res/layout/activity_home_devices.xml
@@ -185,14 +185,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="浜嬮」鍐呭"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -210,7 +210,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -230,14 +230,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="璁惧鍚嶇О"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -255,7 +255,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -283,7 +283,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -301,7 +301,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -329,7 +329,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -354,7 +354,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -376,7 +376,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -403,14 +403,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="瀛樻斁鍦扮偣"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center_vertical"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -428,7 +428,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_home_devices_detail.xml b/app/src/main/res/layout/activity_home_devices_detail.xml
index 5120b2f..79963f6 100644
--- a/app/src/main/res/layout/activity_home_devices_detail.xml
+++ b/app/src/main/res/layout/activity_home_devices_detail.xml
@@ -95,7 +95,7 @@
android:textColor="#DE000000"
android:text="@={viewModel.beanLiveData.happenTime}"
android:textSize="16sp"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
app:isEditable="@{false}"
/>
<TextView
diff --git a/app/src/main/res/layout/activity_honor_collection.xml b/app/src/main/res/layout/activity_honor_collection.xml
index d8fdf0f..3c49b2e 100644
--- a/app/src/main/res/layout/activity_honor_collection.xml
+++ b/app/src/main/res/layout/activity_honor_collection.xml
@@ -192,7 +192,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -210,7 +210,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -237,7 +237,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -255,7 +255,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -284,7 +284,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -309,7 +309,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -331,7 +331,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -359,7 +359,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="瀛樻斁浣嶇疆"
android:textColor="#FF333333"
android:textSize="14sp"
@@ -367,7 +367,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -385,7 +385,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_hundred_wish.xml b/app/src/main/res/layout/activity_hundred_wish.xml
index 7766ecf..94a3784 100644
--- a/app/src/main/res/layout/activity_hundred_wish.xml
+++ b/app/src/main/res/layout/activity_hundred_wish.xml
@@ -191,7 +191,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -216,7 +216,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -238,7 +238,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -266,14 +266,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="鐞嗘兂鏍囬"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -291,7 +291,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -319,7 +319,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -337,7 +337,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -363,7 +363,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -381,7 +381,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_income_and_expenses.xml b/app/src/main/res/layout/activity_income_and_expenses.xml
index 079f876..2a0f6d9 100644
--- a/app/src/main/res/layout/activity_income_and_expenses.xml
+++ b/app/src/main/res/layout/activity_income_and_expenses.xml
@@ -184,14 +184,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="鍙拌处/鍩洪噾"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -209,7 +209,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -237,7 +237,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -262,7 +262,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -284,7 +284,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -319,7 +319,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -337,7 +337,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -365,7 +365,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -383,7 +383,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_income_and_expenses_detail.xml b/app/src/main/res/layout/activity_income_and_expenses_detail.xml
index 76051c9..0c11f37 100644
--- a/app/src/main/res/layout/activity_income_and_expenses_detail.xml
+++ b/app/src/main/res/layout/activity_income_and_expenses_detail.xml
@@ -94,7 +94,7 @@
android:textColor="#DE000000"
android:backgroundTint="#6B000000"
app:isEditable="@{false}"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
android:text="@={viewModel.beanLiveData.happenTime}"
android:textSize="16sp" />
<TextView
@@ -117,7 +117,7 @@
android:textColorHint="#6b000000"
android:backgroundTint="#6B000000"
app:isEditable="@{false}"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
android:textSize="16sp" />
<TextView
diff --git a/app/src/main/res/layout/activity_little_doctor.xml b/app/src/main/res/layout/activity_little_doctor.xml
index 90845c6..c7e06ee 100644
--- a/app/src/main/res/layout/activity_little_doctor.xml
+++ b/app/src/main/res/layout/activity_little_doctor.xml
@@ -192,7 +192,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -210,7 +210,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -237,7 +237,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -255,7 +255,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -283,7 +283,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -301,7 +301,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -329,7 +329,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -347,7 +347,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_personal_notepad.xml b/app/src/main/res/layout/activity_personal_notepad.xml
index 8827b59..183a1d9 100644
--- a/app/src/main/res/layout/activity_personal_notepad.xml
+++ b/app/src/main/res/layout/activity_personal_notepad.xml
@@ -185,14 +185,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="浜嬩欢鏍囬"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -210,7 +210,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -238,7 +238,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -263,7 +263,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -285,7 +285,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -320,7 +320,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -338,7 +338,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -366,7 +366,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -384,7 +384,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_personal_notepad_detail.xml b/app/src/main/res/layout/activity_personal_notepad_detail.xml
index 8a7ca6a..e784511 100644
--- a/app/src/main/res/layout/activity_personal_notepad_detail.xml
+++ b/app/src/main/res/layout/activity_personal_notepad_detail.xml
@@ -94,7 +94,7 @@
android:text="@={viewModel.beanLiveData.happenTime}"
android:textSize="16sp"
app:isEditable="@{false}"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_pet.xml b/app/src/main/res/layout/activity_pet.xml
index 50e6b26..12bfba3 100644
--- a/app/src/main/res/layout/activity_pet.xml
+++ b/app/src/main/res/layout/activity_pet.xml
@@ -197,7 +197,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -215,7 +215,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -240,7 +240,7 @@
android:textColor="#FF333333"
android:textSize="14sp"
app:autoSizeMaxTextSize="14sp"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeTextType="uniform" />
<LinearLayout
@@ -264,7 +264,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -286,7 +286,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -319,7 +319,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -337,7 +337,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -361,7 +361,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -380,7 +380,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
app:isEditable="@{false}"
@@ -405,7 +405,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -423,7 +423,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -447,7 +447,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -465,7 +465,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -489,7 +489,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
<com.android.app_base.widget.ClearEditText
@@ -506,7 +506,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -530,7 +530,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
<com.android.app_base.widget.ClearEditText
@@ -547,7 +547,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -571,7 +571,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
<com.android.app_base.widget.ClearEditText
@@ -588,7 +588,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -612,7 +612,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
<com.android.app_base.widget.ClearEditText
@@ -629,7 +629,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -653,7 +653,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
<com.android.app_base.widget.ClearEditText
@@ -670,7 +670,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -694,7 +694,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
<com.android.app_base.widget.ClearEditText
@@ -711,7 +711,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -735,7 +735,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
<com.android.app_base.widget.ClearEditText
@@ -752,7 +752,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_pet_memo.xml b/app/src/main/res/layout/activity_pet_memo.xml
index a1540e3..7181e32 100644
--- a/app/src/main/res/layout/activity_pet_memo.xml
+++ b/app/src/main/res/layout/activity_pet_memo.xml
@@ -192,7 +192,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -217,7 +217,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -239,7 +239,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -274,7 +274,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -292,7 +292,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -314,14 +314,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="鎻愰啋鏃ユ湡"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -346,7 +346,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -368,7 +368,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index e0243a5..19cda63 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -191,7 +191,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -216,7 +216,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -238,7 +238,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -273,7 +273,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -291,7 +291,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -319,7 +319,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -337,7 +337,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -383,7 +383,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
app:isEditable="@{false}"
@@ -428,7 +428,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
app:isEditable="@{false}"
@@ -456,7 +456,7 @@
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -474,7 +474,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_property.xml b/app/src/main/res/layout/activity_property.xml
index 4760a0a..0dcfb0e 100644
--- a/app/src/main/res/layout/activity_property.xml
+++ b/app/src/main/res/layout/activity_property.xml
@@ -191,7 +191,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -216,7 +216,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -238,7 +238,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -266,14 +266,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:text="璐骇绫诲埆"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -291,7 +291,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -312,14 +312,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
- android:text="鏀舵敮鍚嶇О"
+ android:layout_height="match_parent"
+ android:text="璐骇鍚嶇О"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -331,13 +331,13 @@
android:inputType="text"
android:layout_marginStart="6dp"
android:text="@={viewModel.requestBeanLiveData.name}"
- android:hint="璇疯緭鍏ユ敹鏀悕绉�"
+ android:hint="璇疯緭鍏ヨ储浜у悕绉�"
android:textColorHint="#61000000"
android:textColor="#FF333333"
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -363,7 +363,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -381,7 +381,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -407,7 +407,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -426,7 +426,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
app:isEditable="@{false}"
@@ -453,7 +453,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -472,7 +472,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
app:isEditable="@{false}"
diff --git a/app/src/main/res/layout/activity_property_detail.xml b/app/src/main/res/layout/activity_property_detail.xml
index 8a5f4a9..05cad7a 100644
--- a/app/src/main/res/layout/activity_property_detail.xml
+++ b/app/src/main/res/layout/activity_property_detail.xml
@@ -74,7 +74,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鏀舵敮鍚嶇О"
+ android:text="璐骇鍚嶇О"
android:textColor="#767375"
android:textSize="12sp"
/>
diff --git a/app/src/main/res/layout/activity_tourism.xml b/app/src/main/res/layout/activity_tourism.xml
index fd34d19..827314e 100644
--- a/app/src/main/res/layout/activity_tourism.xml
+++ b/app/src/main/res/layout/activity_tourism.xml
@@ -49,7 +49,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="鏃呮父璐圭敤璁板綍缁熻琛�"
+ android:text="瀹岀編鏃呴��"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="20sp"
@@ -91,7 +91,7 @@
android:imeOptions="actionSearch"
android:text=""
android:singleLine="true"
- android:hint="鍦ㄢ�滆垂鐢ㄧ粺璁¤〃鈥濆唴鎼滅储"
+ android:hint="鍦ㄢ�滃畬缇庢梾閫斺�濆唴鎼滅储"
android:focusable="false"
android:clickable="false"
/>
@@ -151,7 +151,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleBar"
tools:itemCount="20"
- tools:listitem="@layout/item_family_memorabilia" />
+ tools:listitem="@layout/item_tourism" />
<com.scwang.smart.refresh.footer.BallPulseFooter
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
@@ -197,7 +197,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -214,7 +214,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.start}"
+ android:text="@={viewModel.requestBeanLiveData.happenStartTime}"
android:hint="寮�濮嬫椂闂�"
android:textColorHint="#61000000"
android:textColor="#FF333333"
@@ -222,7 +222,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -237,14 +237,14 @@
android:layout_weight="1"
android:gravity="center"
android:layout_height="wrap_content"
- android:text="@={viewModel.requestBeanLiveData.end}"
+ android:text="@={viewModel.requestBeanLiveData.happenEndTime}"
android:hint="缁撴潫鏃堕棿"
android:textColorHint="#61000000"
android:textColor="#FF333333"
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -272,15 +272,15 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
- android:text="鎬诲ぉ鏁�"
+ android:layout_height="match_parent"
+ android:text="鏃呮父鍚嶇О"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -291,14 +291,14 @@
android:background="@null"
android:inputType="text"
android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.totalDay}"
- android:hint="璇疯緭鍏ユ�诲ぉ鏁�"
+ android:text="@={viewModel.requestBeanLiveData.name}"
+ android:hint="璇疯緭鍏ユ梾娓稿悕绉�"
android:textColorHint="#61000000"
android:textColor="#FF333333"
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/activity_tourism_detail.xml b/app/src/main/res/layout/activity_tourism_detail.xml
index e806b06..016b005 100644
--- a/app/src/main/res/layout/activity_tourism_detail.xml
+++ b/app/src/main/res/layout/activity_tourism_detail.xml
@@ -19,7 +19,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{viewModel.beanLiveData.title==null?`鏂板鏃呮父璐圭敤璁板綍`:viewModel.beanLiveData.title}"
+ app:title="@{viewModel.beanLiveData.name==null?`鏂板鏃呮父璐圭敤璁板綍`:viewModel.beanLiveData.name}"
app:titleGravity="left"
>
<FrameLayout
@@ -52,7 +52,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_height="@dimen/dp_20"
- android:text="鏍囬"
+ android:text="鏃呮父鍚嶇О"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -63,11 +63,11 @@
android:layout_height="wrap_content"
android:inputType="text"
android:autofillHints="creditCardNumber"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ爣棰榒:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ梾娓稿悕绉癭:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@={viewModel.beanLiveData.title}"
+ android:text="@={viewModel.beanLiveData.name}"
android:enabled="@{viewModel.typeLiveData}"
/>
@@ -90,11 +90,8 @@
android:textColor="#DE000000"
android:text="@={viewModel.beanLiveData.startTime}"
android:textSize="16sp"
- android:focusable="false"
- android:cursorVisible="false"
- android:longClickable="false"
- android:clickable="@{viewModel.typeLiveData}"
- android:backgroundTint="#6B000000"
+ app:isEditable="@{false}"
+ android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
android:layout_width="wrap_content"
@@ -114,52 +111,92 @@
android:text="@={viewModel.beanLiveData.endTime}"
android:textColor="#DE000000"
android:textSize="16sp"
- android:clickable="@{viewModel.typeLiveData}"
- android:focusable="false"
- android:cursorVisible="false"
- android:longClickable="false"
- android:backgroundTint="#6B000000"
+ android:enabled="@{viewModel.typeLiveData}"
+ app:isEditable="@{false}"
/>
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鎬诲ぉ鏁�"
+ android:text="鍘诲悜"
android:textColor="#767375"
android:textSize="12sp"
/>
- <androidx.constraintlayout.widget.ConstraintLayout
+ <EditText
+ android:id="@+id/et_whereabouts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- >
- <EditText
- android:id="@+id/et_total_day"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="number"
- android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`0`:``}"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.totalDay}"
- android:textSize="16sp"
- android:enabled="false"
- android:backgroundTint="#6B000000"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- />
- <View
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:background="@color/color_non_editable"
- app:layout_constraintTop_toTopOf="@id/et_total_day"
- app:layout_constraintStart_toStartOf="@id/et_total_day"
- app:layout_constraintBottom_toBottomOf="@id/et_total_day"
- app:layout_constraintEnd_toEndOf="@id/et_total_day"
- android:visibility="@{viewModel.typeLiveData}"
- />
- </androidx.constraintlayout.widget.ConstraintLayout>
-
+ android:layout_marginTop="2dp"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鍘诲悜`:``}"
+ android:text="@={viewModel.beanLiveData.destination}"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ app:isEditable="@{false}"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鏃呮父鎬ц川"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_tourism_nature"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃呮父鎬ц川`:``}"
+ android:text="@={viewModel.beanLiveData.property}"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ app:isEditable="@{false}"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鏃呮父鏂瑰紡"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_tourism_way"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃呮父鏂瑰紡`:``}"
+ android:text="@={viewModel.beanLiveData.manner}"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ app:isEditable="@{false}"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="鍥㈣垂"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ洟璐筦:``}"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:text="@={viewModel.beanLiveData.groupTotal}"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:inputType="numberDecimal"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -181,10 +218,9 @@
android:textColorHint="#6b000000"
android:hint="@{viewModel.typeLiveData?`0`:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.totalCost}"
+ android:text="@={viewModel.beanLiveData.totalPrice}"
android:textSize="16sp"
android:enabled="false"
- android:backgroundTint="#6B000000"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
@@ -213,106 +249,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎬婚噾棰�"
- android:textColor="#767375"
- android:textSize="12sp"
- />
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <EditText
- android:id="@+id/et_total_cost1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="numberDecimal"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:hint="@{viewModel.typeLiveData?`0`:``}"
- android:text="@={viewModel.beanLiveData.totalCost}"
- android:textSize="16sp"
- android:enabled="false"
- android:backgroundTint="#6B000000"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- />
- <View
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:background="@color/color_non_editable"
- app:layout_constraintTop_toTopOf="@id/et_total_cost1"
- app:layout_constraintStart_toStartOf="@id/et_total_cost1"
- app:layout_constraintBottom_toBottomOf="@id/et_total_cost1"
- app:layout_constraintEnd_toEndOf="@id/et_total_cost1"
- android:visibility="@{viewModel.typeLiveData}"
- />
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-
- </LinearLayout>
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
- android:layout_marginStart="40dp"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="椁愯垂"
- android:textColor="#767375"
- android:textSize="12sp"
- />
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <EditText
- android:id="@+id/et_eat"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="numberDecimal"
- android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`0`:``}"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.eat}"
- android:textSize="16sp"
- android:enabled="false"
- android:backgroundTint="#6B000000"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- />
- <View
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:background="@color/color_non_editable"
- app:layout_constraintTop_toTopOf="@id/et_eat"
- app:layout_constraintStart_toStartOf="@id/et_eat"
- app:layout_constraintBottom_toBottomOf="@id/et_eat"
- app:layout_constraintEnd_toEndOf="@id/et_eat"
- android:visibility="@{viewModel.typeLiveData}"
- />
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-
- </LinearLayout>
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="12dp"
- >
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="浣忓"
+ android:text="鎬讳綇瀹胯垂"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -328,10 +265,9 @@
android:textColorHint="#6b000000"
android:hint="@{viewModel.typeLiveData?`0`:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.stay}"
+ android:text="@={viewModel.beanLiveData.stayTotal}"
android:textSize="16sp"
android:enabled="false"
- android:backgroundTint="#6B000000"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
@@ -358,7 +294,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="浜ら��"
+ android:text="鎬讳氦閫氳垂"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -373,11 +309,10 @@
android:inputType="numberDecimal"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.traffic}"
+ android:text="@={viewModel.beanLiveData.travelTotal}"
android:textSize="16sp"
android:enabled="false"
android:hint="@{viewModel.typeLiveData?`0`:``}"
- android:backgroundTint="#6B000000"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
@@ -409,7 +344,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="闂ㄧエ"
+ android:text="鎬婚棬绁ㄨ垂"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -424,11 +359,10 @@
android:inputType="numberDecimal"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.entrance}"
+ android:text="@={viewModel.beanLiveData.entranceTotal}"
android:textSize="16sp"
android:hint="@{viewModel.typeLiveData?`0`:``}"
android:enabled="false"
- android:backgroundTint="#6B000000"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
@@ -455,7 +389,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="璐墿"
+ android:text="鎬婚璐�"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -464,17 +398,16 @@
android:layout_height="wrap_content"
>
<EditText
- android:id="@+id/et_shopping"
+ android:id="@+id/et_eat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberDecimal"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.shopping}"
+ android:text="@={viewModel.beanLiveData.eatTotal}"
android:textSize="16sp"
android:hint="@{viewModel.typeLiveData?`0`:``}"
android:enabled="false"
- android:backgroundTint="#6B000000"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
@@ -482,52 +415,16 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/color_non_editable"
- app:layout_constraintTop_toTopOf="@id/et_shopping"
- app:layout_constraintStart_toStartOf="@id/et_shopping"
- app:layout_constraintBottom_toBottomOf="@id/et_shopping"
- app:layout_constraintEnd_toEndOf="@id/et_shopping"
+ app:layout_constraintTop_toTopOf="@id/et_eat"
+ app:layout_constraintStart_toStartOf="@id/et_eat"
+ app:layout_constraintBottom_toBottomOf="@id/et_eat"
+ app:layout_constraintEnd_toEndOf="@id/et_eat"
android:visibility="@{viewModel.typeLiveData}"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="14dp"
- android:gravity="center_vertical"
- >
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="姣忔棩璇︾粏娑堣垂璁板綍"
- android:textSize="20sp"
- android:textColor="@color/black"
- />
- <ImageView
- android:id="@+id/iv_add_daily_consume_record"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@{viewModel.typeLiveData?@drawable/ic_tourism_add:null}"
- />
-
- </LinearLayout>
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- >
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/rv_daily_consume_record"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- />
- </RelativeLayout>
-
-
</LinearLayout>
</ScrollView>
diff --git a/app/src/main/res/layout/activity_tourism_experience.xml b/app/src/main/res/layout/activity_tourism_experience.xml
index 9ea2569..3f2847e 100644
--- a/app/src/main/res/layout/activity_tourism_experience.xml
+++ b/app/src/main/res/layout/activity_tourism_experience.xml
@@ -49,7 +49,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="鏃呮父缁忓巻"
+ android:text="姣忔棩娓歌"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="20sp"
@@ -146,7 +146,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:itemCount="20"
- tools:listitem="@layout/item_family_memorabilia" />
+ tools:listitem="@layout/item_tourism_experience" />
<com.scwang.smart.refresh.footer.BallPulseFooter
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
@@ -191,7 +191,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -216,7 +216,7 @@
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -238,7 +238,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
tools:text="2022-01-01"
/>
@@ -273,7 +273,7 @@
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -291,7 +291,7 @@
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -313,13 +313,13 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:text="浜虹墿"
+ android:text="鏅偣"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -330,14 +330,14 @@
android:background="@null"
android:inputType="text"
android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.people}"
- android:hint="璇疯緭鍏ヤ汉鐗�"
+ android:text="@={viewModel.requestBeanLiveData.scenic}"
+ android:hint="璇疯緭鍏ユ櫙鐐�"
android:textColorHint="#61000000"
android:textColor="#FF333333"
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
@@ -357,15 +357,15 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
- android:text="鏍囬"
+ android:layout_height="match_parent"
+ android:text="浣忓閰掑簵"
android:textColor="#FF333333"
android:textSize="14sp"
android:gravity="center"
android:maxLines="1"
android:lines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
/>
@@ -376,14 +376,14 @@
android:background="@null"
android:inputType="text"
android:layout_marginStart="6dp"
- android:text="@={viewModel.requestBeanLiveData.title}"
- android:hint="璇疯緭鍏ユ爣棰�"
+ android:text="@={viewModel.requestBeanLiveData.hotel}"
+ android:hint="璇疯緭鍏ヤ綇瀹块厭搴�"
android:textColorHint="#61000000"
android:textColor="#FF333333"
android:textSize="14sp"
android:maxLines="1"
app:autoSizeTextType="uniform"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
app:autoSizeMaxTextSize="14sp"
app:background="@drawable/ic_clear"
/>
diff --git a/app/src/main/res/layout/item_daily_consume_record.xml b/app/src/main/res/layout/item_daily_consume_record.xml
index b2b4925..fbb9df4 100644
--- a/app/src/main/res/layout/item_daily_consume_record.xml
+++ b/app/src/main/res/layout/item_daily_consume_record.xml
@@ -120,6 +120,7 @@
android:id="@+id/rv_consume_record"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ tools:listitem="@layout/item_consume_record"
/>
</RelativeLayout>
<TextView
diff --git a/app/src/main/res/layout/item_tourism.xml b/app/src/main/res/layout/item_tourism.xml
index cf8bb14..ce08e55 100644
--- a/app/src/main/res/layout/item_tourism.xml
+++ b/app/src/main/res/layout/item_tourism.xml
@@ -52,7 +52,7 @@
android:layout_centerVertical="true"
android:ellipsize="end"
android:maxLines="1"
- android:text="@{bean.title}"
+ android:text="@{bean.name}"
android:textColor="@color/black"
android:textSize="16sp"
android:layout_marginStart="24dp"
@@ -146,14 +146,14 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎬诲ぉ鏁帮細"
+ android:text="鍥㈣垂锛�"
android:textColor="@color/black"
android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.totalDay}"
+ android:text="@{bean.groupTotal}"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -174,7 +174,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.totalCost}"
+ android:text="@{bean.totalPrice}"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -197,7 +197,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="椁愯垂锛�"
+ android:text="鎬婚璐癸細"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -205,7 +205,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.eat}"
+ android:text="@{bean.eatTotal}"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -222,7 +222,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="浣忓锛�"
+ android:text="鎬讳綇瀹胯垂锛�"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -230,7 +230,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.stay}"
+ android:text="@{bean.stayTotal}"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -247,7 +247,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="浜ら�氾細"
+ android:text=""
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -255,7 +255,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.traffic}"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -272,7 +271,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="闂ㄧエ锛�"
+ android:text="鎬婚棬绁ㄨ垂锛�"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -280,7 +279,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.entrance}"
+ android:text="@{bean.entranceTotal}"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -296,7 +295,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="璐墿锛�"
+ android:text="鎬讳氦閫氳垂锛�"
android:textColor="@color/black"
android:textSize="12sp"
/>
@@ -304,7 +303,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.shopping}"
+ android:text="@{bean.travelTotal}"
android:textColor="@color/black"
android:textSize="12sp"
/>
diff --git a/app/src/main/res/layout/item_tourism_experience.xml b/app/src/main/res/layout/item_tourism_experience.xml
index a2ef7c2..b229a41 100644
--- a/app/src/main/res/layout/item_tourism_experience.xml
+++ b/app/src/main/res/layout/item_tourism_experience.xml
@@ -50,23 +50,25 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
+ android:layout_marginStart="28dp"
android:ellipsize="end"
android:maxLines="1"
- android:text="@{bean.title}"
+ android:text="@{bean.address}"
android:textColor="@color/black"
android:textSize="16sp"
- android:layout_marginStart="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.437"
app:layout_constraintWidth_percent="0.5"
tools:text="寮犳皬App绔嬮」" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:textColor="@color/black"
- android:text="@{bean.happenTime}"
+ android:text="@{bean.happenDate}"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
tools:text="2023-05-16"
@@ -95,91 +97,28 @@
android:orientation="vertical"
android:paddingHorizontal="40dp"
>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="6dp"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍦扮偣锛�"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.address}"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="6dp"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="浜虹墿锛�"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.people}"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="6dp"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鏃呮湡锛�"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.travelPeriod}"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="6dp"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鎸佽瘉鏃呮父锛�"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.certificate}"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="6dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏅偣锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.scenic}"
+ android:textColor="@color/black"
+ android:textSize="12sp" />
+ </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -190,60 +129,148 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="璐圭敤锛�"
+ android:text="浣忓閰掑簵锛�"
android:textColor="@color/black"
android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.totalPrice}"
+ android:text="@{bean.hotel}"
android:textColor="@color/black"
android:textSize="12sp"
/>
</LinearLayout>
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
android:layout_marginBottom="6dp"
>
- <TextView
+ <LinearLayout
+ android:id="@+id/layout_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鍏垂鎴栬嚜璐癸細"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- <TextView
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/layout_2"
+ app:layout_constraintHorizontal_chainStyle="spread_inside"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闂ㄧエ璐癸細"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.entrance}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.self==0?`鍏垂`:`鑷垂`}"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="6dp"
- >
- <TextView
+ app:layout_constraintEnd_toStartOf="@id/layout_3"
+ app:layout_constraintStart_toEndOf="@id/layout_1"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣忓璐癸細"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.stay}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="澶囨敞锛�"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- <TextView
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/layout_2"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.remark}"
- android:textColor="@color/black"
- android:textSize="12sp"
- />
- </LinearLayout>
+ app:layout_constraintTop_toBottomOf="@id/layout_1"
+ app:layout_constraintStart_toStartOf="@id/layout_1"
+ android:layout_marginTop="6dp"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="椁愯垂锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.eat}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="@id/layout_4"
+ app:layout_constraintStart_toStartOf="@id/layout_2"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浜ら�氳垂锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.travel}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/pop_annual_health_status.xml b/app/src/main/res/layout/pop_annual_health_status.xml
index ffffc8d..123389f 100644
--- a/app/src/main/res/layout/pop_annual_health_status.xml
+++ b/app/src/main/res/layout/pop_annual_health_status.xml
@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="30dp"
android:gravity="center"
- android:text="骞村害鍋ュ悍鎯呭喌"
+ android:text="浣撴鎴栫湅鐥�"
android:textColor="#FF333333"
android:textSize="12sp"
/>
diff --git a/app/src/main/res/layout/pop_basic_information_double.xml b/app/src/main/res/layout/pop_basic_information_double.xml
index cfd179b..4f61c73 100644
--- a/app/src/main/res/layout/pop_basic_information_double.xml
+++ b/app/src/main/res/layout/pop_basic_information_double.xml
@@ -233,7 +233,7 @@
android:textSize="12sp"
app:autoSizeTextType="uniform"
app:autoSizeMaxTextSize="16sp"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
android:ellipsize="end"
android:maxLines="1"
android:layout_gravity="center"
@@ -986,7 +986,7 @@
android:textSize="12sp"
app:autoSizeTextType="uniform"
app:autoSizeMaxTextSize="16sp"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
android:ellipsize="end"
android:maxLines="1"
android:layout_gravity="center"
diff --git a/app/src/main/res/layout/pop_basic_information_single.xml b/app/src/main/res/layout/pop_basic_information_single.xml
index 6391e71..ab0b33b 100644
--- a/app/src/main/res/layout/pop_basic_information_single.xml
+++ b/app/src/main/res/layout/pop_basic_information_single.xml
@@ -222,7 +222,7 @@
android:textSize="12sp"
app:autoSizeTextType="uniform"
app:autoSizeMaxTextSize="16sp"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
android:ellipsize="end"
android:maxLines="1"
android:layout_gravity="center"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 300f121..32a46f7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -41,6 +41,7 @@
<!-- 鍏抽棴 RecyclerView ScrollView ViewPager 姘存尝绾规晥鏋� -->
<item name="android:overScrollMode">never</item>
+
</style>
<!-- 鍏ㄥ睆涓婚鏍峰紡 -->
diff --git a/app_base/src/main/java/com/android/app_base/base/adapter/databinding/ImageViewAdapter.java b/app_base/src/main/java/com/android/app_base/base/adapter/databinding/ImageViewAdapter.java
index 695b470..f17fa1a 100644
--- a/app_base/src/main/java/com/android/app_base/base/adapter/databinding/ImageViewAdapter.java
+++ b/app_base/src/main/java/com/android/app_base/base/adapter/databinding/ImageViewAdapter.java
@@ -12,6 +12,7 @@
import androidx.databinding.BindingAdapter;
import androidx.databinding.InverseBindingAdapter;
+import com.android.app_base.base.BaseConfig;
import com.android.app_base.utils.GlideUtil;
import java.math.BigDecimal;
@@ -27,6 +28,12 @@
if (TextUtils.isEmpty(url)) {
return;
}
+
+ if (url.contains("profile/upload")) {
+ if (!url.contains("http")) {
+ url = BaseConfig.BASE_URL + "/" + url;
+ }
+ }
GlideUtil.loadImage(url, imageView);
}
@BindingAdapter({"imageBase64"})
diff --git a/app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java b/app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java
index 0acb457..9fca0e9 100644
--- a/app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java
+++ b/app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java
@@ -77,7 +77,7 @@
* 鏇存敼鐘舵�佽鍥剧殑鐘舵��
*/
public void changeStateView(StateViewEnum state) {
- stateViewLiveData.postValue(state);
+ stateViewLiveData.setValue(state);
}
@Override
diff --git a/app_base/src/main/java/com/android/app_base/utils/rxbus/MessageEvent.java b/app_base/src/main/java/com/android/app_base/utils/rxbus/MessageEvent.java
index f1e9b46..110222d 100644
--- a/app_base/src/main/java/com/android/app_base/utils/rxbus/MessageEvent.java
+++ b/app_base/src/main/java/com/android/app_base/utils/rxbus/MessageEvent.java
@@ -7,9 +7,9 @@
*/
public class MessageEvent {
public static final int EVENT_INFO_UPDATE = 1;
- public static final int EVENT_TOURISM_CONSUME_CHANGE = 2;
- public static final int EVENT_REFRESH_DATA = 3;
- public static final int EVENT_UPDATE_USER_INFO = 4;
+ public static final int EVENT_TOURISM_CONSUME_CHANGE = 2; //鏃呮父娑堣垂鍙樺寲
+ public static final int EVENT_REFRESH_DATA = 3;//鍒锋柊鏁版嵁
+ public static final int EVENT_UPDATE_USER_INFO = 4;//鏇存柊鐢ㄦ埛淇℃伅
private int messageEventCode;
private Object messageEventData;
--
Gitblit v1.9.1