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/TourismExperienceDetailActivity.java | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java
index dd26841..1b9b00c 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java
@@ -73,10 +73,12 @@
TourismExperienceBean bean = (TourismExperienceBean) getIntent().getSerializableExtra("bean");
if (bean !=null){
viewModel.getBeanLiveData().setValue(bean);
+ viewModel.setCid(bean.getCid());
}
}else if (type == 1){
- String fid = getIntent().getStringExtra("fid");
- viewModel.getBeanLiveData().getValue().setFeeId(fid);
+ String cid = getIntent().getStringExtra("cid");
+ viewModel.getBeanLiveData().getValue().setCid(cid);
+ viewModel.setCid(cid);
}
}
@@ -201,24 +203,6 @@
}
});
datePicker.show();
- }
- });
- binding.etSelf.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- hideSoftKeyboard();
- List<String> list = Arrays.asList("鍏垂","鑷垂");
- OptionPicker picker = getOptionPicker(list);
- picker.setTitle("鑷垂鎴栧叕璐�");
- picker.setDefaultValue(binding.etSelf.getText().toString());
- picker.setOnOptionPickedListener(new OnOptionPickedListener() {
- @Override
- public void onOptionPicked(int position, Object item) {
- viewModel.getBeanLiveData().getValue().setSelf(position);
- viewModel.getBeanLiveData().setValue(viewModel.getBeanLiveData().getValue());
- }
- });
- picker.show();
}
});
activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
--
Gitblit v1.9.1