fix conflict

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

modules/mogo-module-tanlu/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.tanlu">
+    package="com.mogo.module.tanlu">
 
     <application>
         <activity

modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/Const.kt

@@ -1,4 +1,4 @@
-package com.mogo.tanlu.constant
+package com.mogo.module.tanlu.constant
 
 const val REQUESTCODE_MAINACTIVITY = 0
 const val REQUESTCODE_MEDIAACTIVITY = 1

modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java

@@ -1,4 +1,4 @@
-package com.mogo.tanlu.constant;
+package com.mogo.module.tanlu.constant;
 
 /**
  * @author congtaowang

modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java

@@ -1,4 +1,4 @@
-package com.mogo.tanlu.fragment;
+package com.mogo.module.tanlu.fragment;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -35,12 +35,12 @@ import com.mogo.service.imageloader.IMogoImageLoaderListener;
 import com.mogo.service.imageloader.IMogoImageloader;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.module.IMogoModuleLifecycle;
-import com.mogo.tanlu.R;
-import com.mogo.tanlu.model.event.MarkerInfo;
-import com.mogo.tanlu.util.Utils;
-import com.mogo.tanlu.video.FullMediaActivity;
-import com.mogo.tanlu.video.SimpleCoverVideoPlayer;
-import com.mogo.tanlu.view.AutoZoomInImageView;
+import com.mogo.module.tanlu.R;
+import com.mogo.module.tanlu.model.event.MarkerInfo;
+import com.mogo.module.tanlu.util.Utils;
+import com.mogo.module.tanlu.video.FullMediaActivity;
+import com.mogo.module.tanlu.video.SimpleCoverVideoPlayer;
+import com.mogo.module.tanlu.view.AutoZoomInImageView;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
@@ -52,9 +52,9 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.mogo.tanlu.util.StringUitlKt.formatDate;
-import static com.mogo.tanlu.util.Utils.handleDistance;
-import static com.mogo.tanlu.video.VideoInitKt.initVideo;
+import static com.mogo.module.tanlu.util.StringUitlKt.formatDate;
+import static com.mogo.module.tanlu.util.Utils.handleDistance;
+import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
 
 /**
  * @author lixiaopeng
@@ -157,23 +157,23 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
         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));
             }

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;
 
 /**

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;
 

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;

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";// "公里";

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;

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;

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
+    }
+}

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
+)

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;

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
+}

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

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<Information> informations;
+    private List<Center> pointList;
+
+    public List<Information> getInformations() {
+        return informations;
+    }
+
+    public void setInformations(List<Information> informations) {
+        this.informations = informations;
+    }
+
+    public List<Center> getPointList() {
+        return pointList;
+    }
+
+    public void setPointList(List<Center> pointList) {
+        this.pointList = pointList;
+    }
+}

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<Information> informations;
+
+    public List<Information> getInformations() {
+        return informations;
+    }
+
+    public void setInformations(List<Information> informations) {
+        this.informations = informations;
+    }
+}

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<CarsLive>
+    var localUserId: String
+
+    constructor(sns: List<CarsLive>, localUserId: String) {
+        this.sns = sns
+        this.localUserId = localUserId
+    }
+}

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<Information> informations;
+    private String description;
+    private Sns snResult;
+
+    public List<Information> getInformations() {
+        return informations;
+    }
+
+    public void setInformations(List<Information> 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;
+    }
+}

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;
 

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;
 

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
 
 /**

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<InformationAndLiveCarResult> requestInformationAlongTheWay(@Query("sn") String sn, @FieldMap Map<String, String> parameters);
+
+    /**
+     * 获取上班族路线的坐标集
+     */
+    @FormUrlEncoded
+    @POST("yycp-travel-condition/travelDetail/info/no/commuter/v1")
+    Observable<PathLineResult> getRoadLineInfo(@FieldMap Map<String, String> infoBody);
+
+
+    /**
+     * 基于地理信息词缀的空间情报检索
+     */
+    @FormUrlEncoded
+    @POST("deva/car/search/no/searchInforationByAddress/v1")
+    Observable<VoiceSearchResult> searchOnLineInformation(@FieldMap Map<String, String> infoBody);
+
+
+}

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
 
 /**

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) {

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

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

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

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;
 

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

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

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

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

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;
 

modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/model/Informations.kt

@@ -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<Items>,
-        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<Items>,
-            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<Informations> {
-        override fun createFromParcel(parcel: Parcel): Informations {
-            return Informations(parcel)
-        }
-
-        override fun newArray(size: Int): Array<Informations?> {
-            return arrayOfNulls(size)
-        }
-    }
-
-}

modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/net/TanluApiService.java

@@ -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<BaseData> refreshData(@QueryMap Map< String, Object > params,
-                                     @FieldMap Map< String, Object > parameters );
-
-}

modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml

@@ -8,7 +8,7 @@
     tools:context=".video.FullMediaActivity">
 
     <!--全屏播放器-->
-    <com.mogo.tanlu.video.MediaCoverVideoPlayer
+    <com.mogo.module.tanlu.video.MediaCoverVideoPlayer
         android:id="@+id/video_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

modules/mogo-module-tanlu/src/main/res/layout/tanlu_fullscreen_video_view_pager.xml

@@ -4,14 +4,14 @@
     android:layout_height="match_parent"
     android:background="@android:color/transparent">
 
-    <com.zhidao.roadcondition.video.MediaCoverVideoPlayer
+    <com.mogo.module.tanlu.video.MediaCoverVideoPlayer
         android:id="@+id/video_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clickable="true"
         android:longClickable="true" />
 
-    <com.zhidao.roadcondition.view.AutoZoomInImageView
+    <com.mogo.module.tanlu.view.AutoZoomInImageView
         android:id="@+id/iv_pager_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml

@@ -68,13 +68,13 @@
             android:layout_marginRight="16dp"
             android:background="@drawable/shape_bg_222533_9px">
 
-            <com.mogo.tanlu.video.SimpleCoverVideoPlayer
+            <com.mogo.module.tanlu.video.SimpleCoverVideoPlayer
                 android:id="@+id/video_player_main"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="gone" />
 
-            <com.mogo.tanlu.view.AutoZoomInImageView
+            <com.mogo.module.tanlu.view.AutoZoomInImageView
                 android:id="@+id/tanlu_photo_imageView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />

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" />
 
-    <com.zhidao.roadcondition.view.AutoZoomInImageView
+    <com.mogo.module.tanlu.view.AutoZoomInImageView
         android:id="@+id/recycle_photo_imageView"
         android:layout_width="400dp"
         android:layout_height="225dp"