From f0633704d62b327ef98428ac77aa032f8be0387f Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Sun, 19 Jan 2020 13:14:59 +0800
Subject: [PATCH] opt share

---
 .idea/gradle.xml                              | 27 ++++++++++++++
 .../tanlu/fragment/TanluCardViewFragment.java | 36 +++++++++++--------
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b68060b9df..26618df6e9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,33 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/foudations" />
+            <option value="$PROJECT_DIR$/foudations/mogo-commons" />
+            <option value="$PROJECT_DIR$/foudations/mogo-connection" />
+            <option value="$PROJECT_DIR$/foudations/mogo-utils" />
+            <option value="$PROJECT_DIR$/libraries" />
+            <option value="$PROJECT_DIR$/libraries/map-amap" />
+            <option value="$PROJECT_DIR$/libraries/mogo-map" />
+            <option value="$PROJECT_DIR$/libraries/mogo-map-api" />
+            <option value="$PROJECT_DIR$/modules" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-apps" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-common" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-extensions" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-main" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-map" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-search" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-service" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-share" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-tanlu" />
+            <option value="$PROJECT_DIR$/services" />
+            <option value="$PROJECT_DIR$/services/mogo-service" />
+            <option value="$PROJECT_DIR$/services/mogo-service-api" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
         <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
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 f1a23c0723..88072178a0 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
@@ -715,7 +715,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
     }
 
     /**
-     * TODO
+     *
      * C位事件,如何获取数据，需要有默认数据
      * 如果只有一个数据，不显示上下切换按钮，没有数据显示空页面
      */
@@ -795,8 +795,8 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
     public void onPOIClick(MogoPoi poi) {
         if (poi != null) {
             TipToast.shortTip(poi.getName());
+            TanluServiceHandler.getPoiSearch().searchPOIIdAsyn(poi.getPoiId());
         }
-        TanluServiceHandler.getPoiSearch().searchPOIIdAsyn(poi.getPoiId());
     }
 
     @Override
@@ -848,14 +848,14 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
     /**
      * 接收到分享对应数据打点
      *
-     * @param event
+     * @param event  TODO
      */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMarkerInfo(final MarkerInfo event) {
-        Log.d(TAG, "onMarkerInfo ------------>");
         if (event == null) {
             return;
         }
+        Log.d(TAG, "onMarkerInfo event.type =" + event.type + " >>event.lat = " + event.lat + " >>event.lon = "  + event.lon + " >>event.imageUrl =" + event.imageUrl);
 
         String poiType = "";
         if (event.type.equals("1")) { //上报路况
@@ -870,18 +870,26 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
             mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up);
         }
 
-        Log.d(TAG, "onMarkerInfo share onCompleted ------>");
+        double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude();
+        double lon = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude();
+        Log.d(TAG, "onMarkerInfo share onCompleted ---poiType =" + poiType);
         MogoMarkerOptions options = new MogoMarkerOptions()
                 .icon(mMarkerIcon)
-                .latitude(event.lat)
-                .owner(TanluConstants.MODEL_NAME)
-                .longitude(event.lon);
-        mMarkerManager.addMarker("share_tag", options); //随便传tag，不可点击
+                .latitude(lat) //event.lat
+                .owner("share_tag")
+                .longitude(lon); //event.lon
+        mMarkerManager.addMarker("share_tag", options); //随便传tag，不可点击 share_tag  TanluConstants.MODEL_NAME
+
         //请求分享接口
-        MarkerExploreWay markerExploreWay = markerExploreWayList.get(0);
-        if (markerExploreWay.getUserInfo() != null) {
-            uploadShareInfo(poiType, event.imageUrl, markerExploreWay.getUserInfo().getUserName(),
-                    markerExploreWay.getUserInfo().getUserHead());
+        if (markerExploreWayList != null && markerExploreWayList.size() > 0) {
+            MarkerExploreWay markerExploreWay = markerExploreWayList.get(0);
+            if (markerExploreWay.getUserInfo() != null && !TextUtils.isEmpty(poiType)) { //上报路况不使用这个接口
+                uploadShareInfo(poiType, event.imageUrl, markerExploreWay.getUserInfo().getUserName(),
+                        markerExploreWay.getUserInfo().getUserHead());
+            }
+        } else {
+            Log.e(TAG, "onMarkerInfo share markerExploreWayList = null");
+            uploadShareInfo(poiType, event.imageUrl, "", "");
         }
     }
 
@@ -1222,7 +1230,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
         AIAssist.getInstance(getContext()).speakTTSVoice(searchingVoiceStrings[random.nextInt(3)], null);
     }
 
-    //上报语音搜索
+    //上报语音搜索 TODO
     private void trackVoiceSearch(int type) {
 
     }