From 15cd434674051e5d29215b47862686c773625fd4 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 28 四月 2023 23:20:02 +0800
Subject: [PATCH] 代码提交

---
 app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java |   61 ++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 1 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 19950b0..b55f489 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
@@ -3,10 +3,16 @@
 import com.android.app_base.http.ResultData;
 import com.android.app_base.http.RetrofitManager;
 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.FamilyMemorabiliaBean;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaRequestBean;
 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.HonorCollectionResponseBean;
 import com.application.zhangshi_app_android.bean.IncomeAndExpensesResponseBean;
@@ -17,6 +23,7 @@
 import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
 import com.application.zhangshi_app_android.data.source.HttpDataSource;
 
+import java.util.List;
 import java.util.Map;
 
 import io.reactivex.Observable;
@@ -130,6 +137,7 @@
     }
 
     /**
+<<<<<<< HEAD
      * 鑾峰彇瀹跺涵鑽h獕
      */
     @Override
@@ -152,4 +160,55 @@
     public Observable<ResultData<IncomeAndExpensesResponseBean>> getIncomeAndExpenses(Map<String, Object> map) {
         return apiService.getIncomeAndExpenses(map);
     }
+
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻
+     */
+    @Override
+    public Observable<ResultData<List<GrowthExperienceBean>>> getGrowthExperience() {
+        return apiService.getGrowthExperience();
+    }
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻涓汉淇℃伅
+     */
+    @Override
+    public Observable<ResultData<GrowthExperienceInformationBean>> getGrowthExperienceInformation() {
+        return apiService.getGrowthExperienceInformation();
+    }
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻鍏崇郴鎯呭喌
+     */
+    @Override
+    public Observable<ResultData<List<GrowthExperienceRelationshipBean>>> getGrowthExperienceRelationship() {
+        return apiService.getGrowthExperienceRelationship();
+    }
+
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+     */
+    @Override
+    public Observable<ResultData<List<GrowthExperienceHolderConditionBean>>> getGrowthExperienceHolderCondition() {
+        return apiService.getGrowthExperienceHolderCondition();
+    }
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻鍑哄浗澧冩儏鍐�
+     */
+    @Override
+    public Observable<ResultData<List<GrowthExperienceAbroadConditionBean>>> getGrowthExperienceAbroadCondition() {
+        return apiService.getGrowthExperienceAbroadCondition();
+    }
+
+    /**
+     * 鑾峰彇鑷紶
+     */
+    @Override
+    public Observable<ResultData<List<GrowthExperienceAutobiographyBean>>> getGrowthExperienceAutobiography() {
+        return apiService.getGrowthExperienceAutobiography();
+    }
+
+    @Override
+    public Observable<ResultData<ContactsBean>> getFamilyContacts(Map<String, Object> paramsMap) {
+        return apiService.getFamilyContacts(paramsMap);
+    }
+
 }

--
Gitblit v1.9.1