提交代码

Linjiajia

2023-05-15 a0dc6be52293a64ebfe38b8c2391dc7d2ffe63ae

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

@@ -2,9 +2,10 @@

import com.android.app_base.http.ResultData;
import com.application.zhangshi_app_android.bean.CaptchaImageBean;
import com.application.zhangshi_app_android.bean.ContactsDetailBean;
import com.application.zhangshi_app_android.bean.ContactsResponseBean;
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;
@@ -12,13 +13,14 @@
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.GrowthExperienceResponseBean;
import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
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.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;

@@ -32,7 +34,6 @@
import retrofit2.http.PUT;
import retrofit2.http.Part;
import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.QueryMap;

/**
@@ -96,8 +97,27 @@
    /**
     * 获取家庭设备
     */
    @GET("")//TODO 获取家庭设备
    @GET("/zfEquipment/all")
    Observable<ResultData<HomeDevicesResponseBean>> getHomeDevices(@QueryMap Map<String, Object> paramsMap);

    /**
<<<<<<< HEAD
     * 获取家庭荣誉
     */
    @GET("/zfCollection/all")
    Observable<ResultData<HonorCollectionResponseBean>> getHonorCollections(@QueryMap Map<String, Object> paramsMap);

    /**
     * 获取小医生
     */
    @GET("/zfDoctor/all")
    Observable<ResultData<LittleDoctorResponseBean>> getLittleDoctors(@QueryMap Map<String, Object> map);

    /**
     * 获取收支
     */
    @GET("/zfEconomy/all")
    Observable<ResultData<IncomeAndExpensesResponseBean>> getIncomeAndExpenses(@QueryMap Map<String, Object> map);

    /**
     * 获取成长经历个人信息
@@ -134,4 +154,9 @@
    @GET("/zAutobiography/all")
    Observable<ResultData<List<GrowthExperienceAutobiographyBean>>> getGrowthExperienceAutobiography();

    /**
     * 获取通讯录
     */
    @GET("/zfContact/all")
    Observable<ResultData<ContactsResponseBean>> getContacts(@QueryMap Map<String, Object> paramsMap);
}