From 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e Mon Sep 17 00:00:00 2001 From: 张钢 <floatgang@163.com> Date: 星期一, 02 九月 2024 13:52:17 +0800 Subject: [PATCH] 对新接口进行了适配 --- app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java | 198 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 180 insertions(+), 18 deletions(-) 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 8c88527..21e7409 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 @@ -1,5 +1,6 @@ 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; @@ -8,19 +9,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.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.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.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,11 +18,25 @@ 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.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.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; @@ -43,6 +46,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 java.util.List; @@ -62,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() { @@ -118,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); + } + + + + + + + + + + + + + /** * 鍒犻櫎瀹跺ぇ浜嬭 */ @@ -125,6 +211,10 @@ public Observable<ResultData<String>> deleteFamilyMemorabilia(String ids) { return apiService.deleteFamilyMemorabilia(ids); } + + + + /** * 淇敼瀹跺ぇ浜嬭 @@ -134,6 +224,8 @@ return apiService.updateFamilyMemorabilia(familyMemorabiliaBean); } + + /** * 涓婁紶鏂囦欢 */ @@ -142,6 +234,33 @@ 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); + } + + + + + + + /** * 鑾峰彇瀹跺涵璧勪骇 */ @@ -149,6 +268,9 @@ public Observable<ResultData<PageResponseBean<FamilyAssetsBean>>> getFamilyAssets(Map<String, Object> paramsMap) { return apiService.getFamilyAssets(paramsMap); } + + + /** * 鑾峰彇瀹跺涵璁惧 @@ -446,6 +568,14 @@ } /** + * 鏍规嵁 id 鑾峰彇鏃呮父璐圭敤璁板綍 + */ + @Override + public Observable<ResultData<TourismBean>> getTourismById(String id) { + return apiService.getTourismById(id); + } + + /** * 鏂板鏃呮父璐圭敤璁板綍 */ @Override @@ -473,7 +603,7 @@ * 鑾峰彇鏃呮父缁忓巻 */ @Override - public Observable<ResultData<PageResponseBean<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) { + public Observable<ResultData<List<TourismExperienceBean>>> getTourismExperience(Map<String, Object> toMap) { return apiService.getTourismExperience(toMap); } @@ -547,8 +677,8 @@ * 鑾峰彇瀹舵牴缃� */ @Override - public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth) { - return apiService.getHomeRoot(depth); + public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth, String clanId) { + return apiService.getHomeRoot(depth, clanId); } /** @@ -702,4 +832,36 @@ 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); + } } -- Gitblit v1.9.1