From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java
index e2aa893..74b0c3b 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivity.java
@@ -35,7 +35,6 @@
private TourismExperienceRvAdapter adapter;
private boolean isSearchLayoutVisible;
private PopupWindow mOperatePopupWindow;
- private String fid;
@Override
public int getLayoutId() {
return R.layout.activity_tourism_experience;
@@ -49,18 +48,21 @@
@Override
public void initParam() {
- fid = getIntent().getStringExtra("id");
- viewModel.getRequestBeanLiveData().getValue().setFid(fid);
+ String cid = getIntent().getStringExtra("id");
+ viewModel.getRequestBeanLiveData().getValue().setCid(cid);
+ viewModel.setCid(cid);
}
@Override
public void initView() {
//涓嬫媺鍒锋柊甯冨眬
- binding.refreshLayout.setEnableRefresh(false);
- binding.refreshLayout.setEnableLoadMore(true);
+ binding.refreshLayout.setEnableRefresh(true);
+ binding.refreshLayout.setEnableLoadMore(false);
binding.refreshLayout.setEnableOverScrollDrag(true);
binding.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
- viewModel.getMoreTourismExperience();
+ });
+ binding.refreshLayout.setOnRefreshListener(refreshLayout -> {
+ viewModel.getTourismExperience();
});
//recyclerView閫傞厤鍣�
adapter = new TourismExperienceRvAdapter(this,viewModel);
@@ -72,6 +74,7 @@
binding.recyclerView.setAdapter(adapter);
//鍙充笂瑙掓搷浣滃脊绐�
mOperatePopupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate,null));
+ mOperatePopupWindow.getContentView().findViewById(R.id.layout_own_top).setVisibility(View.GONE);
setOnClickListener(
mOperatePopupWindow.getContentView().findViewById(R.id.tv_add),
mOperatePopupWindow.getContentView().findViewById(R.id.tv_select),
@@ -110,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() {
@@ -288,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();
}
@@ -302,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);
--
Gitblit v1.9.1