From 04c913925e753e7e3679d9953d758cad750c2c8e Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Wed, 30 Sep 2020 11:43:37 +0800
Subject: [PATCH] opt maidian

---
 .../module/tanlu/constant/TanluConstants.java |  2 --
 .../tanlu/fragment/TanluListWindow.java       | 22 +++++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java
index 9f3d7c34ae..f47228a344 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/constant/TanluConstants.java
@@ -110,6 +110,4 @@ public class TanluConstants {
     //视频播放
     public static final String CARNET_USER_VIDEO_PLAY = "CarNet_user_video_play";
 
-    public static final String LAUNCHER_MARKER_ICON_CLICK = "Launcher_Icon_Click";
-
 }
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
index 123db9846b..ae0c326c62 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
+import android.location.LocationManager;
 import android.net.Uri;
 import android.os.CountDownTimer;
 import android.os.Handler;
@@ -30,6 +31,7 @@ import com.mogo.commons.data.BaseData;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.map.MogoLatLng;
+import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;
@@ -80,6 +82,7 @@ import com.mogo.module.tanlu.model.event.MarkerInfo;
 import com.mogo.module.tanlu.model.event.PushTypeInfo;
 import com.mogo.module.tanlu.model.event.StartPlayInfo;
 import com.mogo.module.tanlu.model.event.VoiceControlUpInfo;
+import com.mogo.module.tanlu.util.LocationUtils;
 import com.mogo.module.tanlu.util.Utils;
 import com.mogo.module.tanlu.view.NetErrorDialog;
 import com.mogo.module.tanlu.view.UploadFailedDialog;
@@ -166,6 +169,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
     private List<MogoLatLng> passedByPoints;
     private IMogoRegisterCenter mMogoRegisterCenter;
     private String mKeywords;
+    private String mCity;
 
     //新修改
     private RecyclerView mLoopRecyclerView;
@@ -548,6 +552,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
                 Logger.d(TAG, "拥堵和路况");
                 voiceData = Utils.parseTOVoiceCmdData(data);
                 voiceData.setObj(TYPE_NAME_BLOCK);
+                mKeywords = voiceData.getLocation();
                 break;
             case VOICE_COMMAND_NOVELTY_QUERY:
                 Logger.d(TAG, "其他");
@@ -560,6 +565,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
             case TXZ_SPECIFIEDROAD_SEARCH:
                 Logger.d(TAG, "同行者--xx堵不堵--唤醒--->");
                 String keyWords = intent.getStringExtra("keywords");
+                mKeywords = keyWords;
                 String city = intent.getStringExtra("city");
                 voiceData = new VoiceCmdData("", city + keyWords, TYPE_NAME_BLOCK);
                 break;
@@ -578,6 +584,10 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
                     }
                     Logger.d(TAG, "onQueryRoadInfoSuccess roadInfoList.size() = " + roadInfoList.size()
                             + "  >>currentLat = " + currentLat + " -->currentLon = " + currentLon);
+                    MogoLocation location = TanluServiceManager.getLocationClient().getLastKnowLocation();
+                    if (location != null) {
+                        mCity = location.getCityName();
+                    }
                     initData(null, (List<MarkerExploreWay>) roadInfoList);
                     addMarkersAction((List<MarkerExploreWay>) roadInfoList, currentLat, currentLon);
                 }
@@ -670,7 +680,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
             marker.startScaleAnimation(0, 1.2f, 0, 1.2f, 300, new AccelerateInterpolator(), new OnMarkerAnimationListener() {
                 @Override
                 public void onAnimStart() {
-                    Logger.d(TAG, " onAnimStart ---1----> ");
+//                    Logger.d(TAG, " onAnimStart ---1----> ");
                 }
 
                 @Override
@@ -1529,16 +1539,14 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
 
     //上报语音搜索
     private void trackVoiceSearch(int type) {
+        Log.e(TAG, "type = " + type + "-- mCity =" + mCity + "-- mKeywords =" + mKeywords);
         Map<String, Object> properties = new HashMap<>();
-        properties.put("type", type);
-        properties.put("searchtext", mKeywords);
-        properties.put("inputlon", inputlon);
-        properties.put("inputlat", inputlat);
-        properties.put("datalon", datalon);
-        properties.put("datalat", datalat);
+        properties.put("searcharea", mKeywords);
+        properties.put("city", mCity);
         mAnalytics.track(TanluConstants.CARNET_VOICE_SEARCH, properties);
     }
 
+
     private String getMathRandom() {
         Random random = new Random();
         int temp = random.nextInt(50) + 10;