添加删除修改家大事记

Linjiajia

2023-03-28 b7606aff181e01af3f3d4cad2bc183b8d29058aa

添加删除修改家大事记

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

 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>

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

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


}

 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

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

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


}

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

 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点击返回按钮会退出当前Activity，如果pop中有Editor的话，focusable必须要为true
            popupWindow.setFocusable(true);
            // 设置pop可点击，为false点击事件无效，默认为true
            popupWindow.setTouchable(true);
            // 设置点击pop外侧消失，默认为false；在focusable为true时点击外侧始终消失
            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

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

 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

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

 app/src/main/res/drawable-xhdpi/ic_asset.png

 app/src/main/res/drawable-xhdpi/ic_certificate.png

 app/src/main/res/drawable-xhdpi/ic_cleaning.png

 app/src/main/res/drawable-xhdpi/ic_family_root_net.png

 app/src/main/res/drawable-xhdpi/ic_growth.png

 app/src/main/res/drawable-xhdpi/ic_health.png

 app/src/main/res/drawable-xhdpi/ic_home_devices.png

 app/src/main/res/drawable-xhdpi/ic_honor.png

 app/src/main/res/drawable-xhdpi/ic_income_expense.png

 app/src/main/res/drawable-xhdpi/ic_little_doctor.png

 app/src/main/res/drawable-xhdpi/ic_mail_list.png

 app/src/main/res/drawable-xhdpi/ic_marriage.png

 app/src/main/res/drawable-xhdpi/ic_notes.png

 app/src/main/res/drawable-xhdpi/ic_pet.png

 app/src/main/res/drawable-xhdpi/ic_privacy.png

 app/src/main/res/drawable-xhdpi/ic_property.png

 app/src/main/res/drawable-xhdpi/ic_tour.png

 app/src/main/res/drawable-xhdpi/ic_vector_gray.png

 app/src/main/res/drawable-xhdpi/ic_vector_pink.png

 app/src/main/res/drawable-xhdpi/ic_wish.png

 app/src/main/res/drawable-xxhdpi/ic_asset.png

 app/src/main/res/drawable-xxhdpi/ic_certificate.png

 app/src/main/res/drawable-xxhdpi/ic_cleaning.png

 app/src/main/res/drawable-xxhdpi/ic_family_root_net.png

 app/src/main/res/drawable-xxhdpi/ic_growth.png

 app/src/main/res/drawable-xxhdpi/ic_health.png

 app/src/main/res/drawable-xxhdpi/ic_home_devices.png

 app/src/main/res/drawable-xxhdpi/ic_honor.png

 app/src/main/res/drawable-xxhdpi/ic_income_expense.png

 app/src/main/res/drawable-xxhdpi/ic_little_doctor.png

 app/src/main/res/drawable-xxhdpi/ic_mail_list.png

 app/src/main/res/drawable-xxhdpi/ic_marriage.png

 app/src/main/res/drawable-xxhdpi/ic_notes.png

 app/src/main/res/drawable-xxhdpi/ic_pet.png

 app/src/main/res/drawable-xxhdpi/ic_privacy.png

 app/src/main/res/drawable-xxhdpi/ic_property.png

 app/src/main/res/drawable-xxhdpi/ic_tour.png

 app/src/main/res/drawable-xxhdpi/ic_vector_gray.png

 app/src/main/res/drawable-xxhdpi/ic_vector_pink.png

 app/src/main/res/drawable-xxhdpi/ic_wish.png

 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"

 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>

 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>

 app/src/main/res/layout/pop_operate_delete.xml

New file
@@ -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>