对新接口进行了适配

张钢

2024-09-02 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e

 app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java

@@ -10,6 +10,7 @@
import com.application.zhangshi_app_android.bean.CertificateOfHonorBean;
import com.application.zhangshi_app_android.bean.CleanStorageBean;
import com.application.zhangshi_app_android.bean.ContactsDetailBean;
import com.application.zhangshi_app_android.bean.ExaminationInfoBean;
import com.application.zhangshi_app_android.bean.FamilyAssetsBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
@@ -29,12 +30,14 @@
import com.application.zhangshi_app_android.bean.HonorCollectionResponseBean;
import com.application.zhangshi_app_android.bean.HundredWishBean;
import com.application.zhangshi_app_android.bean.IncomeAndExpensesBean;
import com.application.zhangshi_app_android.bean.MarriageInfoBean;
import com.application.zhangshi_app_android.bean.MemoBean;
import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.bean.LittleDoctorBean;
import com.application.zhangshi_app_android.bean.LoginRequestBean;
import com.application.zhangshi_app_android.bean.LoginResponseBean;
import com.application.zhangshi_app_android.bean.MarriageInfoBean;
import com.application.zhangshi_app_android.bean.MeetingBean;
import com.application.zhangshi_app_android.bean.MeetingStaBean;
import com.application.zhangshi_app_android.bean.MemoBean;
import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.bean.PersonalNotepadBean;
import com.application.zhangshi_app_android.bean.PetBean;
import com.application.zhangshi_app_android.bean.PetMemoBean;
@@ -44,6 +47,8 @@
import com.application.zhangshi_app_android.bean.TourismExperienceBean;
import com.application.zhangshi_app_android.bean.UpdateVersionBean;
import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
import com.application.zhangshi_app_android.bean.WebbackBean;
import com.application.zhangshi_app_android.bean.WebcastBean;
import com.application.zhangshi_app_android.data.source.HttpDataSource;
import com.application.zhangshi_app_android.data.source.LocalDataSource;
import com.application.zhangshi_app_android.data.source.http.HttpDataSourceImpl;
@@ -52,9 +57,7 @@
import java.util.List;
import java.util.Map;

import io.reactivex.Completable;
import io.reactivex.Observable;
import io.reactivex.ObservableSource;
import okhttp3.MultipartBody;

/**
@@ -129,6 +132,86 @@
    public Observable<ResultData<String>> addFamilyMemorabilia(FamilyMemorabiliaBean familyMemorabiliaBean) {
        return mHttpDataSource.addFamilyMemorabilia(familyMemorabiliaBean);
    }



    /**
     * 获取家大事记
     */
    @Override
    public Observable<ResultData<PageResponseBean<MeetingStaBean>>> getMeetingSta(Map<String,Object> paramsMap) {
        return mHttpDataSource.getMeetingSta(paramsMap);
    }

    /**
     * 增加家大事记
     */
    @Override
    public Observable<ResultData<String>> addMeetingSta(MeetingStaBean meetingStaBean) {
        return mHttpDataSource.addMeetingSta(meetingStaBean);
    }

    /**
     * 删除家大事记
     */
    @Override
    public Observable<ResultData<String>> deleteMeetingSta(String ids) {
        return mHttpDataSource.deleteMeetingSta(ids);
    }

    /**
     *更新家大事记
     */
    @Override
    public Observable<ResultData<String>> updateMeetingSta(MeetingStaBean meetingStaBean) {
        return mHttpDataSource.updateMeetingSta(meetingStaBean);
    }



    @Override
    public Observable<ResultData<PageResponseBean<MeetingBean>>> getMeeting(Map<String,Object> paramsMap) {
        return mHttpDataSource.getMeeting(paramsMap);
    }
    /**
     * 增加家大事记
     */
    @Override
    public Observable<ResultData<String>> addMeeting(MeetingBean meetingBean) {
        return mHttpDataSource.addMeeting(meetingBean);
    }

    /**
     * 删除家大事记
     */
    @Override
    public Observable<ResultData<String>> deleteMeeting(String ids) {
        return mHttpDataSource.deleteMeeting(ids);
    }

    /**
     *更新家大事记
     */
    @Override
    public Observable<ResultData<String>> updateMeeting(MeetingBean meetingBean) {
        return mHttpDataSource.updateMeeting(meetingBean);
    }


    @Override
    public Observable<ResultData<String>> approveMeeting(Integer statu) {
        return mHttpDataSource.approveMeeting(statu);
    }










    /**
     * 删除家大事记
     */
@@ -136,13 +219,43 @@
    public Observable<ResultData<String>> deleteFamilyMemorabilia(String ids) {
        return mHttpDataSource.deleteFamilyMemorabilia(ids);
    }




//获取直播
    @Override
    public Observable<ResultData<PageResponseBean<WebcastBean>>> getWebcast(Map<String,Object> paramsMap) {
        return mHttpDataSource.getWebcast(paramsMap);
    }

    @Override
    public Observable<ResultData<String>> addWebcast(WebcastBean webcastBean) {
        return mHttpDataSource.addWebcast(webcastBean);
    }


    //获取直播回放
    @Override
    public  Observable<ResultData<PageResponseBean<WebbackBean>>> getWebback(Map<String,Object> paramsMap){
        return mHttpDataSource.getWebback(paramsMap);
    }






    /**
     * 删除家大事记
     *更新家大事记
     */
    @Override
    public Observable<ResultData<String>> updateFamilyMemorabilia(FamilyMemorabiliaBean familyMemorabiliaBean) {
        return mHttpDataSource.updateFamilyMemorabilia(familyMemorabiliaBean);
    }




    /**
     * 上传文件
@@ -157,6 +270,11 @@
    public Observable<ResultData<PageResponseBean<FamilyAssetsBean>>> getFamilyAssets(Map<String,Object> paramsMap) {
        return mHttpDataSource.getFamilyAssets(paramsMap);
    }






    /**
     * 获取家庭设备
@@ -416,6 +534,14 @@
    }

    /**
     * 根据 id 获取旅游消费记录
     */
    @Override
    public Observable<ResultData<TourismBean>> getTourismById(String id) {
        return mHttpDataSource.getTourismById(id);
    }

    /**
     * 新增旅游消费记录
     */
    @Override
@@ -442,7 +568,7 @@
    /**
     * 获取旅游经历
     */
    public Observable<ResultData<PageResponseBean<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) {
    public Observable<ResultData<List<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) {
        return mHttpDataSource.getTourismExperience(toMap);
    }

@@ -507,8 +633,8 @@
     *  获取家根网
     */
    @Override
    public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth) {
        return mHttpDataSource.getHomeRoot(depth);
    public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth, String clanid) {
        return mHttpDataSource.getHomeRoot(depth, clanid);
    }

    /**
@@ -648,6 +774,35 @@
        return mHttpDataSource.getUpdateVersion();
    }

    /**
     *  获取历年体检报告
     */
    public Observable<ResultData<PageResponseBean<ExaminationInfoBean>>> getExaminationInfo(Map<String, Object> toMap) {
        return mHttpDataSource.getExaminationInfo(toMap);
    }

    /**
     *  删除历年体检报告
     */
    public Observable<ResultData<String>> deleteExaminationInfo(String ids) {
        return mHttpDataSource.deleteExaminationInfo(ids);
    }

    /**
     *  修改历年体检报告
     */
    public Observable<ResultData<String>> updateExaminationInfo(ExaminationInfoBean examinationInfoBean) {
        return mHttpDataSource.updateExaminationInfo(examinationInfoBean);
    }

    /**
     *  添加历年体检报告
     */
    public Observable<ResultData<String>> addExaminationInfo(ExaminationInfoBean examinationInfoBean) {
        return mHttpDataSource.addExaminationInfo(examinationInfoBean);
    }



    /**
     * @see LocalDataSourceImpl