对新接口进行了适配

张钢

2024-09-02 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e

 app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java

@@ -1,26 +1,53 @@
package com.application.zhangshi_app_android.data.source.http;

import com.android.app_base.base.BaseConfig;
import com.android.app_base.http.ResultData;
import com.android.app_base.http.RetrofitManager;
import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
import com.application.zhangshi_app_android.bean.BannerBean;
import com.application.zhangshi_app_android.bean.CaptchaImageBean;
import com.application.zhangshi_app_android.bean.ContactsBean;
import com.application.zhangshi_app_android.bean.FamilyAssetsResponseBean;
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.FamilyMemorabiliaResponseBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceAutobiographyBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
import com.application.zhangshi_app_android.bean.HealthCareBaseInfoBean;
import com.application.zhangshi_app_android.bean.HealthCareExistingProblemsBean;
import com.application.zhangshi_app_android.bean.HealthCareLifeHabitsBean;
import com.application.zhangshi_app_android.bean.HealthCareNotesContentBean;
import com.application.zhangshi_app_android.bean.HealthCareNursingExaminationBean;
import com.application.zhangshi_app_android.bean.HomeDevicesBean;
import com.application.zhangshi_app_android.bean.HomeMemberBean;
import com.application.zhangshi_app_android.bean.HomeRootBean;
import com.application.zhangshi_app_android.bean.HonorCollectionResponseBean;
import com.application.zhangshi_app_android.bean.IncomeAndExpensesResponseBean;
import com.application.zhangshi_app_android.bean.LittleDoctorResponseBean;
import com.application.zhangshi_app_android.bean.HundredWishBean;
import com.application.zhangshi_app_android.bean.IncomeAndExpensesBean;
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.android.app_base.base.BaseConfig;
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;
import com.application.zhangshi_app_android.bean.PrivacyBean;
import com.application.zhangshi_app_android.bean.PropertyBean;
import com.application.zhangshi_app_android.bean.TourismBean;
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 java.util.List;
@@ -40,7 +67,7 @@
    private volatile static HttpDataSourceImpl INSTANCE = null;

    private HttpDataSourceImpl() {
        this.apiService = RetrofitManager.getInstance().getRetrofit(BaseConfig.BASE_URL).create(ApiService.class);
        this.apiService = RetrofitManager.getInstance().getRetrofit(BaseConfig.BASE_URL_DOMAIN).create(ApiService.class);
    }

    public static HttpDataSourceImpl getInstance() {
@@ -86,7 +113,7 @@
     * 获取家大事记
     */
    @Override
    public Observable<ResultData<FamilyMemorabiliaResponseBean>> getFamilyMemorabilia(Map<String,Object> paramsMap) {
    public Observable<ResultData<PageResponseBean<FamilyMemorabiliaBean>>> getFamilyMemorabilia(Map<String,Object> paramsMap) {
        return apiService.getFamilyMemorabilia(paramsMap);
    }
    /**
@@ -96,6 +123,87 @@
    public Observable<ResultData<String>> addFamilyMemorabilia(FamilyMemorabiliaBean familyMemorabiliaBean) {
        return apiService.addFamilyMemorabilia(familyMemorabiliaBean);
    }




    @Override
    public Observable<ResultData<PageResponseBean<MeetingStaBean>>> getMeetingSta(Map<String,Object> paramsMap) {
        return apiService.getMeetingSta(paramsMap);
    }

    public Observable<ResultData<String >> addMeetingSta(MeetingStaBean meetingStaBean){
        return apiService.addMeetingSta(meetingStaBean);
    }


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

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


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

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




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













    /**
     * 删除家大事记
     */
@@ -103,6 +211,10 @@
    public Observable<ResultData<String>> deleteFamilyMemorabilia(String ids) {
        return apiService.deleteFamilyMemorabilia(ids);
    }





    /**
     * 修改家大事记
@@ -112,6 +224,8 @@
        return apiService.updateFamilyMemorabilia(familyMemorabiliaBean);
    }



    /**
     * 上传文件
     */
@@ -120,24 +234,74 @@
        return apiService.uploadFile(file);
    }


    /**
     * 获取直播
     */
    @Override
    public Observable<ResultData<PageResponseBean<WebcastBean>>> getWebcast(Map<String,Object> paramsMap) {
        return apiService.getWebcast(paramsMap);
    }
    /**
     * 增加直播申请
     */
    @Override
    public Observable<ResultData<String>> addWebcast(WebcastBean webcastBean) {
        return apiService.addWebcast(webcastBean);
    }

    @Override
    public Observable<ResultData<PageResponseBean<WebbackBean>>> getWebback(Map<String,Object> paramsMap){
        return apiService.getWebback(paramsMap);
    }







    /**
     * 获取家庭资产
     */
    @Override
    public Observable<ResultData<FamilyAssetsResponseBean>> getFamilyAssets(Map<String, Object> paramsMap) {
    public Observable<ResultData<PageResponseBean<FamilyAssetsBean>>> getFamilyAssets(Map<String, Object> paramsMap) {
        return apiService.getFamilyAssets(paramsMap);
    }




    /**
     * 获取家庭设备
     */
    @Override
    public Observable<ResultData<HomeDevicesResponseBean>> getHomeDevices(Map<String, Object> paramsMap) {
    public Observable<ResultData<PageResponseBean<HomeDevicesBean>>> getHomeDevices(Map<String, Object> paramsMap) {
        return apiService.getHomeDevices(paramsMap);
    }
    /**
     * 增加家庭设备
     */
    @Override
    public Observable<ResultData<String>> addHomeDevices(HomeDevicesBean homeDevicesBean) {
        return apiService.addHomeDevices(homeDevicesBean);
    }
    /**
     * 删除家庭设备
     */
    @Override
    public Observable<ResultData<String>> deleteHomeDevices(String ids) {
        return apiService.deleteHomeDevices(ids);
    }
    /**
     * 修改家庭设备
     */
    @Override
    public Observable<ResultData<String>> updateHomeDevices(HomeDevicesBean homeDevicesBean) {
        return apiService.updateHomeDevices(homeDevicesBean);
    }

    /**
<<<<<<< HEAD
     * 获取家庭荣誉
     */
    @Override
@@ -149,17 +313,61 @@
     * 获取小医生
     */
    @Override
    public Observable<ResultData<LittleDoctorResponseBean>> getLittleDoctors(Map<String, Object> map) {
    public Observable<ResultData<PageResponseBean<LittleDoctorBean>>> getLittleDoctors(Map<String, Object> map) {
        return apiService.getLittleDoctors(map);
    }
    /**
     * 增加小医生
     */
    @Override
    public Observable<ResultData<String>> addLittleDoctor(LittleDoctorBean littleDoctorBean) {
        return apiService.addLittleDoctor(littleDoctorBean);
    }
    /**
     * 删除小医生
     */
    @Override
    public Observable<ResultData<String>> deleteLittleDoctors(String ids) {
        return apiService.deleteLittleDoctors(ids);
    }
    /**
     * 修改小医生
     */
    @Override
    public Observable<ResultData<String>> updateLittleDoctor(LittleDoctorBean littleDoctorBean) {
        return apiService.updateLittleDoctor(littleDoctorBean);
    }

    /**
     * 获取收支
     */
    @Override
    public Observable<ResultData<IncomeAndExpensesResponseBean>> getIncomeAndExpenses(Map<String, Object> map) {
    public Observable<ResultData<PageResponseBean<IncomeAndExpensesBean>>> getIncomeAndExpenses(Map<String, Object> map) {
        return apiService.getIncomeAndExpenses(map);
    }

    /**
     * 增加收支
     */
    @Override
    public Observable<ResultData<String>> addIncomeAndExpenses(IncomeAndExpensesBean incomeAndExpensesBean) {
        return apiService.addIncomeAndExpenses(incomeAndExpensesBean);
    }
    /**
     * 删除收支
     */
    @Override
    public Observable<ResultData<String>> deleteIncomeAndExpenses(String ids) {
        return apiService.deleteIncomeAndExpenses(ids);
    }
    /**
     * 修改收支
     */
    @Override
    public Observable<ResultData<String>> updateIncomeAndExpenses(IncomeAndExpensesBean incomeAndExpensesBean) {
        return apiService.updateIncomeAndExpenses(incomeAndExpensesBean);
    }


    /**
     * 获取成长经历
@@ -175,6 +383,17 @@
    public Observable<ResultData<GrowthExperienceInformationBean>> getGrowthExperienceInformation() {
        return apiService.getGrowthExperienceInformation();
    }

    /**
     *  修改个人信息
     */
    @Override
    public Observable<ResultData<String>> updateGrowthExperienceInformation(GrowthExperienceInformationBean growthExperienceInformationBean) {
        return apiService.updateGrowthExperienceInformation(growthExperienceInformationBean);
    }



    /**
     * 获取成长经历关系情况
     */
@@ -206,9 +425,443 @@
        return apiService.getGrowthExperienceAutobiography();
    }

    /**
     *  获取通讯录
     */
    @Override
    public Observable<ResultData<ContactsBean>> getFamilyContacts(Map<String, Object> paramsMap) {
        return apiService.getFamilyContacts(paramsMap);
    public Observable<ResultData<PageResponseBean<ContactsDetailBean>>> getContacts(Map<String, Object> paramsMap) {
        return apiService.getContacts(paramsMap);
    }

    @Override
    public Observable<ResultData<String>> addContacts(ContactsDetailBean contactsDetailBean) {
        return apiService.addContacts(contactsDetailBean);
    }

    /**
     *  获取保洁收纳
     */
    @Override
    public Observable<ResultData<PageResponseBean<CleanStorageBean>>> getCleanStorages(Map<String, Object> map) {
        return apiService.getCleanStorages(map);
    }

    /**
     *  增加保洁收纳
     */
    @Override
    public Observable<ResultData<String>> addCleanStorage(CleanStorageBean cleanStorageBean) {
        return apiService.addCleanStorage(cleanStorageBean);
    }

    /**
     *  删除保洁收纳
     */
    @Override
    public Observable<ResultData<String>> deleteCleanStorages(String ids) {
        return apiService.deleteCleanStorages(ids);
    }

    /**
     *  修改保洁收纳
     */
    @Override
    public Observable<ResultData<String>> updateCleanStorage(CleanStorageBean cleanStorageBean) {
        return apiService.updateCleanStorage(cleanStorageBean);
    }

    /**
     *  获取个人婚姻信息
     */
    @Override
    public Observable<ResultData<MarriageInfoBean>> getMarriageInfo() {
        return apiService.getMarriageInfo();
    }

    /**
     *  获取个人记事本
     */
    @Override
    public Observable<ResultData<PageResponseBean<PersonalNotepadBean>>> getPersonalNotepad(Map<String, Object> toMap) {
        return apiService.getPersonalNotepad(toMap);
    }

    /**
     *  增加个人记事本
     */
    @Override
    public Observable<ResultData<String>> addPersonalNotepad(PersonalNotepadBean personalNotepadBean) {
        return apiService.addPersonalNotepad(personalNotepadBean);
    }

    /**
     *  删除个人记事本
     */
    @Override
    public Observable<ResultData<String>> deletePersonalNotepad(String ids) {
        return apiService.deletePersonalNotepad(ids);
    }

    /**
     *  修改个人记事本
     */
    @Override
    public Observable<ResultData<String>> updatePersonalNotepad(PersonalNotepadBean personalNotepadBean) {
        return apiService.updatePersonalNotepad(personalNotepadBean);
    }

    /**
     *  获取个人隐私
     */
    @Override
    public Observable<ResultData<PageResponseBean<PrivacyBean>>> getPrivacy(Map<String, Object> toMap) {
        return apiService.getPrivacy(toMap);
    }

    /**
     *  获取荣誉证书
     */
    @Override
    public Observable<ResultData<PageResponseBean<CertificateOfHonorBean>>> getCertificateOfHonor(Map<String, Object> toMap) {
        return apiService.getCertificateOfHonor(toMap);
    }

    /**
     *  获取个人财产
     */
    @Override
    public Observable<ResultData<PageResponseBean<PropertyBean>>> getProperty(Map<String, Object> toMap) {
        return apiService.getProperty(toMap);
    }

    /**
     *  获取百年心愿
     */
    @Override
    public Observable<ResultData<PageResponseBean<HundredWishBean>>> getHundredWish(Map<String, Object> toMap) {
        return apiService.getHundredWish(toMap);
    }

    /**
     *  获取宠物
     */
    @Override
    public Observable<ResultData<PageResponseBean<PetBean>>> getPets(Map<String, Object> toMap) {
        return apiService.getPets(toMap);
    }


    /**
     *  获取宠物备忘录
     */
    @Override
    public Observable<ResultData<PageResponseBean<PetMemoBean>>> getPetMemo(Map<String, Object> toMap) {
        return apiService.getPetMemo(toMap);
    }

    /**
     *  获取旅游费用记录
     */
    @Override
    public Observable<ResultData<PageResponseBean<TourismBean>>> getTourism(Map<String, Object> toMap) {
        return apiService.getTourism(toMap);
    }

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

    /**
     *  新增旅游费用记录
     */
    @Override
    public Observable<ResultData<String>> addTourism(TourismBean tourismBean) {
        return apiService.addTourism(tourismBean);
    }

    /**
     *  删除旅游费用记录
     */
    @Override
    public Observable<ResultData<String>> deleteTourism(String ids) {
        return apiService.deleteTourism(ids);
    }

    /**
     *  修改旅游费用记录
     */
    @Override
    public Observable<ResultData<String>> updateTourism(TourismBean tourismBean) {
        return apiService.updateTourism(tourismBean);
    }

    /**
     * 获取旅游经历
     */
    @Override
    public Observable<ResultData<List<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) {
        return apiService.getTourismExperience(toMap);
    }

    /**
     *  新增旅游经历
     */
    @Override
    public Observable<ResultData<String>> addTourismExperience(TourismExperienceBean tourismExperienceBean) {
        return apiService.addTourismExperience(tourismExperienceBean);
    }

    /**
     *  删除旅游经历
     */
    @Override
    public Observable<ResultData<String>> deleteTourismExperience(String ids) {
        return apiService.deleteTourismExperience(ids);
    }

    /**
     *  修改旅游经历
     */
    @Override
    public Observable<ResultData<String>> updateTourismExperience(TourismExperienceBean tourismExperienceBean) {
        return apiService.updateTourismExperience(tourismExperienceBean);
    }

    /**
     * 获取备忘录
     */
    @Override
    public Observable<ResultData<List<MemoBean>>> getMemos(String fid, String cid) {
        return apiService.getMemos(fid, cid);
    }

    /**
     *  新增备忘录
     */
    @Override
    public Observable<ResultData<String>> addMemo(MemoBean memoBean) {
        return apiService.addMemo(memoBean);
    }

    /**
     *  删除备忘录
     */
    @Override
    public Observable<ResultData<String>> deleteMemo(String ids) {
        return apiService.deleteMemo(ids);
    }

    /**
     *  修改备忘录
     */
    @Override
    public Observable<ResultData<String>> updateMemo(MemoBean memoBean) {
        return apiService.updateMemo(memoBean);
    }



    /**
     *  获取家谱
     */
    @Override
    public Observable<ResultData<PageResponseBean<HomeMemberBean>>> getHomeMembers(Map<String, Object> toMap) {
        return apiService.getHomeMembers(toMap);
    }

    /**
     *  获取家根网
     */
    @Override
    public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth, String clanId) {
        return apiService.getHomeRoot(depth, clanId);
    }

    /**
     *  获取年度健康状况
     */
    @Override
    public Observable<ResultData<PageResponseBean<AnnualHealthStatusBean>>> getAnnualHealthStatus(Map<String, Object> toMap) {
        return apiService.getAnnualHealthStatus(toMap);
    }

    /**
     *  新增年度健康状况
     */
    @Override
    public Observable<ResultData<String>> addAnnualHealthStatus(AnnualHealthStatusBean annualHealthStatusBean) {
        return apiService.addAnnualHealthStatus(annualHealthStatusBean);
    }

    /**
     *  删除年度健康状况
     */
    @Override
    public Observable<ResultData<String>> deleteAnnualHealthStatus(String ids) {
        return apiService.deleteAnnualHealthStatus(ids);
    }

    /**
     *  修改年度健康状况
     */
    @Override
    public Observable<ResultData<String>> updateAnnualHealthStatus(AnnualHealthStatusBean annualHealthStatusBean) {
        return apiService.updateAnnualHealthStatus(annualHealthStatusBean);
    }

    /**
     *  获取轮播图数据
     */
    @Override
    public Observable<ResultData<List<BannerBean>>> getBannerData() {
        return apiService.getBannerData();
    }

    /**
     *  新增轮播图数据
     */
    @Override
    public Observable<ResultData<String>> addBannerData(BannerBean bannerBean) {
        return apiService.addBannerData(bannerBean);
    }

    /**
     *  删除轮播图数据
     */
    @Override
    public Observable<ResultData<String>> deleteBannerData(String ids) {
        return apiService.deleteBannerData(ids);
    }

    /**
     *  修改轮播图数据
     */
    @Override
    public Observable<ResultData<String>> updateBannerData(BannerBean bannerBean) {
        return apiService.updateBannerData(bannerBean);
    }

    /**
     *  获取健康保健基本信息
     */
    @Override
    public Observable<ResultData<HealthCareBaseInfoBean>> getHealthCareBaseInfo() {
        return apiService.getHealthCareBaseInfo();
    }

    /**
     *  修改健康保健基本信息
     */
    @Override
    public Observable<ResultData<String>> updateHealthCareBaseInfo(HealthCareBaseInfoBean healthCareBaseInfoBean) {
        return apiService.updateHealthCareBaseInfo(healthCareBaseInfoBean);
    }

    /**
     *  获取健康保健生活习惯
     */
    @Override
    public Observable<ResultData<HealthCareLifeHabitsBean>> getHealthCareLifeHabits() {
        return apiService.getHealthCareLifeHabits();
    }

    /**
     *  修改健康保健生活习惯
     */
    @Override
    public Observable<ResultData<String>> updateHealthCareLifeHabits(HealthCareLifeHabitsBean healthCareLifeHabitsBean) {
        return apiService.updateHealthCareLifeHabits(healthCareLifeHabitsBean);
    }

    /**
     *  获取健康保健护理查体
     */
    @Override
    public Observable<ResultData<HealthCareNursingExaminationBean>> getHealthCareNursingExamination() {
        return apiService.getHealthCareNursingExamination();
    }

    /**
     *  修改健康保健护理查体
     */
    @Override
    public Observable<ResultData<String>> updateHealthCareNursingExamination(HealthCareNursingExaminationBean healthCareNursingExaminationBean) {
        return apiService.updateHealthCareNursingExamination(healthCareNursingExaminationBean);
    }

    /**
     *  获取健康保健现存健康问题
     */
    @Override
    public Observable<ResultData<HealthCareExistingProblemsBean>> getHealthCareExistingProblems() {
        return apiService.getHealthCareExistingProblems();
    }

    /**
     *  修改健康保健现存健康问题
     */
    @Override
    public Observable<ResultData<String>> updateHealthCareExistingProblems(HealthCareExistingProblemsBean healthCareExistingProblemsBean) {
        return apiService.updateHealthCareExistingProblems(healthCareExistingProblemsBean);
    }

    /**
     *  获取健康保健笔记内容
     */
    @Override
    public Observable<ResultData<HealthCareNotesContentBean>> getHealthCareNotesContent() {
        return apiService.getHealthCareNotesContent();
    }

    /**
     *  修改健康保健笔记内容
     */
    @Override
    public Observable<ResultData<String>> updateHealthCareNotesContent(HealthCareNotesContentBean healthCareNotesContentBean) {
        return apiService.updateHealthCareNotesContent(healthCareNotesContentBean);
    }

    /**
     *  获取版本更新
     */
    @Override
    public Observable<ResultData<UpdateVersionBean>> getUpdateVersion() {
        return apiService.getUpdateVersion();
    }

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

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

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

    /**
     *  新增历年体检报告
     */
    @Override
    public Observable<ResultData<String>> addExaminationInfo(ExaminationInfoBean examinationInfoBean) {
        return apiService.addExaminationInfo(examinationInfoBean);
    }
}