From b7606aff181e01af3f3d4cad2bc183b8d29058aa Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 28 三月 2023 21:38:37 +0800
Subject: [PATCH] 添加删除修改家大事记
---
app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java | 6
app/src/main/res/drawable-xxhdpi/ic_pet.png | 0
app/src/main/res/drawable-xxhdpi/ic_cleaning.png | 0
app/src/main/res/drawable-xxhdpi/ic_wish.png | 0
app/src/main/res/drawable-xxhdpi/ic_vector_pink.png | 0
app/src/main/res/drawable-xxhdpi/ic_tour.png | 0
app/src/main/res/drawable-xxhdpi/ic_marriage.png | 0
app/src/main/res/drawable-xhdpi/ic_income_expense.png | 0
app/src/main/res/drawable-xxhdpi/ic_mail_list.png | 0
app/src/main/res/drawable-xhdpi/ic_home_devices.png | 0
app/src/main/res/drawable-xhdpi/ic_family_root_net.png | 0
app/src/main/res/drawable-xhdpi/ic_property.png | 0
app/src/main/res/drawable-xhdpi/ic_vector_pink.png | 0
app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java | 7
app/src/main/res/drawable-xxhdpi/ic_health.png | 0
app/src/main/res/drawable-xxhdpi/ic_property.png | 0
app/src/main/res/drawable-xxhdpi/ic_income_expense.png | 0
app/src/main/res/drawable-xhdpi/ic_asset.png | 0
app/src/main/res/drawable-xhdpi/ic_notes.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java | 126 ++++++++
app/src/main/res/drawable-xhdpi/ic_pet.png | 0
app/src/main/res/drawable-xxhdpi/ic_home_devices.png | 0
app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java | 8
app/src/main/res/drawable-xhdpi/ic_cleaning.png | 0
app/src/main/res/drawable-xhdpi/ic_marriage.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java | 13
app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java | 32 --
app/src/main/res/drawable-xxhdpi/ic_asset.png | 0
app/src/main/res/layout/item_family_create.xml | 398 +++++++++++++-------------
app/src/main/res/drawable-xhdpi/ic_privacy.png | 0
app/src/main/res/drawable-xxhdpi/ic_notes.png | 0
app/src/main/res/drawable-xhdpi/ic_vector_gray.png | 0
app/src/main/res/drawable-xhdpi/ic_certificate.png | 0
app/src/main/res/drawable-xxhdpi/ic_little_doctor.png | 0
app/src/main/res/layout/activity_family_memorabilia.xml | 48 +-
app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java | 5
app/src/main/res/drawable-xxhdpi/ic_certificate.png | 0
app/src/main/res/drawable-xhdpi/ic_growth.png | 0
app/src/main/res/drawable-xxhdpi/ic_vector_gray.png | 0
app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaBean.java | 17
app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java | 97 +++++-
app/src/main/res/drawable-xhdpi/ic_wish.png | 0
app/src/main/res/drawable-xhdpi/ic_health.png | 0
app/src/main/res/drawable-xhdpi/ic_tour.png | 0
app/src/main/res/layout/item_family_memorabilia.xml | 18 -
app/src/main/AndroidManifest.xml | 3
.idea/deploymentTargetDropDown.xml | 13
app/src/main/res/drawable-xhdpi/ic_little_doctor.png | 0
app/src/main/res/drawable-xhdpi/ic_honor.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java | 19 +
app/src/main/res/drawable-xxhdpi/ic_growth.png | 0
app/src/main/res/drawable-xxhdpi/ic_privacy.png | 0
app/src/main/res/drawable-xhdpi/ic_mail_list.png | 0
app/src/main/res/drawable-xxhdpi/ic_honor.png | 0
app/src/main/res/drawable-xxhdpi/ic_family_root_net.png | 0
app/src/main/res/layout/pop_operate_delete.xml | 49 +++
56 files changed, 556 insertions(+), 303 deletions(-)
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 1688f79..7bb4a8e 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,6 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
+ <runningDeviceTargetSelectedWithDropDown>
+ <Target>
+ <type value="RUNNING_DEVICE_TARGET" />
+ <deviceKey>
+ <Key>
+ <type value="VIRTUAL_DEVICE_PATH" />
+ <value value="D:\software\Android\.android\avd\Pixel_API_30.avd" />
+ </Key>
+ </deviceKey>
+ </Target>
+ </runningDeviceTargetSelectedWithDropDown>
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
@@ -12,6 +23,6 @@
</deviceKey>
</Target>
</targetSelectedWithDropDown>
- <timeTargetWasSelectedWithDropDown value="2023-03-27T13:20:06.320581100Z" />
+ <timeTargetWasSelectedWithDropDown value="2023-03-28T11:22:31.926040400Z" />
</component>
</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7d6792f..67cf41c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,6 +57,9 @@
<activity
android:name=".ui.function.FamilyMemorabiliaActivity"
android:exported="false" />
+ <activity
+ android:name=".ui.function.CreateFamilyProjectActivity"
+ android:exported="false" />
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java
index 695bbde..3c84a4b 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java
@@ -1,6 +1,7 @@
package com.application.zhangshi_app_android.adapter;
import android.content.Context;
+import android.content.Intent;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -10,10 +11,13 @@
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
+import com.android.app_base.base.BaseConfig;
import com.android.app_base.base.adapter.BaseRVAdapter;
+import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.databinding.ItemFamilyMemorabiliaBinding;
+import com.application.zhangshi_app_android.ui.function.CreateFamilyProjectActivity;
import com.application.zhangshi_app_android.ui.function.FamilyMemorabiliaActivity;
import com.application.zhangshi_app_android.ui.function.FamilyMemorabiliaActivityViewModel;
@@ -126,6 +130,15 @@
holder.getBinding().cardView.startAnimation(a);
holder.isExpended = true;
}
+ holder.getBinding().layoutModify.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ AppManager.getAppManager().startActivity(
+ new Intent(getRecyclerView().getContext(), CreateFamilyProjectActivity.class)
+ .putExtra(BaseConfig.EXTRA_TYPE,0)
+ .putExtra("bean",mDataList.get(position)));
+ }
+ });
}
});
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaBean.java
index 608dd72..0d37834 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/FamilyMemorabiliaBean.java
@@ -1,18 +1,21 @@
package com.application.zhangshi_app_android.bean;
+import java.io.Serializable;
+import java.util.List;
+
/**
* @author Ljj
* @date 2023.03.18. 10:29
* @desc 瀹跺ぇ浜嬭 bean 绫�
*/
-public class FamilyMemorabiliaBean {
+public class FamilyMemorabiliaBean implements Serializable {
private long id;
private String address;
private String createTime;
private String people;
private String remark;
private String title;
- private String url;
+ private List<String> url;
public String getAddress() { return address; }
public void setAddress(String value) { this.address = value; }
@@ -21,7 +24,9 @@
public void setCreateTime(String value) { this.createTime = value; }
public long getId() { return id; }
- public void setId(long value) { this.id = value; }
+ public void setId(long value) {
+ this.id = value;
+ }
public String getPeople() { return people; }
public void setPeople(String value) { this.people = value; }
@@ -32,6 +37,8 @@
public String getTitle() { return title; }
public void setTitle(String value) { this.title = value; }
- public String getUrl() { return url; }
- public void setUrl(String value) { this.url = value; }
+ public List<String> getUrl() { return url; }
+ public void setUrl(List<String> value) { this.url = value; }
+
+
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java b/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
index ab64207..e78ebea 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
@@ -100,6 +100,13 @@
public Observable<ResultData<String>> deleteFamilyMemorabilia(String ids) {
return mHttpDataSource.deleteFamilyMemorabilia(ids);
}
+ /**
+ * 鍒犻櫎瀹跺ぇ浜嬭
+ */
+ @Override
+ public Observable<ResultData<String>> updateFamilyMemorabilia(FamilyMemorabiliaBean familyMemorabiliaBean) {
+ return mHttpDataSource.updateFamilyMemorabilia(familyMemorabiliaBean);
+ }
/**
* @see LocalDataSourceImpl
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
index 4b5b4f4..fd8ab36 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
@@ -47,4 +47,9 @@
* 鍒犻櫎瀹跺ぇ浜嬭
*/
Observable<ResultData<String>> deleteFamilyMemorabilia(String ids);
+
+ /**
+ * 淇敼
+ */
+ Observable<ResultData<String>> updateFamilyMemorabilia(FamilyMemorabiliaBean familyMemorabiliaBean);
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
index 6732e43..9815ad6 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
@@ -16,6 +16,7 @@
import retrofit2.http.DELETE;
import retrofit2.http.GET;
import retrofit2.http.POST;
+import retrofit2.http.PUT;
import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.QueryMap;
@@ -58,6 +59,11 @@
*/
@DELETE("/family/zfEvent/{ids}")
Observable<ResultData<String>> deleteFamilyMemorabilia(@Path("ids") String ids);
+ /**
+ * 淇敼瀹跺ぇ浜嬭
+ */
+ @PUT("/family/zfEvent")
+ Observable<ResultData<String>> updateFamilyMemorabilia(@Body FamilyMemorabiliaBean familyMemorabiliaBean);
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
index 08b038d..811264d 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
@@ -88,4 +88,12 @@
public Observable<ResultData<String>> deleteFamilyMemorabilia(String ids) {
return apiService.deleteFamilyMemorabilia(ids);
}
+
+ /**
+ * 淇敼瀹跺ぇ浜嬭
+ */
+ @Override
+ public Observable<ResultData<String>> updateFamilyMemorabilia(FamilyMemorabiliaBean familyMemorabiliaBean) {
+ return apiService.updateFamilyMemorabilia(familyMemorabiliaBean);
+ }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java
index 3e07dd7..4c9fced 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java
@@ -1,12 +1,21 @@
package com.application.zhangshi_app_android.ui.function;
+import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup;
+import android.widget.PopupWindow;
import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
+import com.android.app_base.base.BaseConfig;
+import com.android.app_base.base.dialog.BaseDialog;
+import com.android.app_base.base.dialog.UIDialog;
import com.android.app_base.base.view.BaseActivity;
+import com.android.app_base.utils.ScreenSizeUtils;
+import com.android.app_base.utils.ToastUtils;
import com.android.app_base.widget.LinearItemDecoration;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
@@ -19,19 +28,9 @@
* @desc 瀹跺ぇ浜嬭 CreateFamilyProjectActivity
*/
public class CreateFamilyProjectActivity extends BaseActivity<ItemFamilyCreateBinding,CreateFamilyProjectActivityViewModel> {
- ItemFamilyCreateBinding binding;
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- binding=DataBindingUtil.setContentView(this,R.layout.item_family_create);
-
-
- }
-public class Myclick{public void onClick(View view){
-
- }
- }
+ private int type;
+ private int operateType;
+ private PopupWindow popupWindow;
@Override
public int getLayoutId() {
return R.layout.item_family_create;
@@ -39,22 +38,80 @@
@Override
public int getVariableId() {
- return BR.CreateFamilyActivityViewModel;
+ return BR.viewModel;
}
@Override
public void initParam() {
-
+ type = getIntent().getIntExtra(BaseConfig.EXTRA_TYPE,0);
+ if (type == 0){
+ FamilyMemorabiliaBean bean = (FamilyMemorabiliaBean) getIntent().getSerializableExtra("bean");
+ if (bean!=null){
+ viewModel.getBeanMutableLiveData().postValue(bean);
+ }
+ }
}
@Override
public void initView() {
+ if (type == 1){
+ binding.ivOperate.setBackgroundResource(R.drawable.ic_operate_finish);
+ binding.ivOperate.setOnClickListener(v -> {
+ viewModel.add();
+ });
+ }else {
+ binding.ivOperate.setBackgroundResource(R.drawable.ic_operate);
+ popupWindow = new PopupWindow(this);
+ // 璁剧疆甯冨眬鏂囦欢
+ popupWindow.setContentView(LayoutInflater.from(this).inflate(R.layout.pop_operate_delete, null));
+ // 涓轰簡閬垮厤閮ㄥ垎鏈哄瀷涓嶆樉绀猴紝闇�瑕侀噸鏂拌缃竴涓嬪楂�
+ popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+ popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+ // 璁剧疆pop閫忔槑鏁堟灉
+ popupWindow.setBackgroundDrawable(new ColorDrawable(0x0000));
+ // 璁剧疆pop鍑哄叆鍔ㄧ敾
+ popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_add);
+ // 璁剧疆pop鑾峰彇鐒︾偣锛屽鏋滀负false鐐瑰嚮杩斿洖鎸夐挳浼氶��鍑哄綋鍓岮ctivity锛屽鏋減op涓湁Editor鐨勮瘽锛宖ocusable蹇呴』瑕佷负true
+ popupWindow.setFocusable(true);
+ // 璁剧疆pop鍙偣鍑伙紝涓篺alse鐐瑰嚮浜嬩欢鏃犳晥锛岄粯璁や负true
+ popupWindow.setTouchable(true);
+ // 璁剧疆鐐瑰嚮pop澶栦晶娑堝け锛岄粯璁や负false锛涘湪focusable涓簍rue鏃剁偣鍑诲渚у缁堟秷澶�
+ popupWindow.setOutsideTouchable(true);
- LinearItemDecoration itemDecoration = new LinearItemDecoration();
- itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
- itemDecoration.setHorizontalSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
- itemDecoration.setFirstTop((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
-
+ binding.ivOperate.setOnClickListener(v -> {
+ if (operateType == 0){
+ popupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,85) +binding.ivOperate.getWidth(),0);
+ }else{
+ viewModel.update();
+ }
+ });
+ popupWindow.getContentView().findViewById(R.id.tv_modify).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ binding.ivOperate.setBackgroundResource(R.drawable.ic_operate_finish);
+ operateType = 1;
+ popupWindow.dismiss();
+ }
+ });
+ popupWindow.getContentView().findViewById(R.id.tv_delete).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ popupWindow.dismiss();
+ new UIDialog.Builder(getSelfActivity())
+ .setTitle("鎮ㄧ‘瀹氳鍒犻櫎椤圭洰鍚�")
+ .setContent("椤圭洰鍒犻櫎鍚庡皢鏃犳硶鎭㈠")
+ .setConfirm("纭畾")
+ .setCancel("鍙栨秷")
+ .setListener(new UIDialog.OnListener() {
+ @Override
+ public void onConfirm(BaseDialog dialog) {
+ viewModel.delete();
+ }
+ })
+ .show();
+ }
+ });
+ }
}
@Override
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java
index 2a81638..75c5aef 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java
@@ -1,13 +1,29 @@
package com.application.zhangshi_app_android.ui.function;
+import static com.android.app_base.base.BaseConfig.CODE_SUCCESS;
+
import android.app.Application;
import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
import com.android.app_base.base.viewmodel.BaseViewModel;
+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.ToastUtils;
+import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.data.DataRepository;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+
public class CreateFamilyProjectActivityViewModel extends BaseViewModel<DataRepository> {
+
+ private MutableLiveData<FamilyMemorabiliaBean> beanMutableLiveData;
public CreateFamilyProjectActivityViewModel(@NonNull Application application) {
super(application);
}
@@ -16,4 +32,114 @@
protected DataRepository initModel() {
return DataRepository.getInstance();
}
+
+ /**
+ * 澧炲姞瀹跺ぇ浜嬭
+ */
+ public void add() {
+ model.addFamilyMemorabilia(beanMutableLiveData.getValue())
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<String>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<String> stringResultData) {
+ if (stringResultData.getCode() == CODE_SUCCESS){
+ messageLiveData.postValue("娣诲姞鎴愬姛");
+ }else {
+ messageLiveData.postValue(stringResultData.getMsg());
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ /**
+ * 鍒犻櫎瀹跺ぇ浜嬭
+ */
+ public void delete() {
+ model.deleteFamilyMemorabilia(String.valueOf(beanMutableLiveData.getValue().getId()))
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<String>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<String> stringResultData) {
+ if (stringResultData.getCode() == CODE_SUCCESS){
+ messageLiveData.postValue("鍒犻櫎鎴愬姛");
+ AppManager.getAppManager().finishCurrentActivity();
+ }else {
+ messageLiveData.postValue(stringResultData.getMsg());
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ /**
+ * 缂栬緫瀹跺ぇ浜嬭
+ */
+ public void update() {
+ model.updateFamilyMemorabilia(beanMutableLiveData.getValue())
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<String>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<String> stringResultData) {
+ if (stringResultData.getCode() == CODE_SUCCESS){
+ messageLiveData.postValue("淇敼鎴愬姛");
+ AppManager.getAppManager().finishCurrentActivity();
+ }else {
+ messageLiveData.postValue(stringResultData.getMsg());
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+ public MutableLiveData<FamilyMemorabiliaBean> getBeanMutableLiveData() {
+ if (beanMutableLiveData == null){
+ beanMutableLiveData = new MutableLiveData<>();
+ }
+ return beanMutableLiveData;
+ }
+
+ public void setBeanMutableLiveData(MutableLiveData<FamilyMemorabiliaBean> beanMutableLiveData) {
+ this.beanMutableLiveData = beanMutableLiveData;
+ }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
index bfff5ec..56f247e 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
@@ -1,6 +1,7 @@
package com.application.zhangshi_app_android.ui.function;
import android.content.DialogInterface;
+import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -17,9 +18,11 @@
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.lifecycle.Observer;
+import com.android.app_base.base.BaseConfig;
import com.android.app_base.base.dialog.BaseDialog;
import com.android.app_base.base.dialog.UIDialog;
import com.android.app_base.base.view.BaseActivity;
+import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.ScreenSizeUtils;
import com.android.app_base.widget.LinearItemDecoration;
import com.application.zhangshi_app_android.BR;
@@ -71,7 +74,7 @@
mOperatePopupWindow = initPopUpWindow(R.layout.pop_operate);
mOperatePopupWindow.getContentView().findViewById(R.id.tv_add).setOnClickListener(v -> {
- //TODO 璺宠浆 鏂板缓
+ AppManager.getAppManager().startActivity(new Intent(this,CreateFamilyProjectActivity.class).putExtra(BaseConfig.EXTRA_TYPE,1));
});
mOperatePopupWindow.getContentView().findViewById(R.id.tv_select).setOnClickListener(v -> {
binding.ivOperate.setBackgroundResource(R.drawable.ic_operate_finish);
@@ -121,9 +124,10 @@
binding.fabAdd.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
+ AppManager.getAppManager().startActivity(new Intent(getSelfActivity(),CreateFamilyProjectActivity.class).putExtra(BaseConfig.EXTRA_TYPE,1));
}
});
+
setOnClickListener(
mSearchPopupWindow.getContentView().findViewById(R.id.tv_global_search),
mSearchPopupWindow.getContentView().findViewById(R.id.tv_search_in_family_memorabilia),
@@ -146,12 +150,18 @@
}
});
+ binding.ivMenu.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ binding.drawerLayout.open();
+ }
+ });
binding.drawerLayout.setScrimColor(getResources().getColor(R.color.color_shadow));
}
@Override
public void initData() {
- viewModel.getFamilyMemorabilia(0);
+ viewModel.getFamilyMemorabilia(searchType);
}
@Override
@@ -203,7 +213,8 @@
@Override
protected void dataNull() {
super.dataNull();
-
+ binding.layoutDataNull.setVisibility(View.VISIBLE);
+ binding.recyclerView.setVisibility(View.GONE);
}
@Override
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java
index 47519be..c8c606b 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java
@@ -96,38 +96,6 @@
});
}
/**
- * 澧炲姞瀹跺ぇ浜嬭
- */
- public void add(FamilyMemorabiliaBean bean) {
- model.addFamilyMemorabilia(bean)
- .compose(RxUtils.schedulersTransformer())
- .subscribe(new Observer<ResultData<String>>() {
- @Override
- public void onSubscribe(Disposable d) {
- addSubscribe(d);
- }
-
- @Override
- public void onNext(ResultData<String> stringResultData) {
- if (stringResultData.getCode() == CODE_SUCCESS){
- messageLiveData.postValue("娣诲姞鎴愬姛");
- }else {
- messageLiveData.postValue(stringResultData.getMsg());
- }
- }
-
- @Override
- public void onError(Throwable e) {
- messageLiveData.postValue(e.getMessage());
- }
-
- @Override
- public void onComplete() {
-
- }
- });
- }
- /**
* 鍒犻櫎瀹跺ぇ浜嬭
*/
public void delete() {
diff --git a/app/src/main/res/drawable-xhdpi/ic_asset.png b/app/src/main/res/drawable-xhdpi/ic_asset.png
new file mode 100644
index 0000000..147e5e9
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_asset.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_certificate.png b/app/src/main/res/drawable-xhdpi/ic_certificate.png
new file mode 100644
index 0000000..5ede2db
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_certificate.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cleaning.png b/app/src/main/res/drawable-xhdpi/ic_cleaning.png
new file mode 100644
index 0000000..5c315c5
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_cleaning.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_family_root_net.png b/app/src/main/res/drawable-xhdpi/ic_family_root_net.png
new file mode 100644
index 0000000..ed82ec4
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_family_root_net.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_growth.png b/app/src/main/res/drawable-xhdpi/ic_growth.png
new file mode 100644
index 0000000..6fd9b26
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_growth.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_health.png b/app/src/main/res/drawable-xhdpi/ic_health.png
new file mode 100644
index 0000000..eb16fe5
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_health.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_home_devices.png b/app/src/main/res/drawable-xhdpi/ic_home_devices.png
new file mode 100644
index 0000000..99c9a40
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_home_devices.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_honor.png b/app/src/main/res/drawable-xhdpi/ic_honor.png
new file mode 100644
index 0000000..2c2bc58
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_honor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_income_expense.png b/app/src/main/res/drawable-xhdpi/ic_income_expense.png
new file mode 100644
index 0000000..5a92da5
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_income_expense.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_little_doctor.png b/app/src/main/res/drawable-xhdpi/ic_little_doctor.png
new file mode 100644
index 0000000..3475526
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_little_doctor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mail_list.png b/app/src/main/res/drawable-xhdpi/ic_mail_list.png
new file mode 100644
index 0000000..2e633ca
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_mail_list.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_marriage.png b/app/src/main/res/drawable-xhdpi/ic_marriage.png
new file mode 100644
index 0000000..6e8d4e1
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_marriage.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notes.png b/app/src/main/res/drawable-xhdpi/ic_notes.png
new file mode 100644
index 0000000..76df822
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_notes.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pet.png b/app/src/main/res/drawable-xhdpi/ic_pet.png
new file mode 100644
index 0000000..391ccb3
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_pet.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_privacy.png b/app/src/main/res/drawable-xhdpi/ic_privacy.png
new file mode 100644
index 0000000..678b068
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_privacy.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_property.png b/app/src/main/res/drawable-xhdpi/ic_property.png
new file mode 100644
index 0000000..e1e2ab6
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_property.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tour.png b/app/src/main/res/drawable-xhdpi/ic_tour.png
new file mode 100644
index 0000000..2b1e196
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_tour.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_vector_gray.png b/app/src/main/res/drawable-xhdpi/ic_vector_gray.png
index 9d0a876..a536ee5 100644
--- a/app/src/main/res/drawable-xhdpi/ic_vector_gray.png
+++ b/app/src/main/res/drawable-xhdpi/ic_vector_gray.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_vector_pink.png b/app/src/main/res/drawable-xhdpi/ic_vector_pink.png
index 1871ae6..1a3020c 100644
--- a/app/src/main/res/drawable-xhdpi/ic_vector_pink.png
+++ b/app/src/main/res/drawable-xhdpi/ic_vector_pink.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_wish.png b/app/src/main/res/drawable-xhdpi/ic_wish.png
new file mode 100644
index 0000000..ba29422
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_wish.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_asset.png b/app/src/main/res/drawable-xxhdpi/ic_asset.png
new file mode 100644
index 0000000..13af133
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_asset.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_certificate.png b/app/src/main/res/drawable-xxhdpi/ic_certificate.png
new file mode 100644
index 0000000..e23e8e0
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_certificate.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cleaning.png b/app/src/main/res/drawable-xxhdpi/ic_cleaning.png
new file mode 100644
index 0000000..3001ed0
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_cleaning.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_family_root_net.png b/app/src/main/res/drawable-xxhdpi/ic_family_root_net.png
new file mode 100644
index 0000000..9d9499f
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_family_root_net.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_growth.png b/app/src/main/res/drawable-xxhdpi/ic_growth.png
new file mode 100644
index 0000000..fc2fc5e
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_growth.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_health.png b/app/src/main/res/drawable-xxhdpi/ic_health.png
new file mode 100644
index 0000000..2a21cec
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_health.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_home_devices.png b/app/src/main/res/drawable-xxhdpi/ic_home_devices.png
new file mode 100644
index 0000000..1953adc
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_home_devices.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_honor.png b/app/src/main/res/drawable-xxhdpi/ic_honor.png
new file mode 100644
index 0000000..5cde51d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_honor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_income_expense.png b/app/src/main/res/drawable-xxhdpi/ic_income_expense.png
new file mode 100644
index 0000000..17baed0
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_income_expense.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_little_doctor.png b/app/src/main/res/drawable-xxhdpi/ic_little_doctor.png
new file mode 100644
index 0000000..c9a1036
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_little_doctor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mail_list.png b/app/src/main/res/drawable-xxhdpi/ic_mail_list.png
new file mode 100644
index 0000000..b26678f
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_mail_list.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_marriage.png b/app/src/main/res/drawable-xxhdpi/ic_marriage.png
new file mode 100644
index 0000000..2d6906a
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_marriage.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notes.png b/app/src/main/res/drawable-xxhdpi/ic_notes.png
new file mode 100644
index 0000000..4e543da
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_notes.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pet.png b/app/src/main/res/drawable-xxhdpi/ic_pet.png
new file mode 100644
index 0000000..286e4d9
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_pet.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_privacy.png b/app/src/main/res/drawable-xxhdpi/ic_privacy.png
new file mode 100644
index 0000000..c69dca6
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_privacy.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_property.png b/app/src/main/res/drawable-xxhdpi/ic_property.png
new file mode 100644
index 0000000..77eb73e
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_property.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tour.png b/app/src/main/res/drawable-xxhdpi/ic_tour.png
new file mode 100644
index 0000000..b0a00d3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_tour.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_vector_gray.png b/app/src/main/res/drawable-xxhdpi/ic_vector_gray.png
index c693680..a9ec322 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_vector_gray.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_vector_gray.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_vector_pink.png b/app/src/main/res/drawable-xxhdpi/ic_vector_pink.png
index 6f1c08e..d1f3a74 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_vector_pink.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_vector_pink.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_wish.png b/app/src/main/res/drawable-xxhdpi/ic_wish.png
new file mode 100644
index 0000000..85e6ba3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_wish.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_family_memorabilia.xml b/app/src/main/res/layout/activity_family_memorabilia.xml
index ce72f42..6dd883b 100644
--- a/app/src/main/res/layout/activity_family_memorabilia.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia.xml
@@ -20,8 +20,6 @@
tools:context=".ui.function.FamilyMemorabiliaActivity"
android:orientation="vertical">
-
-
<com.hjq.bar.TitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
@@ -88,6 +86,7 @@
android:gravity="center_vertical"
android:background="@color/white"
android:paddingHorizontal="5dp"
+ android:visibility="gone"
>
<ImageView
android:layout_width="24dp"
@@ -206,7 +205,7 @@
</LinearLayout>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
- android:layout_height="400dp"
+ android:layout_height="304dp"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
@@ -240,7 +239,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_family_root_net"
/>
<TextView
android:layout_width="0dp"
@@ -267,21 +266,21 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_notes"
/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="瀹跺ぇ浜嬭"
- android:textColor="@color/black"
+ android:textColor="#FFF6739F"
android:textSize="14sp"
android:layout_marginStart="15dp"
/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/ic_vector_gray"
+ android:background="@drawable/ic_vector_pink"
/>
</LinearLayout>
<LinearLayout
@@ -294,7 +293,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_asset"
/>
<TextView
android:layout_width="0dp"
@@ -321,8 +320,9 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_home_devices"
/>
+
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -348,7 +348,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_honor"
/>
<TextView
android:layout_width="0dp"
@@ -375,7 +375,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_little_doctor"
/>
<TextView
android:layout_width="0dp"
@@ -402,7 +402,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_cleaning"
/>
<TextView
android:layout_width="0dp"
@@ -429,7 +429,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_mail_list"
/>
<TextView
android:layout_width="0dp"
@@ -456,7 +456,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_pet"
/>
<TextView
android:layout_width="0dp"
@@ -483,7 +483,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_income_expense"
/>
<TextView
android:layout_width="0dp"
@@ -542,7 +542,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_growth"
/>
<TextView
android:layout_width="0dp"
@@ -569,7 +569,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_marriage"
/>
<TextView
android:layout_width="0dp"
@@ -596,7 +596,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_property"
/>
<TextView
android:layout_width="0dp"
@@ -623,7 +623,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_wish"
/>
<TextView
android:layout_width="0dp"
@@ -650,7 +650,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_tour"
/>
<TextView
android:layout_width="0dp"
@@ -674,11 +674,11 @@
android:paddingHorizontal="15dp"
android:gravity="center"
>
+
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
- />
+ android:background="@drawable/ic_health" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -704,7 +704,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_certificate"
/>
<TextView
android:layout_width="0dp"
@@ -731,7 +731,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_family_root_net"
+ android:background="@drawable/ic_privacy"
/>
<TextView
android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_family_create.xml b/app/src/main/res/layout/item_family_create.xml
index 5793d06..e43ff34 100644
--- a/app/src/main/res/layout/item_family_create.xml
+++ b/app/src/main/res/layout/item_family_create.xml
@@ -5,11 +5,8 @@
<data>
<variable
- name="CreateFamilyActivityViewModel"
+ name="viewModel"
type="com.application.zhangshi_app_android.ui.function.CreateFamilyProjectActivityViewModel" />
- <variable
- name="myclick"
- type="com.application.zhangshi_app_android.ui.function.CreateFamilyProjectActivity.Myclick"/>
</data>
<LinearLayout
@@ -18,224 +15,225 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
<com.hjq.bar.TitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_55"
- android:background="@color/color_title_bar_background"
- android:paddingHorizontal="@dimen/dp_16"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ android:layout_height="?attr/actionBarSize"
app:layout_constraintTop_toTopOf="parent"
+ android:paddingHorizontal="0dp"
+ android:background="@color/color_title_bar_background"
app:leftIcon="@null"
- app:rightIcon="@null">
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start|center_vertical"
- android:orientation="horizontal">
-
+ app:rightIcon="@null"
+ >
+ <ImageView
+ android:id="@+id/iv_menu"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:background="@drawable/ic_menu"
+ android:layout_gravity="center_vertical"
+ />
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
<ImageView
- android:id="@+id/menu"
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:layout_gravity="center"
- android:background="@drawable/ic_menu" />
-
- <TextView
+ android:id="@+id/iv_operate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_32"
- android:text="@string/title_family_create_project"
- android:textColor="@color/white"
- android:textSize="@dimen/sp_20" />
-
- </LinearLayout>
+ android:layout_gravity="center"
+ android:background="@drawable/ic_operate"
+ />
+ </FrameLayout>
<LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end|center_vertical"
- android:orientation="horizontal">
-
- <ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_search" />
-
- <ImageView
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:layout_marginStart="@dimen/dp_16"
- android:background="@drawable/ic_operate" />
-
+ android:id="@+id/layout_default"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:text="寮犳皬APP绔嬮」"
+ android:layout_weight="1"
+ android:textColor="@color/white"
+ android:textSize="@dimen/sp_20"
+ />
</LinearLayout>
+
</com.hjq.bar.TitleBar>
- <LinearLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/titleBar" >
- <TextView
- android:id="@+id/textview_sequence"
- android:layout_width="@dimen/dp_320"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_10"
- android:layout_height="@dimen/dp_20"
- android:text="搴忓彿"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
-
-
- <EditText
- android:id="@+id/editTextsequence"
- android:layout_width="@dimen/dp_320"
- android:layout_height="@dimen/dp_30"
- android:layout_marginTop="@dimen/dp_2"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:hint="璇疯緭鍏ュ簭鍙�"
- android:inputType="number"
- android:autofillHints="creditCardNumber"
- android:textColor="#6b000000"
- android:textSize="@dimen/sp_16" />
-
- <TextView
- android:id="@+id/textview_time"
- android:layout_width="@dimen/dp_320"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_10"
- android:layout_height="@dimen/dp_20"
- android:text="鏃堕棿"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
-
- <EditText
- android:id="@+id/editTextTime"
- android:layout_width="@dimen/dp_320"
- android:layout_height="@dimen/dp_30"
- android:layout_marginTop="@dimen/dp_2"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:hint="璇疯緭鍏ユ椂闂�"
- android:inputType="number"
- android:textColor="#6b000000"
- android:textSize="@dimen/sp_16" />
- <TextView
- android:id="@+id/textview_figure_1"
- android:layout_width="@dimen/dp_320"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_10"
- android:layout_height="@dimen/dp_20"
- android:text="浜虹墿"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
-
-
- <EditText
- android:id="@+id/editTextFigure1"
- android:layout_width="@dimen/dp_320"
- android:layout_height="@dimen/dp_30"
- android:layout_marginTop="@dimen/dp_2"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:hint="璇疯緭鍏ヤ汉鐗�"
- android:inputType="number"
- android:textColor="#6b000000"
- android:textSize="@dimen/sp_16" />
- <TextView
- android:id="@+id/textview_spot"
- android:layout_width="@dimen/dp_320"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_10"
- android:layout_height="@dimen/dp_20"
- android:text="鍦扮偣"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
-
-
- <EditText
- android:id="@+id/editTextSpot"
- android:layout_width="@dimen/dp_320"
- android:layout_height="@dimen/dp_30"
- android:layout_marginTop="@dimen/dp_2"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:hint="璇疯緭鍏ュ湴鐐�"
- android:inputType="number"
- android:textColor="#6b000000"
- android:textSize="@dimen/sp_16" />
- <TextView
- android:id="@+id/textview_figure_2"
- android:layout_width="@dimen/dp_320"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_10"
- android:layout_height="@dimen/dp_20"
- android:text="浜虹墿"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
-
-
- <EditText
- android:id="@+id/editTextFigure2"
- android:layout_width="@dimen/dp_320"
- android:layout_height="@dimen/dp_30"
- android:layout_marginTop="@dimen/dp_2"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:hint="璇疯緭鍏ヤ汉鐗�"
- android:inputType="number"
- android:textColor="#6b000000"
- android:textSize="@dimen/sp_16" />
- <TextView
- android:id="@+id/textview_elecfile"
- android:layout_width="@dimen/dp_320"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_10"
- android:layout_height="@dimen/dp_20"
- android:text="鐢靛瓙鏂囦欢"
- android:textColor="#ff000000"
- android:textSize="@dimen/sp_12"
- />
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/titleBar"
+ >
<LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical"
- android:layout_width="@dimen/dp_320"
- android:layout_height="@dimen/dp_180"
- android:layout_marginTop="@dimen/dp_2"
- android:layout_marginHorizontal="@dimen/dp_20"
- android:background="@drawable/shape_6b0000_stroke"
- android:textColor="#6b000000"
- android:textSize="@dimen/sp_16">
-
- <Button
- android:id="@+id/button_add"
- android:layout_width="@dimen/dp_85"
- android:layout_height="@dimen/dp_85"
- android:text="+"
- android:textColor="@color/black"
- android:textSize="@dimen/dp_35"
- android:gravity="center"
- android:layout_marginLeft="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_10"
- app:srcCompat="@drawable/shape_73fab4cd_solid"
- android:background="@drawable/shape_73fab4cd_solid"
- android:onClick="@{myclick.onClick}"
- />
-
+ android:paddingHorizontal="20dp"
+ >
<TextView
+ android:id="@+id/textview_sequence"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瀵煎叆"
- android:textColor="#6b000000"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="鏍囬"
+ android:textColor="#ff000000"
android:textSize="@dimen/sp_12"
- android:layout_marginLeft="@dimen/dp_40"
/>
+
+ <EditText
+ android:id="@+id/editTextsequence"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="璇疯緭鍏ユ爣棰�"
+ android:inputType="number"
+ android:autofillHints="creditCardNumber"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="@dimen/sp_16"
+ android:text="@={viewModel.beanMutableLiveData.title}"
+ />
+
+ <TextView
+ android:id="@+id/textview_time"
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="wrap_content"
+ android:text="鏃堕棿"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+ <EditText
+ android:id="@+id/editTextTime"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_2"
+ android:hint="璇疯緭鍏ユ椂闂�"
+ android:inputType="number"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanMutableLiveData.createTime}"
+ android:textSize="@dimen/sp_16" />
+ <TextView
+ android:id="@+id/textview_figure_1"
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="wrap_content"
+ android:text="浜虹墿"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+
+ <EditText
+ android:id="@+id/editTextFigure1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_2"
+ android:hint="璇疯緭鍏ヤ汉鐗�"
+ android:inputType="number"
+ android:textColorHint="#6b000000"
+ android:text="@={viewModel.beanMutableLiveData.people}"
+ android:textColor="#DE000000"
+ android:textSize="@dimen/sp_16" />
+ <TextView
+ android:id="@+id/textview_spot"
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="鍦扮偣"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+
+ <EditText
+ android:id="@+id/editTextSpot"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_2"
+ android:hint="璇疯緭鍏ュ湴鐐�"
+ android:inputType="number"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanMutableLiveData.address}"
+ android:textSize="@dimen/sp_16" />
+ <TextView
+ android:id="@+id/textview_figure_2"
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="wrap_content"
+ android:text="澶囨敞"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+
+ <EditText
+ android:id="@+id/editTextFigure2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_2"
+ android:hint="璇疯緭鍏ュ娉�"
+ android:inputType="number"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanMutableLiveData.remark}"
+ android:textSize="@dimen/sp_16" />
+ <TextView
+ android:id="@+id/textview_elecfile"
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="wrap_content"
+ android:text="鐢靛瓙鏂囦欢"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_180"
+ android:layout_marginTop="@dimen/dp_2"
+ android:background="@drawable/shape_6b0000_stroke"
+ android:layout_marginBottom="10dp"
+ >
+
+ <Button
+ android:id="@+id/button_add"
+ android:layout_width="@dimen/dp_85"
+ android:layout_height="@dimen/dp_85"
+ android:text="+"
+ android:textColor="@color/black"
+ android:textSize="@dimen/dp_35"
+ android:gravity="center"
+ android:layout_marginLeft="@dimen/dp_10"
+ android:layout_marginTop="@dimen/dp_10"
+ android:background="@drawable/shape_73fab4cd_solid"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="瀵煎叆"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="@dimen/sp_12"
+ android:layout_marginLeft="@dimen/dp_40"
+ />
+
+ </LinearLayout>
</LinearLayout>
- </LinearLayout>
+ </ScrollView>
</LinearLayout>
diff --git a/app/src/main/res/layout/item_family_memorabilia.xml b/app/src/main/res/layout/item_family_memorabilia.xml
index 6628019..abcf773 100644
--- a/app/src/main/res/layout/item_family_memorabilia.xml
+++ b/app/src/main/res/layout/item_family_memorabilia.xml
@@ -11,9 +11,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
>
-
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="match_parent"
@@ -245,6 +243,7 @@
android:layout_marginBottom="@dimen/dp_12"
>
<LinearLayout
+ android:id="@+id/layout_modify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
@@ -294,19 +293,4 @@
</androidx.cardview.widget.CardView>
</LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- >
- <LinearLayout
- android:layout_width="@dimen/dp_56"
- android:layout_height="@dimen/dp_56"
- android:orientation="vertical"
-
- >
-
- </LinearLayout>
- </LinearLayout>
-
</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pop_operate_delete.xml b/app/src/main/res/layout/pop_operate_delete.xml
new file mode 100644
index 0000000..3316102
--- /dev/null
+++ b/app/src/main/res/layout/pop_operate_delete.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:cardBackgroundColor="#FFFAD1E0"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="0dp"
+ >
+ <LinearLayout
+ android:layout_width="85dp"
+ android:layout_height="63dp"
+ android:orientation="vertical"
+ android:gravity="center_horizontal"
+ >
+ <TextView
+ android:id="@+id/tv_modify"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="缂栬緫"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ app:drawableStartCompat="@drawable/ic_modify"
+ android:drawablePadding="5dp"
+ android:layout_weight="1"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393"
+ />
+ <TextView
+ android:id="@+id/tv_delete"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍒犻櫎"
+ android:gravity="center"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ app:drawableStartCompat="@drawable/ic_delete"
+ android:drawablePadding="5dp"
+ android:layout_weight="1"
+ />
+
+ </LinearLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
--
Gitblit v1.9.1