Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

This commit is contained in:
wangcongtao
2020-02-10 20:51:41 +08:00

View File

@@ -895,8 +895,10 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
} else if (event.type.equals("3")) { //封路 10003
poiType = "10003";
mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_road_closure);
} else {
mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up);
}
else {
poiType = "-1";
// mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up);
}
double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude();
@@ -926,7 +928,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
/**
* 上报分享信息
*/
private void uploadShareInfo(String poiType, String poiImgUrl, String nickname, String headImgUrl) {
private void uploadShareInfo(final String poiType, String poiImgUrl, String nickname, String headImgUrl) {
double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude();
double lon = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude();
String addressStr = TanluServiceHandler.getLocationClient().getLastKnowLocation().getAddress();
@@ -935,14 +937,18 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
new UploadShareCallback() {
@Override
public void onSuccess(BaseData data) {
Log.d(TAG, "uploadShareInfo onSuccess ----->");
AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_success), null);
Log.d(TAG, "uploadShareInfo onSuccess -----> poiType = " + poiType);
if (!poiType.equals("-1")) {
AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_success), null);
}
}
@Override
public void onFail(String message, int code) {
Log.e(TAG, "uploadShareInfo onFail ----->");
AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_failed), null);
Log.e(TAG, "uploadShareInfo onFail -----> poiType = " + poiType);
if (!poiType.equals("-1")) {
AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_failed), null);
}
}
});
}