yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mu' into dev_1.1.9

Browse Source
This commit is contained in:
liujing
2021-01-04 14:18:58 +08:00
parent c16ad2bce4 2c30d98311
commit 16c9f41a4c
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
View File

@@ -12,6 +12,7 @@ import com.mogo.commons.data.BaseData;
import com.mogo.commons.network.ParamsProvider;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.network.Utils;
import com.mogo.commons.voice.AIAssist;
import com.mogo.map.MogoLatLng;
import com.mogo.map.location.MogoLocation;
import com.mogo.map.search.geo.IMogoGeoSearchListener;
@@ -20,6 +21,7 @@ import com.mogo.map.search.geo.MogoRegeocodeResult;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.common.entity.V2XRecommendRouteEntity;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.service.network.RefreshBody;
@@ -50,6 +52,8 @@ import io.reactivex.functions.Function;
import io.reactivex.schedulers.Schedulers;
import okhttp3.RequestBody;
import static com.mogo.module.v2x.V2XServiceManager.getContext;
/**
* 数据接口API
@@ -739,7 +743,29 @@ public class V2XRefreshModel {
}
if (!isSendRecommendRoute && v2XRoadDataRes.getResult().getIllegalParkingData() != null && v2XRoadDataRes.getResult().getIllegalParkingData().size() > 0) {
// TODO: 2020/12/30
try {
V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = new V2XMessageEntity<>();
v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_RECOMMEND_PARKING);
// 设置数据
V2XRoadDataRes.ResultDTO.IllegalParkingDataDTO parkingDataDTO = v2XRoadDataRes.getResult().getIllegalParkingData().get(0);
V2XPushMessageEntity pushMessageEntity = new V2XPushMessageEntity();
pushMessageEntity.setAddress(parkingDataDTO.getAddr());
pushMessageEntity.setAlarmContent("停车场推荐");
pushMessageEntity.setLat(parkingDataDTO.getLat());
pushMessageEntity.setLon(parkingDataDTO.getLon());
String tts = "主人，我发现" + v2XRoadDataRes.getResult().getFormatAddress() + "停车容易违章，推荐你导航到附近停车场，开始导航吗?";
AIAssist.getInstance(getContext()).speakTTSVoice(tts);
pushMessageEntity.setExpireTime(20000);
// 控制展示状态
v2XMessageEntity.setContent(pushMessageEntity);
v2XMessageEntity.setShowState(true);
Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}

3
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
View File

@@ -25,7 +25,8 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
* author : donghongyu
* e-mail : 1358506549@qq.com
* date : 2020/5/15 5:37 PM
* desc : 疲劳驾驶场景
* desc : 疲劳驾驶/目的地停车场推荐场景
* 目的地停车场他推荐:http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48958095
* version: 1.0
*/
public class V2XFatigueDrivingScenario extends AbsV2XScenario<V2XPushMessageEntity> implements IMogoTopViewStatusListener {