diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index b701d29dd1..2011b50422 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -57,6 +57,7 @@ class MainService : Service() { var picType: Int = 0 var videoType: Int = 0 var shareType: String = "type" + var fromType: String = "" var isCustom: Boolean = false var params: UploadParams? = null @@ -88,6 +89,7 @@ class MainService : Service() { params = intent.getParcelableExtra("params") params?.let { shareType = it.eventType + fromType = it.fromType Log.d(TAG, "onStartCommand shareType = $shareType") if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG @@ -207,6 +209,7 @@ class MainService : Service() { private fun sendMarkerInfoReceiver(lat: Double, lon: Double, imageUrl: String?, type: String?) { Log.e("MainService", "sendMarkerInfoReceiver ------> type = $type ") + Log.e("MainService", "sendMarkerInfoReceiver ------> fromType = $fromType ") Log.e("MainService", "sendMarkerInfoReceiver ------> isCustom = $isCustom ") var intent = Intent() intent.action = "com.zhidao.roadcondition.marker.info" @@ -215,6 +218,7 @@ class MainService : Service() { intent.putExtra("lat", lat) intent.putExtra("lon", lon) intent.putExtra("custom", isCustom) + intent.putExtra("fromType", fromType) sendBroadcast(intent) } 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 745865a533..3f53375103 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 @@ -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); diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java index bef289c739..afdf58cade 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/MarkerInfo.java @@ -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; } } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt index 0eacbee379..cdc4625678 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/MarkerInfoReceiver.kt @@ -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)) } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index c95e24d6fe..9766af55f0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -59,6 +59,7 @@ public class V2XSurroundingFragment extends MvpFragment "); mRecyclerView = findViewById(R.id.surrounding_recycleview); mTotalTv = findViewById(R.id.tv_brief); + mTopLayout = findViewById(R.id.layout_top); mEmptyLayout = findViewById(R.id.layout_empty_data_show); mTopFreshTv = findViewById(R.id.tv_top_refresh); mShareTv = findViewById(R.id.tv_main_share); @@ -145,6 +147,7 @@ public class V2XSurroundingFragment extends MvpFragment exploreWayList) { if (exploreWayList != null && exploreWayList.size() > 0) { //展示数据 + mTopLayout.setVisibility(View.VISIBLE); mRecyclerView.setVisibility(View.VISIBLE); mEmptyLayout.setVisibility(View.GONE); @@ -162,6 +165,7 @@ public class V2XSurroundingFragment extends MvpFragment { private IMogoNetwork mNetWork; private IMogoServiceApis mApis; private V2XApiService eventApiService; - private static final String TAG = "SurroundingEvent"; + private static final String TAG = "V2XSurroundingFragment"; public SurroundingEventPresenter(Context context, SurroundingEventView view) { @@ -72,13 +72,15 @@ public class SurroundingEventPresenter extends Presenter { @Override public void onError(Throwable e) { super.onError(e); + mView.showSurroudingData(null); + Logger.e(TAG, "onError e = " + e); e.printStackTrace(); } @Override public void onSuccess(SurroundingResponse data) { super.onSuccess(data); - Logger.d("SurroundingFragment", "onSuccess ------> "); + Logger.d(TAG, "onSuccess ------> "); if (data != null && data.getResult() != null) { mView.showSurroudingData(data.getResult().getExploreWay()); } @@ -88,7 +90,7 @@ public class SurroundingEventPresenter extends Presenter { public void onError(String message, int code) { super.onError(message, code); mView.showSurroudingData(null); - Logger.e("SurroundingFragment", "onError message = " + message + " >>> code = " + code); + Logger.e(TAG, "onError message = " + message + " >>> code = " + code); } }); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index 5ef63a227a..855303c8bc 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -3,6 +3,7 @@ package com.mogo.module.v2x.scenario.scene.road; import android.view.View; import android.view.ViewGroup; +import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.service.ServiceConst; @@ -60,11 +61,13 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent(); if (v2XRoadEventEntity != null) { - //上报路况 - V2XServiceManager.getMoGoStatusManager().setUploadingStatus(ServiceConst.CARD_TYPE_ROAD_CONDITION, true); - TanluUploadParams params = new TanluUploadParams(v2XRoadEventEntity.getPoiType(), - IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO); - V2XServiceManager.getTanluManager().uploadRoadCondition(params); + //只上报事故 + if (v2XRoadEventEntity.getPoiType() != null && v2XRoadEventEntity.getPoiType().equals(MarkerPoiTypeEnum.FOURS_ACCIDENT)) { + V2XServiceManager.getMoGoStatusManager().setUploadingStatus(ServiceConst.CARD_TYPE_ROAD_CONDITION, true); + TanluUploadParams params = new TanluUploadParams(v2XRoadEventEntity.getPoiType(), + IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO); + V2XServiceManager.getTanluManager().uploadRoadCondition(params); + } if (v2XMessageEntity.isShowState()) { if (!isSameScenario(v2XMessageEntity)) { diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index b1dc0f58a7..fb62717df6 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -30,7 +30,7 @@ android:layout_marginRight="20px" android:background="@drawable/bg_v2x_refresh" android:gravity="center" - android:text="刷新" + android:text="@string/v2x_surrounding_refresh" android:textColor="@color/white" android:textSize="18px" android:textStyle="bold" /> @@ -64,8 +64,8 @@ @@ -79,7 +79,7 @@ android:layout_marginTop="15px" android:gravity="center_horizontal" android:text="周边5公里，暂无交通事件" - android:textColor="@color/transparent_white_30" + android:textColor="@color/white" android:textSize="18px" android:textStyle="bold" /> @@ -89,7 +89,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/tv_main_empty_1" android:layout_centerHorizontal="true" - android:layout_marginTop="2px" + android:layout_marginTop="1px" android:gravity="center_horizontal" android:text="你可以试着分享一个事件给其他车主" android:textColor="@color/transparent_white_30" @@ -101,11 +101,11 @@ android:layout_width="150px" android:layout_height="48px" android:layout_below="@+id/tv_main_empty_2" - android:layout_marginLeft="110px" - android:layout_marginTop="33px" + android:layout_marginLeft="70px" + android:layout_marginTop="32px" android:background="@drawable/bg_v2x_go_to_share" android:gravity="center" - android:text="去分享" + android:text="@string/v2x_surrounding_go_to_share" android:textColor="@color/white" android:textSize="18px" android:textStyle="bold" /> @@ -116,11 +116,11 @@ android:layout_height="48px" android:layout_below="@+id/tv_main_empty_2" android:layout_alignParentRight="true" - android:layout_marginTop="33px" - android:layout_marginRight="110px" + android:layout_marginTop="32px" + android:layout_marginRight="70px" android:background="@drawable/bg_v2x_refresh" android:gravity="center" - android:text="刷新" + android:text="@string/v2x_surrounding_refresh" android:textColor="@color/white" android:textSize="18px" android:textStyle="bold" /> diff --git a/modules/mogo-module-v2x/src/main/res/values/strings.xml b/modules/mogo-module-v2x/src/main/res/values/strings.xml index f5455700c6..2413b8f3d5 100644 --- a/modules/mogo-module-v2x/src/main/res/values/strings.xml +++ b/modules/mogo-module-v2x/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ 已提交 感谢已送达 周围5公里，共 %d 条交通信息 - 分享 + 去分享 刷新