From 3425c75f1364953b4479a4a52921337e75dea1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 6 Feb 2020 15:41:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=96=B0?= =?UTF-8?q?=E9=B2=9C=E4=BA=8B=E5=84=BF=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/common/entity/MarkerNoveltyInfo.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java index a09010b15f..e742940b38 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java @@ -53,6 +53,7 @@ public class MarkerNoveltyInfo { private String infoId; private long likeNum; private String title; + private String gasPrices; private boolean displayNavigation; private String styleType; @@ -120,6 +121,14 @@ public class MarkerNoveltyInfo { this.styleType = styleType; } + public String getGasPrices() { + return gasPrices; + } + + public void setGasPrices(String gasPrices) { + this.gasPrices = gasPrices; + } + @Override public String toString() { return "ContentData{" + @@ -129,6 +138,7 @@ public class MarkerNoveltyInfo { ", infoId='" + infoId + '\'' + ", likeNum=" + likeNum + ", title='" + title + '\'' + + ", gasPrices='" + gasPrices + '\'' + ", displayNavigation=" + displayNavigation + ", styleType='" + styleType + '\'' + '}'; From 4489acea28b6c6483cffa7c503c6bbd79709a87f Mon Sep 17 00:00:00 2001 From: yileizhao Date: Fri, 7 Feb 2020 12:05:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=BE=E5=BC=80=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E4=BD=8D=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index f7a41dd5ee..363d37bcf9 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -8,6 +8,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.auto.zhidao.logsdk.CrashSystem; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; +import com.mogo.module.adcard.AdCardConstants; import com.mogo.module.carchatting.card.CallChatConstant; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; @@ -42,7 +43,7 @@ public class MogoApplication extends AbsMogoApplication { // MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) ); DebugConfig.setNetMode(BuildConfig.NET_ENV); //运营位卡片，需要默认显示，放在第一个加载 -// MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); + MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, OnLineCarConstants.MODULE_NAME)); MogoModulePaths.addModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI)); MogoModulePaths.addModule(new MogoModule(TanluConstants.TAG, TanluConstants.MODEL_NAME)); From 2fbb660b2888f9073188f59494cd1c1feb3f37a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 7 Feb 2020 12:48:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E9=B2=9C=E4=BA=8B=E5=84=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86SN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/common/entity/MarkerNoveltyInfo.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java index e742940b38..84157f6a84 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java @@ -6,6 +6,7 @@ package com.mogo.module.common.entity; */ public class MarkerNoveltyInfo { private String type; + private String sn; private MarkerLocation location; /** * @see MarkerPoiTypeEnum @@ -45,6 +46,13 @@ public class MarkerNoveltyInfo { this.type = type; } + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } public class ContentData { private String content; @@ -149,6 +157,7 @@ public class MarkerNoveltyInfo { public String toString() { return "MarkerNoveltyInfo{" + "type='" + type + '\'' + + ", sn='" + sn + '\'' + ", location=" + location + ", poiType='" + poiType + '\'' + ", contentData=" + contentData + From 59dea59a3464eb7d0133d2f4041fe7b80f523179 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 7 Feb 2020 15:48:54 +0800 Subject: [PATCH 4/4] opt videoplayer and modify navi --- .../tanlu/fragment/TanluCardViewFragment.java | 16 ++++++++--- .../module/tanlu/model/NaviRoadRequest.java | 4 +-- .../module/tanlu/model/TanluModelData.java | 14 +++++++++- .../tanlu/video/SimpleCoverVideoPlayer.kt | 28 +++++++++++++++++++ .../src/main/res/values-ldpi/dimens.xml | 2 +- .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../src/main/res/values/dimens.xml | 2 +- 7 files changed, 58 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index 4ccd826564..28c93fd0c9 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -329,7 +329,6 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onStartNavi() { //开始导航 - Logger.d(TAG, "onStartNavi -------> "); initModelData(); getNavigationData(); } @@ -906,7 +905,7 @@ public class TanluCardViewFragment extends MvpFragment> /** - * 上报分享信息 TODO + * 上报分享信息 */ private void uploadShareInfo(String poiType, String poiImgUrl, String nickname, String headImgUrl) { double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); @@ -969,11 +968,16 @@ public class TanluCardViewFragment extends MvpFragment> // } // }); + mTanluModelData.getNaviInformation(new NaviCallback() { @Override public void onSuccess(NaviResult data) { - Log.d(TAG, "getNavigationData onSuccess ----->"); List informationList = data.getResult().getInformations(); + Log.d(TAG, "getNavigationData onSuccess informationList =" + informationList); + if (informationList == null || (informationList != null && informationList.size() == 0)) { + return; + } + //清除探路之前的数据 mMarkerManager.removeMarkers(TanluConstants.MODEL_NAME); @@ -999,7 +1003,6 @@ public class TanluCardViewFragment extends MvpFragment> .longitude(informationList.get(i).lon); optionList.add(options); - Log.d(TAG, "lat =" + informationList.get(i).lat + ">>>lon =" + informationList.get(i).lon); } Logger.d(TAG, "getNavigationData optionList.size() = " + optionList.size()); mMarkerManager.addMarkers(TanluConstants.MODEL_NAME, optionList, true); @@ -1117,6 +1120,11 @@ public class TanluCardViewFragment extends MvpFragment> speakSuccessVoice(o.getResult().getInformations(), discription == null ? "" : discription); List informationList = o.getResult().getInformations(); + Log.d(TAG, "getVoiceControlRoadData onSuccess informationList =" + informationList); + if (informationList == null || (informationList != null && informationList.size() == 0)) { + return; + } + //清除探路之前的数据 mMarkerManager.removeMarkers(TanluConstants.MODEL_NAME); //添加埋点数据 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/NaviRoadRequest.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/NaviRoadRequest.java index 456fc5225b..f62763b6b2 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/NaviRoadRequest.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/NaviRoadRequest.java @@ -8,10 +8,10 @@ import java.util.List; * @since 2020-02-03 */ public class NaviRoadRequest { - public List coordinates; + public List coordinates; public int limit; - public NaviRoadRequest(List coordinates, int limit) { + public NaviRoadRequest(List coordinates, int limit) { this.coordinates = coordinates; this.limit = limit; } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java index e460cdc528..e903b69282 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java @@ -291,10 +291,22 @@ public class TanluModelData { */ public void getNaviInformation(final NaviCallback callback) { Gson gson = new Gson(); + double lng = 120.42; + double lat = 36.19; + double lng2 = 120.66; + double lat2 = 36.32; + + List coordinates = new ArrayList<>(); + coordinates.add(lng + "," + lat); + coordinates.add(lng2 + "," + lat2); + + NaviRoadRequest naviRoadRequest = new NaviRoadRequest(coordinates, 10); + String naviStr = gson.toJson(naviRoadRequest); + Log.d(TAG, "getNaviInformation naviStr = " + naviStr); final Map params = new ParamsProvider.Builder(mContext) .append("sn", Utils.getSn()) -// .append("data", uploadShareStr) + .append("data", naviStr) .build(); mTanluApiService.getNaviInformation(params) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt index e0239d7ee5..02f0674e68 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt @@ -2,6 +2,7 @@ package com.mogo.module.tanlu.video import android.content.Context import android.util.AttributeSet +import android.util.Log import android.view.Surface import android.view.View import android.widget.ImageView @@ -77,6 +78,33 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { override fun changeUiToCompleteShow() { super.changeUiToCompleteShow() // setViewShowState(mBottomContainer, View.INVISIBLE) + Log.d("liyz", "changeUiToCompleteShow ------------>") + } + + override fun hideAllWidget() { + super.hideAllWidget() + Log.d("liyz", "hideAllWidget ------------>") + mBottomContainer.visibility = View.VISIBLE + } + + override fun changeUiToPrepareingClear() { + super.changeUiToPrepareingClear() + mBottomContainer.visibility = View.VISIBLE + } + + override fun changeUiToPlayingBufferingClear() { + super.changeUiToPlayingBufferingClear() + mBottomContainer.visibility = View.VISIBLE + } + + override fun changeUiToClear() { + super.changeUiToClear() + mBottomContainer.visibility = View.VISIBLE + } + + override fun changeUiToCompleteClear() { + super.changeUiToCompleteClear() + mBottomContainer.visibility = View.INVISIBLE } override fun onAutoCompletion() { diff --git a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml index bc10b86561..345e90786e 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml @@ -14,7 +14,7 @@ 96px 90px 700px - 10px + 5px 72px 25px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index 08d5243a1f..57993dcf50 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -15,7 +15,7 @@ 96px 100px 700px - 10px + 5px 135px 50px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index 131282c5a1..a2953cf57c 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -15,7 +15,7 @@ 96px 144px 760px - 10px + 5px 135px 50px