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

[6.0.0] roam change

Browse Source
This commit is contained in:
zhongchao
2023-09-04 21:20:56 +08:00
parent a33276ca15
commit 76a32254da
22 changed files with 265 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
View File

@@ -290,9 +290,16 @@
app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_badcase_rl"
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl"
app:layout_constraintTop_toTopOf="@id/module_mogo_och_badcase_rl"
app:roma_open_bg="@drawable/bus_operation_status_select_bg"
app:roma_close_bg="@drawable/bus_operation_status_bg"
/>
app:roma_open_bg="@drawable/bus_operation_status_select_bg" />
<com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<com.mogo.och.bus.view.SlidePanelView
android:id="@+id/module_mogo_och_slide_panel"

38
OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
View File

@@ -8,15 +8,15 @@
android:id="@+id/mapBizView"
android:layout_width="1810dp"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.och.bus.passenger.ui.BusPStatusBarView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugViewTrigger
android:layout_width="@dimen/dp_400"
@@ -30,14 +30,23 @@
android:id="@+id/romaPView"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_marginLeft="10dp"
android:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/roma_bus_p_bg_selector"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_20"
android:layout_marginLeft="10dp"
app:layout_constraintLeft_toRightOf="@+id/video_switch_iv"
app:roma_close="@drawable/roma_bus_p_bg_selector"
app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" />
<!-- <com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView-->
<!-- android:layout_width="@dimen/dp_334"-->
<!-- android:layout_height="@dimen/dp_120"-->
<!-- android:layout_marginLeft="@dimen/dp_50"-->
<!-- android:layout_marginBottom="@dimen/dp_20"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/romaPView"-->
<!-- app:roma_change_dis_color="true" />-->
<!--pnc行为决策-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
android:layout_width="wrap_content"
@@ -55,7 +64,7 @@
android:layout_marginTop="@dimen/dp_112"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:id="@+id/bus_p_route_panel"
@@ -67,23 +76,22 @@
<com.mogo.eagle.core.function.hmi.ui.msgbox.BusPassengerMsgBoxBubbleView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginLeft="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_100"
/>
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/video_switch_iv"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:src="@drawable/video_btn_selector"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:scaleType="fitCenter"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"/>
android:layout_marginBottom="@dimen/dp_20"
android:scaleType="fitCenter"
android:src="@drawable/video_btn_selector"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

8
OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -317,6 +317,14 @@
app:roma_close_bg="@drawable/taxi_operation_status_bg"
/>
<com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintRight_toRightOf="parent" />
<!-- <LinearLayout-->
<!-- android:id="@+id/module_och_taxi_ai_collect_ll"-->
<!-- android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"-->

9
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -81,6 +81,15 @@
app:roma_close="@drawable/roma_taxi_p_bg_selector"
app:roma_open="@drawable/taxi_p_roma_checked" />
<!-- <com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView-->
<!-- android:layout_width="@dimen/dp_334"-->
<!-- android:layout_height="@dimen/dp_120"-->
<!-- android:layout_marginLeft="@dimen/dp_50"-->
<!-- android:layout_marginTop="100dp"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/romaPView"-->
<!-- app:roma_change_dis_color="true"/>-->
<TextView
android:id="@+id/rv_location_center"
android:layout_width="@dimen/dp_96"

7
OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -315,6 +315,13 @@
app:roma_close_bg="@drawable/taxi_operation_status_bg"
/>
<com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<!-- <LinearLayout-->
<!-- android:id="@+id/module_och_taxi_ai_collect_ll"-->
<!-- android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"-->

69
OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -9,20 +8,19 @@
android:id="@+id/overMapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:resetDrawable="@null"
app:startPointDrawable="@drawable/taxi_p_map_view_dir_start"
app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
app:arrivedDrawable="@drawable/taxi_overmap_arrived"
app:bottomPadding="160"
app:carDrawable="@drawable/taxi_p_map_car"
app:compassDrawable="@drawable/taxi_p_map_car_light"
app:arrivedDrawable="@drawable/taxi_overmap_arrived"
app:unArrivedDrawable="@drawable/taxi_overmap_arriving"
app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
app:leftPadding="800"
app:mapStyleExtraPath="style_extra.data"
app:mapStylePath="style.data"
app:leftPadding="800"
app:resetDrawable="@null"
app:rightPadding="160"
app:startPointDrawable="@drawable/taxi_p_map_view_dir_start"
app:topPadding="160"
app:bottomPadding="160"
/>
app:unArrivedDrawable="@drawable/taxi_overmap_arriving" />
<!-- 视频播放View -->
<com.mogo.och.taxi.passenger.ui.video.InfoVideoView
@@ -34,7 +32,7 @@
<com.mogo.eagle.core.function.view.MapBizView
android:id="@+id/mapBizView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<!--pnc行为决策-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
@@ -42,11 +40,11 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_90"
android:layout_marginBottom="@dimen/dp_255"
app:pnc_size="@dimen/dp_44"
app:background_resource="@drawable/taxi_p_pnc_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:pnc_size="@dimen/dp_44" />
<CheckBox
android:id="@+id/ck_setting"
@@ -81,6 +79,16 @@
app:roma_close="@drawable/roma_taxi_p_bg_selector"
app:roma_open="@drawable/taxi_p_roma_checked" />
<!-- <com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView-->
<!-- android:layout_width="@dimen/dp_334"-->
<!-- android:layout_height="@dimen/dp_120"-->
<!-- android:layout_marginLeft="@dimen/dp_50"-->
<!-- android:layout_marginTop="100dp"-->
<!-- android:background="@drawable/layer_roma_distance_bg"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/romaPView"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:roma_change_dis_color="true" />-->
<TextView
android:id="@+id/rv_location_center"
android:layout_width="@dimen/dp_96"
@@ -101,19 +109,17 @@
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:traffic_light_user="traffic_light_taxi_p"
/>
app:traffic_light_user="traffic_light_taxi_p" />
<!--转向灯-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
android:layout_marginTop="@dimen/dp_100"
android:layout_marginEnd="@dimen/dp_40"
app:user="taxi_p"
/>
app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
app:layout_constraintTop_toTopOf="parent"
app:user="taxi_p" />
<!-- 路程信息 -->
<com.mogo.och.taxi.passenger.ui.orderinfo.ItineraryView
@@ -125,11 +131,11 @@
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="无人化"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
app:layout_constraintStart_toStartOf="parent" />
<!-- 底部导航栏 -->
<com.mogo.och.taxi.passenger.ui.bottom.BottomBar
@@ -140,27 +146,26 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_xiaozhi_normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_216"
android:layout_marginEnd="@dimen/dp_82"
android:layout_marginBottom="@dimen/dp_28"
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_216"/>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<!--气泡态消息盒子-->
<com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
android:layout_marginEnd="@dimen/dp_40"
/>
app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
app:layout_constraintEnd_toEndOf="parent" />
<com.mogo.och.taxi.passenger.ui.debug.DebugView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_120"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_120"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaBusView.kt
View File

@@ -57,7 +57,7 @@ class RomaBusView @JvmOverloads constructor(
}
setOnClickListener {
if (ClickUtils.isClickTooFrequent(this,1000)) {
if (ClickUtils.isClickTooFrequent(this,2500)) {
return@setOnClickListener
}
if(!click){

79
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaDistanceView.kt Normal file
View File

@@ -0,0 +1,79 @@
package com.mogo.eagle.core.function.hmi.ui.widget
import android.content.Context
import android.text.Html
import android.util.AttributeSet
import android.util.Log
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
import com.mogo.eagle.core.function.hmi.R
import kotlinx.android.synthetic.main.view_roma_distance.view.*
import me.jessyan.autosize.utils.AutoSizeUtils
class RomaDistanceView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr) , IMoGoRomaListener {
companion object {
private const val TAG = "RomaDistanceView"
}
private var disChangeColor = false
init {
LayoutInflater.from(context).inflate(R.layout.view_roma_distance, this, true)
val a = context.obtainStyledAttributes(
attrs,
R.styleable.RomaDistanceView,
defStyleAttr,
0
)
// val distanceBg = a.getResourceId(R.styleable.RomaDistanceView_roma_distance_bg,0)
// if(distanceBg != 0){
// romaDistanceBg.background = resources.getDrawable(distanceBg)
// }
val txtSize = a.getInteger(R.styleable.RomaDistanceView_roma_txt_size,35)
romaDistanceMeter.setTextSize(TypedValue.COMPLEX_UNIT_PX,
AutoSizeUtils.dp2px(getContext(),txtSize.toFloat()).toFloat())
val txtDisColor = a.getBoolean(R.styleable.RomaDistanceView_roma_change_dis_color,false)
disChangeColor = txtDisColor
a.recycle()
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerMapRomaListener.addListener(TAG, this)
}
override fun romaStatus(status: Boolean) {
super.romaStatus(status)
if (status) {
romaDistanceBg.visibility = View.VISIBLE
} else {
romaDistanceBg.visibility = View.GONE
romaDistanceMeter.text = ""
}
}
override fun romaDistance(distance: String) {
super.romaDistance(distance)
val dis = distance.toDouble().toInt()
Log.i(TAG, "romaDistance:$distance")
if(disChangeColor){
romaDistanceMeter.text = Html.fromHtml("漫游距离<font color='#0752C3'>${dis}米</font>")
}else{
romaDistanceMeter.text = "漫游距离${dis}米"
}
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerMapRomaListener.removeListener(TAG)
}
}

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt
View File

@@ -55,7 +55,7 @@ class RomaTaxiView @JvmOverloads constructor(
}
setOnClickListener {
if (ClickUtils.isClickTooFrequent(this,1000)) {
if (ClickUtils.isClickTooFrequent(this,2500)) {
return@setOnClickListener
}
if(!click){

7
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/layer_roma_distance_bg.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/roma_distance_bg"
android:width="@dimen/dp_334"
android:height="@dimen/dp_120"/>
</layer-list >

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/roma_distance_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

22
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_distance.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/romaDistanceBg"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/romaDistanceMeter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:textStyle="bold"
android:textSize="@dimen/dp_35"
android:textColor="@android:color/white"/>
</androidx.constraintlayout.widget.ConstraintLayout>

6
core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml
View File

@@ -102,4 +102,10 @@
<attr name="roma_close_bg" format="reference"/>
</declare-styleable>
<declare-styleable name="RomaDistanceView">
<attr name="roma_distance_bg" format="reference"/>
<attr name="roma_txt_size" format="reference"/>
<attr name="roma_change_dis_color" format="boolean"/>
</declare-styleable>
</resources>

11
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
View File

@@ -55,7 +55,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
private const val H_ERROR_MAP = 2
private const val H_DELAY_TIME = 3_000L
var START_METRE = 3
var START_METRE = 200
var END_METRE = 2000
@JvmStatic
@@ -164,12 +164,14 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
}
private fun openRoma() {
CallerMapUIServiceManager.getMapUIController()?.visualAngleLock(true)
updateLongSightLevel(true)
requestRangeOfIdentify(true)
}
@Synchronized
private fun closeRoma(manual: Boolean = true) {
CallerMapUIServiceManager.getMapUIController()?.visualAngleLock(false)
updateLongSightLevel(false)
requestRangeOfIdentify(false)
MapIdentifySubscriber.instance.clearAiCloudRoma()
@@ -260,11 +262,14 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
mutableMapOf("romaStart" to "地图漫游动画结束,开始漫游")
)
showAiCloud.set(true)
FunctionBuildConfig.isDrawIdentifyData = false
// FunctionBuildConfig.isDrawIdentifyData = false
CallerMapRomaListener.invokeMapRoma(true)
// 5秒没有触发 则预警日志写入
handler.sendEmptyMessageDelayed(H_ERROR_CLOUD, H_DELAY_TIME)
}
5 -> {
CallerMapRomaListener.invokeRomaDistance(msg)
}
1 -> {
val m = Message.obtain()
m.what = H_ERROR_MAP
@@ -296,7 +301,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
showAiCloud.set(false)
aiCloudDataChange.set(false)
MapIdentifySubscriber.instance.clearAiCloudRoma()
FunctionBuildConfig.isDrawIdentifyData = true
// FunctionBuildConfig.isDrawIdentifyData = true
CallerMapRomaListener.invokeMapRoma(false)
if (invokeCloud) {
closeRoma(false)

5
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/roma/IMoGoRomaListener.kt
View File

@@ -11,4 +11,9 @@ interface IMoGoRomaListener {
* 漫游状态回调
*/
fun romaStatus(status:Boolean){}
/**
* 漫游距自车的距离
*/
fun romaDistance(distance:String){}
}

8
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRomaListener.kt
View File

@@ -29,4 +29,12 @@ object CallerMapRomaListener : CallerBase<IMoGoRomaListener>() {
listener.romaStatus(romaStatus)
}
}
fun invokeRomaDistance(distance: String) {
M_LISTENERS.forEach {
val listener = it.value
listener.romaDistance(distance)
}
}
}

2
gradle.properties
View File

@@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.16
MOGO_TELEMATIC_VERSION=1.4.7.16
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.14.3.7
MAP_SDK_VERSION=2.14.3.9
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket
WEBSOCKET_VERSION=1.1.7

6
libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
View File

@@ -59,6 +59,12 @@ public interface IMogoMapUIController {
*/
void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng);
/**
* 切换视角锁定，用于启动/关闭漫游
* @param lock 锁定值
*/
void visualAngleLock(boolean lock);
/**
* 设置漫游路径
* @param trajectory

11
libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
View File

@@ -123,6 +123,8 @@ public class AMapViewWrapper implements IMogoMapView,
private IHdCacheListener hdCacheListener;
private volatile boolean visualLock = false;
public AMapViewWrapper(MapAutoView mMapView) {
CallerLogger.i(M_MAP + TAG, "autoop--AMapViewWrapper: init");
this.mMapView = mMapView;
@@ -337,6 +339,10 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) {
if(visualLock){
CallerLogger.e(M_MAP + TAG, "视角切换已锁定");
return;
}
MapAutoViewHelper mapAutoViewHelper = mMapView.getMapAutoViewHelper();
if (mapAutoViewHelper != null) {
mVisualAngleMode = angelMode;
@@ -353,6 +359,11 @@ public class AMapViewWrapper implements IMogoMapView,
}
}
@Override
public void visualAngleLock(boolean lock) {
visualLock = lock;
}
@ChainLog(
linkChainLog = CHAIN_TYPE_HD_MAP,
linkCode = CHAIN_SOURCE_MAP,

2
libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
View File

@@ -139,7 +139,7 @@ public class AMapWrapper implements IMogoMap {
}
long time = markerOptionsArrayList.get(0).getTime();
batchMarkerOptions.list = markerOptionsArrayList;
// batchMarkerOptions.averageFlag = 0;
batchMarkerOptions.averageFlag = 0;
batchMarkerOptions.delayStrategy = false;
batchMarkerOptions.ruleAngle = 8.0f;
batchMarkerOptions.controlIcon = 1;

10
libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
View File

@@ -2,7 +2,6 @@ package com.mogo.map;
import android.graphics.Point;
import android.graphics.Rect;
import android.location.Location;
import android.view.View;
import com.mogo.eagle.core.data.map.CenterLine;
@@ -93,6 +92,15 @@ public class MogoMapUIController implements IMogoMapUIController {
}
}
@Override
public void visualAngleLock(boolean lock) {
initDelegate();
if (mDelegate != null) {
CallerLogger.d(TAG, "visualAngleLock: " + lock);
mDelegate.visualAngleLock(lock);
}
}
@Override
public void setRoamTrajectory(String trajectory) {
initDelegate();

7
libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
View File

@@ -77,6 +77,13 @@ public class AMapUIController implements IMogoMapUIController {
}
}
@Override
public void visualAngleLock(boolean lock) {
if (mClient != null) {
mClient.visualAngleLock(lock);
}
}
@Override
public void setRoamTrajectory(String trajectory) {
if (mClient != null) {