From 5557ab72534f7361eee86980c2d01ddce07a6ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 15 Apr 2021 15:46:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/module_small_map_view.xml | 2 +- .../mogo-module-smp/src/main/res/values-xhdpi/dimens.xml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml index 9df217742b..39e207eede 100644 --- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml +++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/dp_40" + android:padding="@dimen/module_small_map_padding" tools:parentTag="RelativeLayout"> diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml index 42dceb5bd2..c7682f0e11 100644 --- a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml @@ -1,13 +1,15 @@ + 40px + 400px 400px 288px 288px - 270px - 270px + 260px + 260px 1620px 780px From b399ea53af939c7aba9c8dfd9861531d1511d3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 15 Apr 2021 16:22:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/small/map/SmallMapDirectionView.java | 7 ++----- .../src/main/res/layout/module_small_map_view.xml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java index 67799b666b..00010d9dd0 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java +++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java @@ -5,6 +5,7 @@ import android.graphics.BitmapFactory; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; +import android.view.ViewGroup; import android.widget.RelativeLayout; import androidx.annotation.Nullable; @@ -17,7 +18,6 @@ import com.amap.api.navi.AMapNaviView; import com.amap.api.navi.AMapNaviViewOptions; import com.mogo.commons.AbsMogoApplication; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.small.map.animation.DirectionRotateAnimation; import com.mogo.utils.FileUtils; import java.io.IOException; @@ -32,8 +32,6 @@ public class SmallMapDirectionView extends RelativeLayout { private String styleFilePath = "/mnt/sdcard/amap/small_map_style.data"; private AMapNaviView mAMapNaviView; - private DirectionRotateAnimation mRotateAnimation; - private int lastAngle = 0; private int zoomLevel = 15; public SmallMapDirectionView(Context context) { @@ -54,9 +52,9 @@ public class SmallMapDirectionView extends RelativeLayout { } private void initView(Context context) { - mRotateAnimation = new DirectionRotateAnimation(context, null); AbsMogoApplication.getLayoutInflaterNoSkin().inflate(R.layout.module_small_map_view, this); + mAMapNaviView = findViewById(R.id.aMapNaviView); mAMapNaviView.onCreate(null); @@ -164,7 +162,6 @@ public class SmallMapDirectionView extends RelativeLayout { try { // 判断是否有样式文件存在 - //File styleExit = new File(styleFilePath); FileUtils.copy( context.getAssets().open("small_map_style.data"), styleFilePath, diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml index 39e207eede..587bffa950 100644 --- a/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml +++ b/modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/module_small_map_padding" tools:parentTag="RelativeLayout"> @@ -12,6 +11,7 @@ android:layout_width="@dimen/module_small_map_view_border_width" android:layout_height="@dimen/module_small_map_view_border_height" android:layout_centerInParent="true" + android:layout_margin="@dimen/module_small_map_padding" android:background="@drawable/module_small_map_view_border" /> Date: Thu, 15 Apr 2021 16:46:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E6=9C=80?= =?UTF-8?q?=E4=BC=98=E8=B7=AF=E7=BA=BF=E6=8E=A8=E8=8D=90=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=B8=8E=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE=E8=81=94?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../listener/V2XMessageListener_401019.java | 28 +++++++ .../v2x/observer/V2XOptimalRouteObserver.java | 5 +- .../v2x/overlay/V2XOptimalRouteOverlay.java | 9 +-- .../v2x/scenario/impl/V2XScenarioManager.java | 5 -- .../route/V2XOptimalRouteVREventMarker.java | 17 ++-- .../route/V2XOptimalRouteVREventScenario.java | 8 +- .../route/V2XOptimalRouteVREventWindow.java | 9 ++- .../scene/test/V2XTestConsoleWindow.java | 5 +- .../module/v2x/utils/TestOnLineCarUtils.java | 34 ++++++++ ...io_push_vr_event_data_yongdu_gongsi_1.json | 79 +++++++++---------- 11 files changed, 124 insertions(+), 77 deletions(-) diff --git a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml index c7682f0e11..fd5d8ff737 100644 --- a/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-smp/src/main/res/values-xhdpi/dimens.xml @@ -1,6 +1,6 @@ - 40px + 30px 400px 400px diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401019.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401019.java index 9bb5f2f364..6e9397c8f2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401019.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401019.java @@ -1,8 +1,18 @@ package com.mogo.module.v2x.listener; +import android.content.Intent; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + +import com.mogo.module.common.entity.V2XMessageEntity; +import com.mogo.module.common.entity.V2XPushMessageEntity; +import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes; +import com.mogo.module.v2x.utils.TestOnLineCarUtils; +import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.GsonUtil; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; @@ -20,6 +30,24 @@ public class V2XMessageListener_401019 implements IMogoOnMessageListener v2xMessageEntity = new V2XMessageEntity<>(); + // 控制类型 + v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_VR_SHOW); + // 设置数据 + v2xMessageEntity.setContent(message); + // 控制展示状态 + 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); + } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java index 3cb63df494..3ea660f8ca 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java @@ -1,5 +1,6 @@ package com.mogo.module.v2x.observer; +import com.mogo.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.module.v2x.overlay.V2XOptimalRouteOverlay; @@ -17,7 +18,7 @@ public class V2XOptimalRouteObserver extends CarLocationObserver { //最优路线覆盖物绘制 private V2XOptimalRouteOverlay mV2XOptimalRouteOverlay; // 要绘制的数据 - private List polylinePoint; + private List polylinePoint; public static V2XOptimalRouteObserver getInstance() { if (v2XOptimalRouteObserver == null) { @@ -39,7 +40,7 @@ public class V2XOptimalRouteObserver extends CarLocationObserver { * * @param polylinePoint 推荐的路线 */ - public void setPolylinePoint(List polylinePoint) { + public void setPolylinePoint(List polylinePoint) { this.polylinePoint = polylinePoint; } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java index 0e8bd36738..05d607611e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java @@ -39,7 +39,7 @@ public class V2XOptimalRouteOverlay { * * @param polylinePoint 要绘制的经纬度度集合 */ - public IMogoPolyline draw(MogoLocation carLocal, List polylinePoint) { + public IMogoPolyline draw(MogoLocation carLocal, List polylinePoint) { if (mMoGoPolyline != null) { mMoGoPolyline.remove(); mPolylinePointList.clear(); @@ -48,11 +48,10 @@ public class V2XOptimalRouteOverlay { // 将当前车辆位置放进去 mPolylinePointList.add(new MogoLatLng(carLocal.getLatitude(), carLocal.getLongitude())); // 过滤后台推送的推荐路线集合 - for (double[] polyline : polylinePoint) { - MogoLatLng pointMoGoLatLng = new MogoLatLng(polyline[1], polyline[0]); + for (MogoLatLng polyline : polylinePoint) { //需要剔除已经行驶过的经纬度，这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃 - if (LocationUtils.isPointOnCarFront(carLocal, pointMoGoLatLng)) { - mPolylinePointList.add(pointMoGoLatLng); + if (LocationUtils.isPointOnCarFront(carLocal, polyline)) { + mPolylinePointList.add(polyline); } } // 替换路径集合 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java index 222dd1aa0e..5d33724f15 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java @@ -104,11 +104,6 @@ public class V2XScenarioManager implements IV2XScenarioManager { mV2XScenario = new V2XRecommendRouteScenario(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_VR_SHOW: -// if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { -// -// } else { -// mV2XScenario = null; -// } mV2XScenario = new V2XOptimalRouteVREventScenario(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_TOP: diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java index cc0754cbd6..f4a2898d3c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java @@ -3,6 +3,7 @@ package com.mogo.module.v2x.scenario.scene.route; import com.mogo.module.common.entity.V2XPushMessageEntity; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; +import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes; import com.mogo.module.v2x.observer.V2XOptimalRouteObserver; import com.mogo.module.v2x.scenario.view.IV2XMarker; import com.mogo.module.v2x.utils.MarkerUtils; @@ -15,11 +16,11 @@ import com.mogo.utils.logger.Logger; * desc : 推送VR场景 * version: 1.0 */ -public class V2XOptimalRouteVREventMarker implements IV2XMarker { +public class V2XOptimalRouteVREventMarker implements IV2XMarker { private final String TAG = "V2XPushVREventMarker"; @Override - public void drawPOI(V2XPushMessageEntity entity) { + public void drawPOI(V2XOptimalRouteDataRes entity) { Logger.w(V2XConst.MODULE_NAME + "_" + TAG, "drawPOI 绘制VR Marker"); try { @@ -27,21 +28,13 @@ public class V2XOptimalRouteVREventMarker implements IV2XMarker + extends AbsV2XScenario implements IMogoTopViewStatusListener { private String TAG = "V2XPushVREventWindow"; @@ -35,7 +35,7 @@ public class V2XOptimalRouteVREventScenario } @Override - public void init(@Nullable V2XMessageEntity v2XMessageEntity) { + public void init(@Nullable V2XMessageEntity v2XMessageEntity) { Logger.w(V2XConst.MODULE_NAME + "_" + TAG, "处理推送VR：" + GsonUtil.jsonFromObject(v2XMessageEntity)); if (!isSameScenario(v2XMessageEntity) @@ -53,7 +53,7 @@ public class V2XOptimalRouteVREventScenario @Override public void show() { if (getV2XMessageEntity() != null && getV2XMessageEntity().getContent() != null) { - speakTTSVoice(getV2XMessageEntity().getContent().getTts(), null); + speakTTSVoice("已为您选择最优路线", null); drawPOI(); showWindow(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventWindow.java index e63b0d96ae..19e618d4c3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventWindow.java @@ -6,9 +6,9 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; -import com.mogo.module.common.entity.V2XPushMessageEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XServiceManager; +import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes; import com.mogo.module.v2x.listener.V2XWindowStatusListener; import com.mogo.module.v2x.scenario.scene.V2XBasWindow; import com.mogo.module.v2x.scenario.view.IV2XWindow; @@ -24,7 +24,9 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME; * TODO 只有VR演示场景使用 * version: 1.0 */ -public class V2XOptimalRouteVREventWindow extends V2XBasWindow implements IV2XWindow { +public class V2XOptimalRouteVREventWindow + extends V2XBasWindow + implements IV2XWindow { private String TAG = "V2XPushVREventWindow"; // 处理道路事件，30秒倒计时 @@ -54,8 +56,7 @@ public class V2XOptimalRouteVREventWindow extends V2XBasWindow implements IV2XWi * 展示道路事件详情Windows */ @Override - public void show(V2XPushMessageEntity entity) { - Logger.d(MODULE_NAME + "_" + TAG, "V2X==VR=推送消息:展示 Window=\n" + entity); + public void show(V2XOptimalRouteDataRes entity) { countDownV2XEvent(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java index 83710ede41..fe1ff0f375 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java @@ -24,6 +24,7 @@ import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.alarm.V2XAlarmServer; +import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes; import com.mogo.module.v2x.entity.net.V2XSpecialCarRes; import com.mogo.module.v2x.scenario.scene.livecar.V2XVoiceCallLiveBiz; import com.mogo.module.v2x.utils.TestOnLineCarUtils; @@ -378,8 +379,8 @@ public class V2XTestConsoleWindow extends ConstraintLayout { *拥堵路线推荐 * */ btnTriggerCongestedRouteRecommendation.setOnClickListener(v -> { - V2XMessageEntity v2XMessageEntity = - TestOnLineCarUtils.getV2XScenarioPushVR(); + V2XMessageEntity v2XMessageEntity = + TestOnLineCarUtils.getV2XOptimalRoute(); Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java index e47a234730..2fa28eaa94 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java @@ -10,6 +10,7 @@ import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.common.entity.V2XWarningEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; +import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes; import com.mogo.module.v2x.entity.net.V2XSpecialCarRes; import com.mogo.utils.network.utils.GsonUtil; @@ -455,4 +456,37 @@ public class TestOnLineCarUtils { } return null; } + + /** + * 模拟最优路线推送 + */ + public static V2XMessageEntity getV2XOptimalRoute() { + try { + InputStream inputStream = V2XUtils.getApp() + .getResources() + .openRawResource(R.raw.scenario_push_vr_event_data_yongdu_gongsi_1); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + int len = -1; + byte[] buffer = new byte[1024]; + while ((len = inputStream.read(buffer)) != -1) { + baos.write(buffer, 0, len); + } + inputStream.close(); + + // 加载数据源 + V2XOptimalRouteDataRes v2xRoadEventEntity = GsonUtil.objectFromJson(baos.toString(), V2XOptimalRouteDataRes.class); + + V2XMessageEntity v2xMessageEntity = new V2XMessageEntity<>(); + // 控制类型 + v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_VR_SHOW); + // 设置数据 + v2xMessageEntity.setContent(v2xRoadEventEntity); + // 控制展示状态 + v2xMessageEntity.setShowState(true); + return v2xMessageEntity; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } } diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json index ce65c29987..7fbcfe4620 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json @@ -1,45 +1,40 @@ { - "sceneId": "200008", - "alarmContent": "拥堵路线推荐", - "expireTime": 10000, - "sceneCategory": 0, - "sceneDescription": "拥堵路线推荐", - "sceneName": "拥堵路线推荐", - "sceneLevel": 0, - "videoUrl": "", - "videoChannel": "", - "videoSn": "", - "tts": "发现前方拥堵，最优路线快6分钟", - "zoom": false, - "zoomScale": 15, - "userHead": "", - "msgImgUrl": "", - "lat":39.969088, - "lon":116.41808, - "recommendPolyline": [ - [ - 116.417388,39.983351 - ], - [ - 116.417351,39.9841 - ], - [ - 116.417286,39.985423 - ], - [ - 116.417233,39.98673 - ], - [ - 116.417179,39.988156 - ], - [ - 116.417158,39.988493 - ], - [ - 116.417142,39.989245 - ], - [ - 116.417174,39.990199 - ] + "locus_list": [ + { + "lon": 116.417388, + "lat": 39.983351 + }, + { + "lon": 116.417388, + "lat": 39.983351 + }, + { + "lon": 116.417351, + "lat": 39.9841 + }, + { + "lon": 116.417286, + "lat": 39.985423 + }, + { + "lon": 116.417233, + "lat": 39.98673 + }, + { + "lon": 116.417179, + "lat": 39.988156 + }, + { + "lon": 116.417158, + "lat": 39.988493 + }, + { + "lon": 116.417142, + "lat": 39.989245 + }, + { + "lon": 116.417174, + "lat": 39.990199 + } ] } \ No newline at end of file From 39f5764bd6b38719ac0ff8a2507aab7b5ab56a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 15 Apr 2021 16:57:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B0=8F?= =?UTF-8?q?=E5=B7=B4=E8=BD=A6=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java index 1219ca1f8d..eb597d78ac 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java @@ -158,7 +158,7 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese } else if ( isArriveAtStartStation ) { showSlidePanle( "准备出发" ); } else if ( isArriveAtStation ) { - showSlidePanle( "乘客已上车，准备出发" ); + showSlidePanle( "滑动出车" ); } mCurrentStationName.setText( currentStationName );