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 @@
+
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>
}
/**
- * TODO
+ *
* C位事件,如何获取数据,需要有默认数据
* 如果只有一个数据,不显示上下切换按钮,没有数据显示空页面
*/
@@ -795,8 +795,8 @@ public class TanluCardViewFragment extends MvpFragment>
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>
/**
* 接收到分享对应数据打点
*
- * @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>
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>
AIAssist.getInstance(getContext()).speakTTSVoice(searchingVoiceStrings[random.nextInt(3)], null);
}
- //上报语音搜索
+ //上报语音搜索 TODO
private void trackVoiceSearch(int type) {
}