From 3307fae3c36a64f26453c8132026fc606c9cfb9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 12 Mar 2020 17:52:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=86=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E6=97=A5=E5=BF=97=EF=BC=8C=E5=8E=9F=E5=9B=A0=E6=98=AF?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 6c502561fb..df249bacae 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -479,7 +479,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, new AMap.OnMyLocationChangeListener() { @Override public void onMyLocationChange( Location location ) { - Logger.d( TAG, location.toString() ); + //Logger.d( TAG, location.toString() ); } } ); From 7abcae2db8663616b3003751686902d35b1d0d14 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 13 Mar 2020 13:54:48 +0800 Subject: [PATCH 2/3] add voice control --- .../module/extensions/ExtensionsModuleConst.java | 8 +++++++- .../extensions/entrance/EntrancePresenter.java | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java index 56ab9dc58f..190ca76a37 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java @@ -23,6 +23,7 @@ public class ExtensionsModuleConst { public static final String TYPE_ENTRANCE = "entrance"; + /*** 分享 开始 **/ //免唤醒语音命令 public static final String[] CMD_CANCLE_SHARE = {"取消分享"}; public static final String[] CMD_CLOSE_PAGE = {"关闭页面"}; @@ -31,12 +32,14 @@ public class ExtensionsModuleConst { public static final String CANCLE_SHARE = "com.zhidao.launcher.cancle.share"; public static final String CLOSE_PAGE = "com.zhidao.launcher.close.page"; public static final String CLOSE = "com.zhidao.launcher.close"; + /*** 分享 结束 **/ - + /*** 探路 开始 免唤醒 **/ public static final String[] CMD_UPLOAD_BLOCK = {"上报拥堵"}; public static final String[] CMD_TRAFFIC_CHECK = {"上报交通检查"}; public static final String[] CMD_ROAD_CLOSURE = {"上报封路"}; + public static final String[] CMD_SHARE_OIL_PRICE = {"分享油价"}; //上报拥堵 public static final String UPLOAD_ROAD_BLOCK = "command_upload_block"; @@ -44,6 +47,9 @@ public class ExtensionsModuleConst { public static final String UPLOAD_TRAFFIC_CHECK = "command_upload_traffic_check"; //上报封路 public static final String UPLOAD_ROAD_CLOSURE = "command_upload_road_closure"; + //分享油价 + public static final String SHARE_OIL_PRICE = "command_share_oil_price"; + /*** 探路 结束 **/ //埋点 //分享分类 1：路况，2：油价，3：交通检查，4：封路 diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 24c38b66b4..57c5a9c31c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -2,6 +2,7 @@ package com.mogo.module.extensions.entrance; import android.content.Context; import android.content.Intent; +import android.net.Uri; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.Presenter; @@ -47,7 +48,8 @@ public class EntrancePresenter extends Presenter { ExtensionsModuleConst.CMD_TRAFFIC_CHECK, mogoVoiceListener); AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.UPLOAD_ROAD_CLOSURE, ExtensionsModuleConst.CMD_ROAD_CLOSURE, mogoVoiceListener); - + AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.SHARE_OIL_PRICE, + ExtensionsModuleConst.CMD_SHARE_OIL_PRICE, mogoVoiceListener); } /** @@ -65,6 +67,8 @@ public class EntrancePresenter extends Presenter { uploadTrfficCheck(); } else if (cmd.equals(ExtensionsModuleConst.UPLOAD_ROAD_CLOSURE)) { //上报封路 uploadRoadClosed(); + } else if (cmd.equals(ExtensionsModuleConst.SHARE_OIL_PRICE)) { //分享油价 + shareOilPrice(); } } @@ -85,7 +89,6 @@ public class EntrancePresenter extends Presenter { } }; - private void uploadRoadCondition() { traceTanluData("2"); sendShareReceiver("1"); @@ -94,6 +97,13 @@ public class EntrancePresenter extends Presenter { ShareControl.getInstance(mContext).dismissDialog(); } + private void shareOilPrice() { + Intent intent = new Intent(); + intent.setData(Uri.parse("freshthing://com.zhidao.fresh.things/shareOilPrice")); + mContext.startActivity(intent); + traceTypeData("2"); + } + private void uploadTrfficCheck() { sendShareReceiver("2"); Logger.d("EntrancePresenter", "mogoIntentListener 分享交通检查 ----> "); From c0ee957d3e355bfe9e97f36df96e3fe49ddd08e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 13 Mar 2020 15:15:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=BD=A6?= =?UTF-8?q?=E6=9C=BA=E7=9B=B4=E6=92=AD=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/common/entity/MarkerCarInfo.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java index 42e9055779..f149f21823 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java @@ -12,7 +12,7 @@ public class MarkerCarInfo implements Serializable { private String carBrandLogoUrl; private String carTypeName; private int carType; - private CarLive carLive; + private CarLiveInfo carLiveInfo; public String getCarBrandLogoUrl() { if (TextUtils.isEmpty(carBrandLogoUrl)) { @@ -44,15 +44,15 @@ public class MarkerCarInfo implements Serializable { this.carType = carType; } - public CarLive getCarLive() { - return carLive; + public CarLiveInfo getCarLiveInfo() { + return carLiveInfo; } - public void setCarLive(CarLive carLive) { - this.carLive = carLive; + public void setCarLiveInfo(CarLiveInfo carLiveInfo) { + this.carLiveInfo = carLiveInfo; } - class CarLive implements Serializable { + class CarLiveInfo implements Serializable { //rtmp视频直播地址rtmp:// private String videoUrl; //直播频道【直播心跳接口参数】C_1