From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java b/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
index e78ebea..cff6cf6 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
@@ -5,21 +5,29 @@
import com.android.app_base.base.model.BaseModel;
import com.android.app_base.http.ResultData;
import com.application.zhangshi_app_android.bean.CaptchaImageBean;
+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.HomeDevicesResponseBean;
import com.application.zhangshi_app_android.bean.LoginRequestBean;
import com.application.zhangshi_app_android.bean.LoginResponseBean;
+import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
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;
import com.application.zhangshi_app_android.data.source.local.LocalDataSourceImpl;
+import java.io.File;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.DoubleUnaryOperator;
+import io.reactivex.Completable;
import io.reactivex.Observable;
import io.reactivex.Observer;
+import okhttp3.MultipartBody;
/**
* @author Ljj
@@ -83,8 +91,8 @@
* 鑾峰彇瀹跺ぇ浜嬭
*/
@Override
- public Observable<ResultData<FamilyMemorabiliaResponseBean>> getFamilyMemorabilia(Map<String, Object> queryMap) {
- return mHttpDataSource.getFamilyMemorabilia(queryMap);
+ public Observable<ResultData<FamilyMemorabiliaResponseBean>> getFamilyMemorabilia(Map<String,Object> paramsMap) {
+ return mHttpDataSource.getFamilyMemorabilia(paramsMap);
}
/**
* 澧炲姞瀹跺ぇ浜嬭
@@ -109,6 +117,27 @@
}
/**
+ * 涓婁紶鏂囦欢
+ */
+ public Observable<ResultData<UploadFileResponseBean>> uploadFile(MultipartBody.Part file) {
+ return mHttpDataSource.uploadFile(file);
+ }
+
+ /**
+ * 鑾峰彇瀹跺涵璧勪骇
+ */
+ public Observable<ResultData<FamilyAssetsResponseBean>> getFamilyAssets(Map<String,Object> paramsMap) {
+ return mHttpDataSource.getFamilyAssets(paramsMap);
+ }
+
+ /**
+ * 鑾峰彇瀹跺涵璁惧
+ */
+ public Observable<ResultData<HomeDevicesResponseBean>> getHomeDevices(Map<String, Object> paramsMap) {
+ return mHttpDataSource.getHomeDevices(paramsMap);
+ }
+
+ /**
* @see LocalDataSourceImpl
*/
}
--
Gitblit v1.9.1