diff --git a/gradle.properties b/gradle.properties index ce66687926..f1019a93a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.3.1.20 +MOGO_MODULE_TANLU_VERSION=1.3.1.22 # 车聊聊 CARCHATTING_VERSION=1.4.8 # 车聊聊接口 @@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.3.1.21 +TANLULIB_VERSION=1.3.1.22 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT #左侧面板模块 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 6cb64a8f68..a8ea1aa714 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -13,10 +13,7 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpFragment; -import com.mogo.commons.network.SubscribeImpl; -import com.mogo.commons.network.Utils; import com.mogo.module.v2x.R; import com.mogo.module.v2x.adapter.V2XShareEventAdapter; import com.mogo.module.v2x.entity.panel.ShareEventDescription; @@ -24,29 +21,15 @@ import com.mogo.module.v2x.entity.panel.ShareEventItem; import com.mogo.module.v2x.entity.panel.ShareEventItemEnum; import com.mogo.module.v2x.entity.panel.ShareEventLoadMoreItem; import com.mogo.module.v2x.listener.AdapterCallback; -import com.mogo.module.v2x.network.EventApiService; -import com.mogo.module.v2x.network.HttpConstant; -import com.mogo.module.v2x.network.ShareEventParameter; -import com.mogo.module.v2x.network.V2XApiService; import com.mogo.module.v2x.network.V2XRefreshCallback; import com.mogo.module.v2x.network.V2XShareNetworkModel; import com.mogo.module.v2x.presenter.ShareEventsPresenter; import com.mogo.module.v2x.utils.animation.V2XAnimationManager; import com.mogo.module.v2x.utils.animation.AnimationResources; -import com.mogo.service.MogoServicePaths; -import com.mogo.service.network.IMogoNetwork; -import com.mogo.utils.network.RequestOptions; -import com.mogo.utils.network.utils.GsonUtil; -import com.mogo.utils.network.utils.Util; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; import java.util.concurrent.CountDownLatch; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - public class V2XShareEventsFragment extends MvpFragment implements AdapterCallback { private static final String TAG = "ShareEventsFragment"; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/EventApiService.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/EventApiService.java deleted file mode 100644 index 85777d4386..0000000000 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/EventApiService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.module.v2x.network; - - -import com.mogo.module.v2x.entity.panel.ShareEventDescription; -import com.mogo.module.v2x.entity.panel.ShareEventItem; -import com.mogo.module.v2x.entity.panel.SurroundingResponse; - -import java.util.Map; - -import io.reactivex.Observable; -import okhttp3.RequestBody; -import retrofit2.http.Body; -import retrofit2.http.FieldMap; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.Headers; -import retrofit2.http.POST; -import retrofit2.http.Query; - -public interface EventApiService { - - /* - * 周边列表 - * */ - @Headers({"Content-Type:application/json", "Accept:application/json"}) - @POST("/deva/car/poi/no/queryNovelty/v1") - Observable getSurroundingEventList(@Query("sn") String sn, @Body RequestBody jsonStr); -} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java index a45cd154c6..ccbcb14452 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java @@ -127,5 +127,13 @@ public interface V2XApiService { @POST("/deva/car/pathAndPoi/no/queryInfo") Observable getShareEventList(@FieldMap Map parames); + /* + * 周边列表 + * + * */ + @Headers({"Content-Type:application/json", "Accept:application/json"}) + @POST("/deva/car/poi/no/queryNovelty/v1") + Observable getSurroundingEventList(@Query("sn") String sn, @Body RequestBody jsonStr); + } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java index c77fa834ed..014bb2a3b0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java @@ -15,8 +15,8 @@ import com.mogo.map.location.MogoLocation; import com.mogo.module.v2x.entity.panel.Center; import com.mogo.module.v2x.entity.panel.SurroundingRequest; import com.mogo.module.v2x.entity.panel.SurroundingResponse; -import com.mogo.module.v2x.network.EventApiService; import com.mogo.module.v2x.network.HttpConstant; +import com.mogo.module.v2x.network.V2XApiService; import com.mogo.module.v2x.view.SurroundingEventView; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; @@ -38,7 +38,7 @@ public class SurroundingEventPresenter extends Presenter { private Context mContext; private IMogoNetwork mNetWork; private IMogoServiceApis mApis; - private EventApiService eventApiService; + private V2XApiService eventApiService; private static final String TAG = "SurroundingEvent"; @@ -48,7 +48,7 @@ public class SurroundingEventPresenter extends Presenter { mNetWork = ((IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(view.getContext())).getNetworkApi(); mApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(getContext()); - this.eventApiService = mNetWork.create(EventApiService.class, HttpConstant.Companion.getNetHost()); + this.eventApiService = mNetWork.create(V2XApiService.class, HttpConstant.Companion.getNetHost()); } @Override