调整旅游模块功能

Linjiajia

2023-10-07 31b7700b976a46901f67c5d7a00281ca4745fc9f

调整旅游模块功能

 .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>

 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的build.gradle设置支持的SO库架构

 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) {

 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;
    }
}

 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;
    //地点
    //对应的完美旅途id
    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;
    //费用记录表id
    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;
    }
}

 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;
    }
}

 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;
    }
}

 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);
    }


 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);

    /**
     * 新增旅游经历

 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);

    /**

 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);
    }


 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());
        }

 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 -> {

 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的remove操作


    private MutableLiveData<TourismBean> beanLiveData;// 根据id获取的bean，用于更新数据
    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 升序

 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();
            }
        });
    }
@@ -197,70 +221,16 @@
    @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.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 {
                    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();
                    });
                }
@@ -268,44 +238,6 @@
                binding.ivOperate.setOnClickListener(v -> {
                    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()+"");
                    }
                });
    }

 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);

 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的remove操作
    private MutableLiveData<Integer> operateTypeLiveData;//操作类型 0 选择操作 1.完成 2.删除
    private String cid;//完美旅途id

    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) {
            // 从新到旧，null排最后
            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  {
            // 从旧到新，null排最前
            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)) {

 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>() {

 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;
    }
}

 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,98 +129,149 @@
                    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_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="旅期"
                            android:text="住宿费"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                <EditText
                        <androidx.appcompat.widget.AppCompatEditText
                            android:id="@+id/et_stay"
                    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.travelPeriod}"
                    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="text"
                    android:textColorHint="#6b000000"
                    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" />
                            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_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="公费或自费"
                            android:text="交通费"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                <EditText
                    android:id="@+id/et_self"
                            android:id="@+id/et_traffic"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                            android:inputType="numberDecimal"
                    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" />
                            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:text="出行方式"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
@@ -230,9 +281,49 @@
                    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.remark}"
                    android:text="@={viewModel.beanLiveData.travelMode}"
                    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="text"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请输入车次/航班`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.flight}"
                    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="text"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请输入使用证件`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.document}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />

 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"
                        />

 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

 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"
                        />

 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"
                        />

 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"
                        />

 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"
                        />

 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"
                        />

 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}"
                    />


 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}"

 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"
                        />

 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

 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"
                        />

 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"
                        />

 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"
                        />

 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

 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"
                        />

 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"
                        />

 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"

 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"
                            />

 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"
                            />

 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"
                        />

 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}"

 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"
                    />

 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"
                        />

 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
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    >
                    <EditText
                        android:id="@+id/et_total_day"
                    android:id="@+id/et_whereabouts"
                        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:hint="@{viewModel.typeLiveData?`请选择去向`:``}"
                    android:text="@={viewModel.beanLiveData.destination}"
                        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"
                    android:enabled="@{viewModel.typeLiveData}"
                    app:isEditable="@{false}"
                        />
                    <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}"
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="旅游性质"
                    android:textColor="#767375"
                    android:textSize="12sp"
                        />
                </androidx.constraintlayout.widget.ConstraintLayout>

                <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>


 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"
                        />

 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

 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"
                                />

 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>
                    <androidx.constraintlayout.widget.ConstraintLayout
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginBottom="6dp"
                        >
                        <LinearLayout
                            android:id="@+id/layout_1"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            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:layout_width="match_parent"
                            android:id="@+id/layout_2"
                            android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal"
                        android:layout_marginBottom="6dp"
                            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:text="住宿费："
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="@{bean.self==0?`公费`:`自费`}"
                                android:text="@{bean.stay}"
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            />
                    </LinearLayout>
                    <LinearLayout
                        android:layout_width="match_parent"
                            android:id="@+id/layout_3"
                            android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:orientation="horizontal"
                        android:layout_marginBottom="6dp"
                            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:text=""
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="@{bean.remark}"
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            />
                    </LinearLayout>
                        <LinearLayout
                            android:id="@+id/layout_4"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            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"

 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"
            />

 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"

 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"

 app/src/main/res/values/themes.xml

@@ -41,6 +41,7 @@
        <!-- 关闭 RecyclerView ScrollView ViewPager 水波纹效果 -->
        <item name="android:overScrollMode">never</item>


    </style>

    <!-- 全屏主题样式 -->

 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"})

 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

 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;