From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/http/Apis.java |   94 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/http/Apis.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/http/Apis.java
index 13fb54f..f1cb425 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/http/Apis.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/http/Apis.java
@@ -2,57 +2,113 @@
 
 
 import com.doumee.keyCabinet.bean.AndroidVersionBean;
+import com.doumee.keyCabinet.bean.CabinetDetailBean;
+import com.doumee.keyCabinet.bean.CabinetFaceBean;
 import com.doumee.keyCabinet.bean.DevConfigBean;
 import com.doumee.keyCabinet.bean.FaceUserBean;
-import com.doumee.keyCabinet.bean.GetBillListBean;
-import com.doumee.keyCabinet.bean.OrderGetPriceBean;
-import com.doumee.keyCabinet.bean.RecyclerBraceletBean;
+import com.doumee.keyCabinet.bean.KeyCabinetBean;
 import com.doumee.keyCabinet.http.param.BaseResponse;
-import com.doumee.keyCabinet.http.param.PayResponseBean;
+
+import java.util.List;
 
 import io.reactivex.Observable;
 import okhttp3.RequestBody;
 import retrofit2.Response;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
 
 public interface Apis {
-    //String HTTP = "http://47.97.231.28:8068/zhcg-interface4/";
     String HTTP = "http://192.168.0.112:8086/";
-    //String HTTP = "https://mytj.dmtt.run/zhcg-interface2/";
-    //String HTTP = "https://dmtt.doumee.com/zhcg-interface/";
-    //String HTTP = "https://dmtt.doumee.com/saaszhcg-interface/";
-    //String HTTP = "https://swimticket.sx.net.cn/zhcg-interface/";
     String HEAT_HTTP = "do?c=220301";
     /**
      * 鏌ヨ鐗堟湰淇℃伅
      */
-    @POST("do?c=330115")
-    Observable<BaseResponse<AndroidVersionBean>> getVersion(@Header("language") String language,@Header("Cookie") String cookie, @Header("shopId") String shopId, @Header("gymId") String gymId, @Body RequestBody requestBody);
+    @GET("/visitsAdmin/cloudService/web/cabinet/getLastVersion")
+    Observable<BaseResponse<AndroidVersionBean>> getVersion();
 
     /**
-     *璁惧鐧诲綍
+     * 鑾峰彇閽ュ寵鏌滃熀鏈俊鎭�
+     * @param code
+     * @return
      */
-    @POST("do?c=220300")
-    Observable<Response<BaseResponse<DevConfigBean>>> devLogin(@Header("isCheckShop") int isCheckShop,@Body RequestBody requestBody);
+    @GET("/visitsAdmin/cloudService/web/cabinet/getCabinetInfoForDriver")
+    Observable<BaseResponse<DevConfigBean>> getCabinetInfoForDriver(@Query("code")String code);
 
     /**
      * 蹇冭烦
      */
-    @POST("do?c=220301")
-    Observable<BaseResponse<DevConfigBean>> heart(@Header("language") String language,@Header("Cookie") String cookie, @Header("shopId") String shopId, @Header("gymId") String gymId,@Body RequestBody requestBody);
+    @GET("/visitsAdmin/cloudService/web/cabinet/updateRunStatusById")
+    Observable<BaseResponse> heart(@Query("id")Integer id);
 
     /**
      * 涓婁紶鎶ラ敊淇℃伅
      */
     @POST("do?c=360313")
-    Observable<BaseResponse> upErrInfo(@Header("language") String language,@Header("Cookie") String cookie, @Header("shopId") String shopId, @Header("gymId") String gymId, @Body RequestBody requestBody);
+    Observable<BaseResponse> upErrInfo(@Body RequestBody requestBody);
 
     /**
      * 浜鸿劯鍒楄〃
      */
-    @POST("do?c=360311")
-    Observable<BaseResponse<FaceUserBean>> allFaceList(@Header("language") String language, @Header("Cookie") String cookie, @Header("shopId") String shopId, @Header("gymId") String gymId, @Body RequestBody requestBody);
+    @POST("/visitsAdmin/cloudService/web/cabinet/getCabinetFaceVO")
+    Observable<BaseResponse<CabinetFaceBean>> allFaceList(@Body RequestBody requestBody);
+
+     /**
+     * 鑾峰彇鍙搷浣滄煖鏍� - 鍙告満
+     */
+    @POST("/visitsAdmin/cloudService/web/cabinet/getMemberIdByCode")
+    Observable<BaseResponse<Integer>> getMemberIdByCode(@Body RequestBody requestBody);
+
+    /**
+     * 鑾峰彇鍙搷浣滄煖鏍� - 鍙告満
+     */
+    @POST("/visitsAdmin/cloudService/web/cabinet/getDriverGrid")
+    Observable<BaseResponse<List<KeyCabinetBean>>> getDriverGrid(@Body RequestBody requestBody);
+
+    /**
+     * 寮�鍚煖鏍� - 鍙告満
+     */
+    @POST("/visitsAdmin/cloudService/web/cabinet/openGridDriver")
+    Observable<BaseResponse> openGridDriver(@Body RequestBody requestBody);
+
+    /**
+     * 鍏抽棴鏌滄牸 - 鍙告満
+     */
+    @POST("/visitsAdmin/cloudService/web/cabinet/closeGrid")
+    Observable<BaseResponse> closeGrid(@Body RequestBody requestBody);
+
+    /**
+     * 鑾峰彇閽ュ寵鏌滆鎯� - 绠$悊鍛�
+     */
+    @GET("/visitsAdmin/cloudService/web/cabinet/getCabinetDetail")
+    Observable<BaseResponse<List<CabinetDetailBean>>> getCabinetDetail(@Header("dm_user_token") String token,@Query("cabinetId")Integer cabinetId);
+
+    /**
+     * 鎵归噺寮�闂� - 绠$悊鍛�
+     */
+    @POST("/visitsAdmin/cloudService/web/cabinet/batchOpenGridAdmin")
+    Observable<BaseResponse> batchOpenGridAdmin(@Header("dm_user_token") String token,@Body RequestBody requestBody);
+
+    /**
+     * 鏍囪鏌滄牸姝e父 - 绠$悊鍛�
+     */
+    @POST("/visitsAdmin/cloudService/web/cabinet/cancelFault")
+    Observable<BaseResponse> cancelFault(@Header("dm_user_token") String token,@Body RequestBody requestBody);
+
+    /**
+     * 鏍囪鏌滄牸鏁呴殰 - 绠$悊鍛�
+     */
+    @POST("/visitsAdmin/cloudService/web/cabinet/markFault")
+    Observable<BaseResponse> markFault(@Header("dm_user_token") String token,@Body RequestBody requestBody);
+
+    /**
+     * 鏍囪缁翠慨淇濆吇 - 绠$悊鍛�
+     */
+    @POST("/visitsAdmin/cloudService/web/cabinet/markRepair")
+    Observable<BaseResponse> markRepair(@Header("dm_user_token") String token,@Body RequestBody requestBody);
+
 
 }
+

--
Gitblit v1.9.3