对新接口进行了适配

张钢

2024-09-02 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e

 app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivityViewModel.java

@@ -16,6 +16,7 @@
import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.bean.FamilyAssetsBean;
import com.application.zhangshi_app_android.bean.FamilyAssetsRequestBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.data.DataRepository;

@@ -179,7 +180,6 @@
        if (list == null || list.isEmpty()){
            return;
        }
        System.out.println(dataListLiveData.getValue().size());
        if (type == 0) {
            // 从新到旧，null排最后
            list.sort((o1, o2) -> {
@@ -224,4 +224,23 @@
        dataListLiveData.postValue(list);
    }

    /**
     * 本家数据 置顶
     */
    public void ownTop(){
        List<FamilyAssetsBean> list = getDataListLiveData().getValue();
        if (list == null || list.isEmpty()){
            return;
        }
        //根据ownData值为1的 放到前面
        list.sort((o1, o2) -> {
            if (o1.getOwnData() == 1 && o2.getOwnData() == 0) {
                return -1;
            } else if (o1.getOwnData() == 0 && o2.getOwnData() == 1) {
                return 1;
            }
            return 0;
        });
        getDataListLiveData().setValue(list);
    }
}