From a3cffb1cb4ecacd15c8a7bad28c47531e7a47947 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 7 Feb 2020 20:56:09 +0800
Subject: [PATCH] modify navi

---
 .../tanlu/fragment/TanluCardViewFragment.java |  6 ++--
 .../module/tanlu/model/TanluModelData.java    | 33 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
index 28c93fd0c9..b351b8936d 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
@@ -950,7 +950,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
 
 
     /**
-     * 导航路线数据事件 TODO
+     * 导航路线数据事件
      */
     public void getNavigationData() {
 //        Double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude();
@@ -968,8 +968,8 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
 //            }
 //        });
 
-
-        mTanluModelData.getNaviInformation(new NaviCallback() {
+        mTanluModelData.getNaviInformation(mMogoMapService.getNavi(getContext()).getCalculatedPathPos(),
+                new NaviCallback() {
             @Override
             public void onSuccess(NaviResult data) {
                 List<Information> informationList = data.getResult().getInformations();
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java
index e903b69282..24e6d147a6 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java
@@ -10,6 +10,7 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.commons.network.Utils;
+import com.mogo.map.MogoLatLng;
 import com.mogo.module.tanlu.callback.AlongTheWayCallback;
 import com.mogo.module.tanlu.callback.NaviCallback;
 import com.mogo.module.tanlu.callback.RoadLineCallback;
@@ -287,21 +288,29 @@ public class TanluModelData {
     }
 
     /**
-     * 获取导航沿途情报 TODO
+     * 组装需要的请求list
+     *
+     * @return
      */
-    public void getNaviInformation(final NaviCallback callback) {
+    private List<String> getLatLngRequest(List<MogoLatLng> latLnglist) {
+        List<String> resultList = new ArrayList<>();
+        for (int i = 0; i < latLnglist.size(); i++) {
+            resultList.add(latLnglist.get(i).lng + "," + latLnglist.get(i).lat);
+        }
+
+        return resultList;
+    }
+
+    /**
+     * 获取导航沿途情报
+     */
+    public void getNaviInformation(List<MogoLatLng> mogoLatLnglist, final NaviCallback callback) {
         Gson gson = new Gson();
-        double lng = 120.42;
-        double lat = 36.19;
+        if (mogoLatLnglist == null) {
+            return;
+        }
 
-        double lng2 = 120.66;
-        double lat2 = 36.32;
-
-        List<String> coordinates = new ArrayList<>();
-        coordinates.add(lng + "," + lat);
-        coordinates.add(lng2 + "," + lat2);
-
-        NaviRoadRequest naviRoadRequest = new NaviRoadRequest(coordinates, 10);
+        NaviRoadRequest naviRoadRequest = new NaviRoadRequest(getLatLngRequest(mogoLatLnglist), 10);
         String naviStr = gson.toJson(naviRoadRequest);
         Log.d(TAG, "getNaviInformation naviStr = " + naviStr);
         final Map<String, Object> params = new ParamsProvider.Builder(mContext)