代码优化

book/app/src/main/java/com/mints/enjoyboxjia/mvp/presenters/WatchRecordPresenter.kt

@@ -90,7 +90,7 @@ class WatchRecordPresenter : BasePresenter<WatchRecordView>() {
         vo["vedioId"] = videoId
         AppHttpManager.getInstance(loanApplication)
             .call(
-                loanService.cancelCollect(vo),
+                loanService.collectCancel(vo),
                 object : BaseSubscriber<BaseResponse<JsonObject>>() {
                     override fun onCompleted() {
                         if (isLinkView) return

book/app/src/main/java/com/mints/enjoyboxjia/net/LoanService.java

@@ -6,16 +6,9 @@ import com.google.gson.JsonObject;
 import com.mints.enjoyboxjia.BuildConfig;
 import com.mints.enjoyboxjia.mvp.model.BannerList;
 import com.mints.enjoyboxjia.mvp.model.BaseResponse;
-<<<<<<< Updated upstream
-import com.mints.enjoyboxjia.mvp.model.BookTypeBean;
 import com.mints.enjoyboxjia.mvp.model.HotBookTypeList;
-import com.mints.enjoyboxjia.mvp.model.HotStyleTypesList;
-=======
-import com.mints.enjoyboxjia.mvp.model.BookBean;
 import com.mints.enjoyboxjia.mvp.model.BookContentBean;
 import com.mints.enjoyboxjia.mvp.model.BookListBean;
-import com.mints.enjoyboxjia.mvp.model.HotStyleListBean;
->>>>>>> Stashed changes
 import com.mints.enjoyboxjia.mvp.model.OrderRecordBean;
 import com.mints.enjoyboxjia.mvp.model.UserBean;
 import com.mints.enjoyboxjia.mvp.model.Version;
@@ -152,43 +145,37 @@ public interface LoanService {
     Observable<BaseResponse<BannerList>> orders();
 
     /**
-<<<<<<< Updated upstream
      * 历史记录
      *
      * @return
      */
     @POST("api/vedioV1/history")
     Observable<BaseResponse<BannerList>> history();
-=======
+
+
+    /**
      * 收藏列表
      *
      * @return
      */
     @POST("api/book/collectList")
     Observable<BaseResponse<BookListBean>> collectList(@Body Map<String, Object> vo);
->>>>>>> Stashed changes
 
     /**
      * 收藏
      *
      * @return
      */
-<<<<<<< Updated upstream
-    @POST("api/vedioV1/collect")
-    Observable<BaseResponse<Object>> collect(@Body Map<String, Object> vo);
-=======
     @POST("api/book/collect")
     Observable<BaseResponse<JsonObject>> collect(@Body Map<String, Object> vo);
->>>>>>> Stashed changes
 
     /**
      * 取消收藏
      *
      * @return
      */
-<<<<<<< Updated upstream
-    @POST("api/vedioV1/cancelCollect")
-    Observable<BaseResponse<Object>> cancelCollect(@Body Map<String, Object> vo);
+    @POST("api/book/collectCancel")
+    Observable<BaseResponse<Object>> collectCancel(@Body Map<String, Object> vo);
 
     /**
      * 书库列表
@@ -206,11 +193,6 @@ public interface LoanService {
     @POST("api/book/categoryList")
     Observable<BaseResponse<HotBookTypeList>> getHomeV1Types();
 
-
-=======
-    @POST("api/book/collectCancel")
-    Observable<BaseResponse<JsonObject>> collectCancel(@Body Map<String, Object> vo);
-
     /**
      * 获取推荐书籍
      *
@@ -250,7 +232,6 @@ public interface LoanService {
      */
     @POST("api/book/articleList")
     Observable<BaseResponse<BookListBean>> getArticleList(@Body Map<String, Object> vo);
->>>>>>> Stashed changes
 
     /**
      * 默认http工厂