diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 3af687459b..8ac0fd9188 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -9,7 +9,7 @@ import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.onlinecar.OnLineCarConstants; -import com.mogo.tanlu.constant.TanluConstants; +import com.mogo.module.tanlu.constant.TanluConstants; /** * @author congtaowang diff --git a/modules/mogo-module-tanlu/src/main/AndroidManifest.xml b/modules/mogo-module-tanlu/src/main/AndroidManifest.xml index ec531bc01c..a238192807 100644 --- a/modules/mogo-module-tanlu/src/main/AndroidManifest.xml +++ b/modules/mogo-module-tanlu/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mogo.module.tanlu"> > int id = view.getId(); if (id == R.id.tv_previous_res) { //上一个 //判断是图片还是视频,第一个时,上一个不可点击 - Logger.d(TAG, " tv_previous_res --1-> currentPosition =" + currentPosition); + Logger.d(TAG, " tv_previous_res --1-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); if (currentPosition < 0) { return; } currentPosition--; - Logger.d(TAG, " tv_previous_res --2-> currentPosition =" + currentPosition); - if (markerExploreWayList.size() > currentPosition) { + Logger.d(TAG, " tv_previous_res --2-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); + if (markerExploreWayList.size() > currentPosition && currentPosition >= 0) { handleData(markerExploreWayList.get(currentPosition)); } } else if (id == R.id.tv_next_res) { //下一个 //判断是图片还是视频,最后一个时,下一个不可点击 - Logger.d(TAG, " tv_next_res --1-> currentPosition =" + currentPosition); - if (currentPosition > markerExploreWayList.size()) { //TODO >= + Logger.d(TAG, " tv_next_res --1-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); + if (currentPosition > markerExploreWayList.size()) { return; } currentPosition++; - Logger.d(TAG, " tv_next_res --2-> currentPosition =" + currentPosition); + Logger.d(TAG, " tv_next_res --2-> currentPosition =" + currentPosition + ">> size= " + markerExploreWayList.size()); if (markerExploreWayList.size() > currentPosition) { handleData(markerExploreWayList.get(currentPosition)); } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewProvider.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewProvider.java similarity index 95% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewProvider.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewProvider.java index b804bd33e0..21f29c8c4d 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewProvider.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewProvider.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.fragment; +package com.mogo.module.tanlu.fragment; import android.content.Context; import android.os.Bundle; @@ -14,7 +14,7 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; -import com.mogo.tanlu.constant.TanluConstants; +import com.mogo.module.tanlu.constant.TanluConstants; import com.mogo.utils.logger.Logger; /** diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluServiceHandler.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceHandler.java similarity index 98% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluServiceHandler.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceHandler.java index 1128cd336b..c066dbb319 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluServiceHandler.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceHandler.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.fragment; +package com.mogo.module.tanlu.fragment; import android.content.Context; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/AMapUtil.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/AMapUtil.java similarity index 99% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/AMapUtil.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/AMapUtil.java index 45f188e363..427a20d0a8 100755 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/AMapUtil.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/AMapUtil.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.map; +package com.mogo.module.tanlu.map; import android.text.Html; import android.text.Spanned; @@ -10,7 +10,7 @@ import com.amap.api.services.route.BusPath; import com.amap.api.services.route.BusStep; import com.amap.api.services.route.RouteBusLineItem; import com.amap.api.services.route.RouteRailwayItem; -import com.mogo.tanlu.R; +import com.mogo.module.tanlu.R; import java.text.DecimalFormat; import java.text.SimpleDateFormat; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/ChString.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/ChString.java similarity index 97% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/ChString.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/ChString.java index 8a1b3bc67c..1f32432da7 100755 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/ChString.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/ChString.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.map; +package com.mogo.module.tanlu.map; public class ChString { public static final String Kilometer = "\u516c\u91cc";// "公里"; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/DrivingRouteOverlay.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/DrivingRouteOverlay.java similarity index 99% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/DrivingRouteOverlay.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/DrivingRouteOverlay.java index bb1fc2df84..8e95c5fde3 100755 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/DrivingRouteOverlay.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/DrivingRouteOverlay.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.map; +package com.mogo.module.tanlu.map; import android.content.Context; import android.graphics.Color; @@ -15,7 +15,7 @@ import com.amap.api.services.core.LatLonPoint; import com.amap.api.services.route.DrivePath; import com.amap.api.services.route.DriveStep; import com.amap.api.services.route.TMC; -import com.mogo.tanlu.R; +import com.mogo.module.tanlu.R; import java.util.ArrayList; import java.util.List; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/RouteOverlay.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/RouteOverlay.java similarity index 99% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/RouteOverlay.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/RouteOverlay.java index af1b169592..47a63582b5 100755 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/map/RouteOverlay.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/map/RouteOverlay.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.map; +package com.mogo.module.tanlu.map; import android.content.Context; import android.graphics.Bitmap; @@ -14,7 +14,7 @@ import com.amap.api.maps.model.Marker; import com.amap.api.maps.model.MarkerOptions; import com.amap.api.maps.model.Polyline; import com.amap.api.maps.model.PolylineOptions; -import com.mogo.tanlu.R; +import com.mogo.module.tanlu.R; import java.util.ArrayList; import java.util.List; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/CarsLive.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/CarsLive.kt new file mode 100644 index 0000000000..aeacd5025c --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/CarsLive.kt @@ -0,0 +1,17 @@ +package com.mogo.module.tanlu.model + +class CarsLive { + var sn: String + var lat: Double + var lon: Double + var direction: Int + var canLive: Int + + constructor(sn: String, lat: Double, lon: Double, direction: Int, canLive: Int) { + this.sn = sn + this.lat = lat + this.lon = lon + this.direction = direction + this.canLive = canLive + } +} \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Center.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Center.kt new file mode 100644 index 0000000000..b5c5a909c8 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Center.kt @@ -0,0 +1,12 @@ +package com.mogo.module.tanlu.model + +/** + * @description + * + * @author lixiaopeng + * @since 2019-10-24 + */ +data class Center ( + val lat: Double,//weidu + val lon: Double +) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Information.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Information.java similarity index 93% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Information.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Information.java index a65ca8b47f..5e196a1cd8 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Information.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Information.java @@ -1,8 +1,10 @@ -package com.mogo.tanlu.model; +package com.mogo.module.tanlu.model; import android.os.Parcel; import android.os.Parcelable; +import com.mogo.commons.data.BaseData; + import java.util.ArrayList; /** @@ -10,7 +12,7 @@ import java.util.ArrayList; * @description 列表数据 * @since 2020-01-05 */ -public class Information implements Parcelable { +public class Information extends BaseData implements Parcelable { private int type; private Double lon; private Double lat; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/InformationAndLiveCarResult.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/InformationAndLiveCarResult.kt new file mode 100644 index 0000000000..24bc41b302 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/InformationAndLiveCarResult.kt @@ -0,0 +1,18 @@ +package com.mogo.module.tanlu.model + +/** + * @author congtaowang + * @since 2019-11-20 + * + * 根据范围请求情报+在线车机结果 + */ +data class InformationAndLiveCarResult( + var onTheWayData: Result, + var infoMationResult: Result, + var snResult: Sns +) { + fun getInformation(): Result = if (onTheWayData == null + || onTheWayData.informations == null + || onTheWayData.informations.isEmpty() + ) infoMationResult else onTheWayData +} \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Items.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Items.kt similarity index 95% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Items.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Items.kt index d7f75dc33e..444c53b240 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Items.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Items.kt @@ -1,4 +1,4 @@ -package com.mogo.tanlu.model +package com.mogo.module.tanlu.model import android.os.Parcel import android.os.Parcelable diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/PathLineResult.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/PathLineResult.java new file mode 100644 index 0000000000..5c9ad18e34 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/PathLineResult.java @@ -0,0 +1,30 @@ +package com.mogo.module.tanlu.model; + +import com.mogo.commons.data.BaseData; +import java.util.List; + +/** + * @author lixiaopeng + * @description 通勤族划线 + * @since 2020-01-08 + */ +public class PathLineResult extends BaseData { + private List informations; + private List
pointList; + + public List getInformations() { + return informations; + } + + public void setInformations(List informations) { + this.informations = informations; + } + + public List
getPointList() { + return pointList; + } + + public void setPointList(List
pointList) { + this.pointList = pointList; + } +} diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Result.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Result.java new file mode 100644 index 0000000000..4c3f4aeabd --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Result.java @@ -0,0 +1,22 @@ +package com.mogo.module.tanlu.model; + +import com.mogo.commons.data.BaseData; + +import java.util.List; + +/** + * @author lixiaopeng + * @description + * @since 2020-01-08 + */ +public class Result extends BaseData { + public List informations; + + public List getInformations() { + return informations; + } + + public void setInformations(List informations) { + this.informations = informations; + } +} diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Sns.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Sns.kt new file mode 100644 index 0000000000..f075745c2b --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/Sns.kt @@ -0,0 +1,13 @@ +package com.mogo.module.tanlu.model + + +class Sns { + + var sns: List + var localUserId: String + + constructor(sns: List, localUserId: String) { + this.sns = sns + this.localUserId = localUserId + } +} \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/VoiceSearchResult.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/VoiceSearchResult.java new file mode 100644 index 0000000000..a4ed3c5f26 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/VoiceSearchResult.java @@ -0,0 +1,39 @@ +package com.mogo.module.tanlu.model; + +import com.mogo.commons.data.BaseData; +import java.util.List; + +/** + * @author lixiaopeng + * @description 声音控制接口 + * @since 2020-01-08 + */ +public class VoiceSearchResult extends BaseData { + private List informations; + private String description; + private Sns snResult; + + public List getInformations() { + return informations; + } + + public void setInformations(List informations) { + this.informations = informations; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Sns getSnResult() { + return snResult; + } + + public void setSnResult(Sns snResult) { + this.snResult = snResult; + } +} diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/event/MarkerInfo.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java similarity index 91% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/event/MarkerInfo.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java index 2676f0cd80..f5a6ba68a0 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/event/MarkerInfo.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.model.event; +package com.mogo.module.tanlu.model.event; import java.io.Serializable; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/event/VoiceRoadInfo.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/VoiceRoadInfo.java similarity index 88% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/event/VoiceRoadInfo.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/VoiceRoadInfo.java index c37f423836..8b93c1ca2e 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/event/VoiceRoadInfo.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/VoiceRoadInfo.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.model.event; +package com.mogo.module.tanlu.model.event; import java.io.Serializable; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/global/GlobalSharedInformation.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/global/GlobalSharedInformation.kt similarity index 74% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/global/GlobalSharedInformation.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/global/GlobalSharedInformation.kt index 31fe2a771b..280a81b536 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/global/GlobalSharedInformation.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/global/GlobalSharedInformation.kt @@ -1,6 +1,6 @@ -package com.mogo.tanlu.model.global +package com.mogo.module.tanlu.model.global -import com.mogo.tanlu.model.Information +import com.mogo.module.tanlu.model.Information import java.util.ArrayList /** diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/net/TanluApiService.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/net/TanluApiService.java new file mode 100644 index 0000000000..f2157fa456 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/net/TanluApiService.java @@ -0,0 +1,47 @@ +package com.mogo.module.tanlu.net; + +import com.mogo.module.tanlu.model.InformationAndLiveCarResult; +import com.mogo.module.tanlu.model.PathLineResult; +import com.mogo.module.tanlu.model.VoiceSearchResult; + +import java.util.Map; + +import io.reactivex.Observable; +import retrofit2.http.FieldMap; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; +import retrofit2.http.Query; + +/** + * @author lixiaopeng + * @description 探路相关接口定义 + * @since 2020-01-07 + */ +public interface TanluApiService { + + /** + * 探路沿途数据 + * + * @return + */ + @FormUrlEncoded + @POST("deva/car/path/no/getOnTheWayDataAndSn/v1") + Observable requestInformationAlongTheWay(@Query("sn") String sn, @FieldMap Map parameters); + + /** + * 获取上班族路线的坐标集 + */ + @FormUrlEncoded + @POST("yycp-travel-condition/travelDetail/info/no/commuter/v1") + Observable getRoadLineInfo(@FieldMap Map infoBody); + + + /** + * 基于地理信息词缀的空间情报检索 + */ + @FormUrlEncoded + @POST("deva/car/search/no/searchInforationByAddress/v1") + Observable searchOnLineInformation(@FieldMap Map infoBody); + + +} diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/receiver/MarkerInfoReceiver.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt similarity index 89% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/receiver/MarkerInfoReceiver.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt index 8ea58db2d3..bfcb102fb6 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/receiver/MarkerInfoReceiver.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt @@ -1,10 +1,10 @@ -package com.mogo.tanlu.receiver +package com.mogo.module.tanlu.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.util.Log -import com.mogo.tanlu.model.event.MarkerInfo +import com.mogo.module.tanlu.model.event.MarkerInfo import org.greenrobot.eventbus.EventBus /** diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/receiver/RoadInfoReceiver.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/RoadInfoReceiver.kt similarity index 78% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/receiver/RoadInfoReceiver.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/RoadInfoReceiver.kt index a10985e5ec..3899359ea2 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/receiver/RoadInfoReceiver.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/RoadInfoReceiver.kt @@ -1,14 +1,14 @@ -package com.mogo.tanlu.receiver +package com.mogo.module.tanlu.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.util.Log -import com.mogo.tanlu.model.event.VoiceRoadInfo +import com.mogo.module.tanlu.model.event.VoiceRoadInfo import org.greenrobot.eventbus.EventBus /** - * xx堵不堵,接收关键字 + * xx堵不堵,接收关键字,应该在哪里接收关键字请求接口? */ class RoadInfoReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/DoubleCheckUtil.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/DoubleCheckUtil.kt similarity index 94% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/DoubleCheckUtil.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/DoubleCheckUtil.kt index b0582d8da9..a3a1bf645e 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/DoubleCheckUtil.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/DoubleCheckUtil.kt @@ -1,5 +1,4 @@ -package com.mogo.tanlu.util - +package com.mogo.module.tanlu.util const val SPACE_TIME = 1000 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/HideControl.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/HideControl.kt similarity index 98% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/HideControl.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/HideControl.kt index 0307d5c53e..d11c954451 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/HideControl.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/HideControl.kt @@ -1,4 +1,4 @@ -package com.mogo.tanlu.util +package com.mogo.module.tanlu.util import android.os.Message import android.view.View diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/StringUitl.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/StringUitl.kt similarity index 95% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/StringUitl.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/StringUitl.kt index aee8d3240a..bc4ceace53 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/StringUitl.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/StringUitl.kt @@ -1,4 +1,4 @@ -package com.mogo.tanlu.util +package com.mogo.module.tanlu.util import android.text.format.DateFormat import java.text.DecimalFormat diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/Utils.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/Utils.java similarity index 93% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/Utils.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/Utils.java index 90165434f2..afb74a6fac 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/util/Utils.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/util/Utils.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.util; +package com.mogo.module.tanlu.util; import java.text.DecimalFormat; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/FullMediaActivity.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt similarity index 96% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/FullMediaActivity.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt index 76164cfe92..181f684f32 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/FullMediaActivity.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt @@ -1,14 +1,13 @@ -package com.mogo.tanlu.video +package com.mogo.module.tanlu.video import android.app.Activity import android.content.Intent import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity -import com.mogo.tanlu.R -import com.mogo.tanlu.model.Informations -import com.mogo.tanlu.util.HideControl -import com.mogo.tanlu.util.formatDate +import com.mogo.module.tanlu.R +import com.mogo.module.tanlu.util.HideControl +import com.mogo.module.tanlu.util.formatDate import com.mogo.utils.logger.Logger import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/MediaCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt similarity index 98% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/MediaCoverVideoPlayer.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt index c71fc8d361..a02fc9653c 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/MediaCoverVideoPlayer.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt @@ -1,4 +1,4 @@ -package com.mogo.tanlu.video +package com.mogo.module.tanlu.video import android.content.Context import android.util.AttributeSet @@ -6,7 +6,7 @@ import android.util.Log import android.view.View import android.widget.ImageView import com.bumptech.glide.Glide -import com.mogo.tanlu.R +import com.mogo.module.tanlu.R import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYVideoView diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/SimpleCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt similarity index 98% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/SimpleCoverVideoPlayer.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt index 7093db9c1c..8643ae7cfd 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt @@ -1,4 +1,4 @@ -package com.mogo.tanlu.video +package com.mogo.module.tanlu.video import android.content.Context import android.util.AttributeSet @@ -6,7 +6,7 @@ import android.view.Surface import android.view.View import android.widget.ImageView import com.bumptech.glide.Glide -import com.mogo.tanlu.R +import com.mogo.module.tanlu.R import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.utils.GSYVideoType import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/VideoInit.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/VideoInit.kt similarity index 96% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/VideoInit.kt rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/VideoInit.kt index 8d9ee59d98..6b98b7c203 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/video/VideoInit.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/VideoInit.kt @@ -1,4 +1,4 @@ -package com.mogo.tanlu.video +package com.mogo.module.tanlu.video import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.cache.CacheFactory diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/view/AutoZoomInImageView.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/AutoZoomInImageView.java similarity index 99% rename from modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/view/AutoZoomInImageView.java rename to modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/AutoZoomInImageView.java index 102d772568..20737ab449 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/view/AutoZoomInImageView.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/AutoZoomInImageView.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.view; +package com.mogo.module.tanlu.view; import com.mogo.service.imageloader.MogoImageView; diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Informations.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Informations.kt deleted file mode 100644 index 6793083965..0000000000 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Informations.kt +++ /dev/null @@ -1,67 +0,0 @@ -package com.mogo.tanlu.model - -import android.os.Parcel -import android.os.Parcelable -import com.amap.api.maps.model.LatLng - -fun Informations.toLatLng(): LatLng { - return LatLng(lat, lon) -} - -class Informations( - var type: Int, - var lon: Double, - var lat: Double, - var addr: String?, - var generateTime: Long, - var cityName: String?, -// var items: ArrayList, - var distance: Int, - var nickName: String?, - var headImgUrl: String? -) : - Parcelable { - - var position = 0 - - constructor(parcel: Parcel) : this( - parcel.readInt(), - parcel.readDouble(), - parcel.readDouble(), - parcel.readString(), - parcel.readLong(), - parcel.readString(), -// parcel.readArrayList(Items::class.java.classLoader) as ArrayList, - parcel.readInt(), - parcel.readString(), - parcel.readString() - ) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeInt(type) - parcel.writeDouble(lon) - parcel.writeDouble(lat) - parcel.writeString(addr) - parcel.writeLong(generateTime) - parcel.writeString(cityName) -// parcel.writeList(items) - parcel.writeInt(distance) - parcel.writeString(nickName) - parcel.writeString(headImgUrl) - } - - override fun describeContents(): Int { - return 0 - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): Informations { - return Informations(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } - -} diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/net/TanluApiService.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/net/TanluApiService.java deleted file mode 100644 index 1af02b5e43..0000000000 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/net/TanluApiService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.mogo.tanlu.net; - -import com.mogo.commons.data.BaseData; - -import java.util.Map; - -import io.reactivex.Observable; -import retrofit2.http.FieldMap; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.POST; -import retrofit2.http.QueryMap; - -/** - * @author lixiaopeng - * @description 探路相关接口定义 - * @since 2020-01-07 - */ -public interface TanluApiService { - - @FormUrlEncoded - @POST( "" ) - Observable refreshData(@QueryMap Map< String, Object > params, - @FieldMap Map< String, Object > parameters ); - -} diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml index a90d871523..995db5a607 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml @@ -8,7 +8,7 @@ tools:context=".video.FullMediaActivity"> - - - - - diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_photo_recycler.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_photo_recycler.xml index 5e12cbfff3..fe8427ad57 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_photo_recycler.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_photo_recycler.xml @@ -28,7 +28,7 @@ android:layout_marginBottom="14dp" android:textSize="20dp" /> -