更改解决冲突

Guo_shaoshan

2023-04-04 d5d541f6bc23fd70875bbc706639b7e48d50468a

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

@@ -1,13 +1,32 @@
package com.application.zhangshi_app_android.data.source.http;

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 java.io.File;
import java.util.List;
import java.util.Map;

import io.reactivex.Observable;
import retrofit2.http.FieldMap;
import retrofit2.http.FormUrlEncoded;
import okhttp3.MultipartBody;
import retrofit2.http.Body;
import retrofit2.http.DELETE;
import retrofit2.http.GET;
import retrofit2.http.Multipart;
import retrofit2.http.POST;
import retrofit2.http.Url;
import retrofit2.http.PUT;
import retrofit2.http.Part;
import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.QueryMap;

/**
 * @author Ljj
@@ -15,6 +34,61 @@
 * @desc 网络请求 service
 */
public interface ApiService {
    @GET()
    Observable<String> getData(@Url String url);
    /**
     * 获取验证码图片
     */
    @GET("/captchaImage")
    Observable<ResultData<CaptchaImageBean>> getCaptchaImage();

    /**
     * 登录
     */
    @POST("/login")
    Observable<ResultData<LoginResponseBean>> login(@Body LoginRequestBean loginRequestBean);
    /**
     * 注册
     */
    @POST("/register")
    Observable<ResultData<String>> register(@Body LoginRequestBean loginRequestBean);

    /**
     * 获取家大事件
     */
    @GET("family/zfEvent/all")
    Observable<ResultData<FamilyMemorabiliaResponseBean>> getFamilyMemorabilia(@QueryMap Map<String,Object> paramsMap);
    /**
     * 增加家大事记
     */
    @POST("/family/zfEvent")
    Observable<ResultData<String>> addFamilyMemorabilia(@Body FamilyMemorabiliaBean familyMemorabiliaBean);
    /**
     * 删除家大事记
     */
    @DELETE("/family/zfEvent/{ids}")
    Observable<ResultData<String>> deleteFamilyMemorabilia(@Path("ids") String ids);
    /**
     * 修改家大事记
     */
    @PUT("/family/zfEvent")
    Observable<ResultData<String>> updateFamilyMemorabilia(@Body FamilyMemorabiliaBean familyMemorabiliaBean);


    /**
     * 上传文件
     */
    @Multipart
    @POST("/common/upload")
    Observable<ResultData<UploadFileResponseBean>> uploadFile(@Part MultipartBody.Part file);

    /**
     * 获取家庭资产
     */
    @GET("/family/property/all")
    Observable<ResultData<FamilyAssetsResponseBean>> getFamilyAssets(@QueryMap Map<String, Object> paramsMap);

    /**
     * 获取家庭设备
     */
    @GET("")//TODO 获取家庭设备
    Observable<ResultData<HomeDevicesResponseBean>> getHomeDevices(@QueryMap Map<String, Object> paramsMap);
}