This commit is contained in:
lixiaopeng
2020-08-12 18:15:07 +08:00
parent f3d08f8260
commit 9b1f74b1a9
9 changed files with 45 additions and 26 deletions

View File

@@ -1062,8 +1062,9 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
float bearing = TanluServiceManager.getLocationClient().getLastKnowLocation().getBearing(); //角度
Logger.d(TAG, "onMarkerInfo event.type = " + event.type + " >>event.lat = " + event.lat + " >>event.lon = " + event.lon + " >>event.imageUrl =" + event.imageUrl);
String poiType = event.type;
String fromType = event.fromType;
boolean isCumtom = event.isCumtom;
Logger.d(TAG, "onMarkerInfo share poiType = " + poiType + " --isCumtom = " + isCumtom + " >> getMathRandom = " + getMathRandom() + " >>> bearing = " + bearing);
Logger.d(TAG, "onMarkerInfo share poiType = " + poiType + " --isCumtom = " + isCumtom + " >> getMathRandom = " + getMathRandom() + " >>> bearing = " + bearing + ">>>fromType = " + fromType);
if (isCumtom && !poiType.equals("0")) {
double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude();
double lon = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude();
@@ -1085,9 +1086,11 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
markerShowEntity.setMarkerType(TanluConstants.MODEL_NAME);
markerShowEntity.setMarkerLocation(markerLocation);
AIAssist.getInstance(getContext()).speakTTSVoice((
String.format(voiceShareSuccessTts, getMathRandom())), null);
TipToast.shortTip("分享成功");
if (!fromType.equals("5")) {
AIAssist.getInstance(getContext()).speakTTSVoice((
String.format(voiceShareSuccessTts, getMathRandom())), null);
TipToast.shortTip("分享成功");
}
IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity);
mogoMarker.setClickable(false);

View File

@@ -9,17 +9,19 @@ import java.io.Serializable;
*/
public class MarkerInfo implements Serializable {
public String type; //封路,还是上报
public String fromType; //来源 主动,被动,策略。
public String imageUrl; //上传完cos图片
public double lon; //经度
public double lat; //纬度
public boolean isCumtom; //是否主动上报
public MarkerInfo(String type, String imageUrl, double lon, double lat, boolean isCumtom) {
public MarkerInfo(String type, String imageUrl, double lon, double lat, boolean isCumtom, String fromType) {
this.type = type;
this.imageUrl = imageUrl;
this.lon = lon;
this.lat = lat;
this.isCumtom = isCumtom;
this.fromType = fromType;
}
}

View File

@@ -14,12 +14,13 @@ class MarkerInfoReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
if (intent.action == "com.zhidao.roadcondition.marker.info"){
var type = intent.getStringExtra("type")
var fromType = intent.getStringExtra("fromType")
var imageUrl = intent.getStringExtra("imageUrl")
var lat = intent.getDoubleExtra("lat",0.0)
var lon = intent.getDoubleExtra("lon",0.0) //经度
var custom = intent.getBooleanExtra("custom", false)
Log.d("MarkerInfoReceiver", "type =" + type + "---->lat =" + lat + "----lon =" + lon + " --custom = " + custom + "---imageUrl =" + imageUrl)
EventBus.getDefault().post(MarkerInfo(type, imageUrl,lon, lat, custom))
EventBus.getDefault().post(MarkerInfo(type, imageUrl,lon, lat, custom, fromType))
}
}
}