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

[2.13.2] add trajectory of map

Browse Source
This commit is contained in:
zhongchao
2023-01-15 17:49:54 +08:00
parent 1b2a18dc57
commit 98ca64ef59
10 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
View File

@@ -150,7 +150,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
} else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
if (FunctionBuildConfig.isRomaMode) {
MogoMapUIController.getInstance().setRomaMode();
MogoMapUIController.getInstance().setRomaMode(1);
} else {
Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
View File

@@ -137,7 +137,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
} else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
if (FunctionBuildConfig.isRomaMode) {
MogoMapUIController.getInstance().setRomaMode();
MogoMapUIController.getInstance().setRomaMode(1);
} else {
Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);

2
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
View File

@@ -187,7 +187,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
} else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
if (FunctionBuildConfig.isRomaMode) {
MogoMapUIController.getInstance().setRomaMode();
MogoMapUIController.getInstance().setRomaMode(1);
} else {
Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);

3
config.gradle
View File

@@ -1,6 +1,7 @@
ext {
time = ""
kotlin_version = "1.4.31"
// kotlin_version = "1.4.31"
kotlin_version = "1.5.0"
dependencies = [
// androidx
androidxappcompat : "androidx.appcompat:appcompat:1.3.1",

10
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt
View File

@@ -9,6 +9,7 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import com.mogo.eagle.core.data.enums.EventTypeEnum
import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.msgbox.*
import com.mogo.eagle.core.data.report.ReportEntity
@@ -227,8 +228,13 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : RecyclerView.Ada
val v2XMsg = msgBoxBean.bean as V2XMsg
holder.tvV2XTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
holder.tvV2XContent.text = v2XMsg.content
holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable(
EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)))
if(msgBoxBean.type == MsgBoxType.OBU){
holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable(
EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)))
}else{
holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable(
EventTypeEnum.getUpdateIconRes(v2XMsg.type)))
}
}
}
is MsgBoxSummary -> {

2
gradle.properties
View File

@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.3.27
MOGO_TELEMATIC_VERSION=1.4.3.27
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.8.0.11
MAP_SDK_VERSION=2.9.0.14_test_03
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket
WEBSOCKET_VERSION=1.1.7

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

@@ -46,9 +46,15 @@ public interface IMogoMapUIController {
void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng);
/**
* 设置漫游模式
* 设置漫游路径
* @param trajectory
*/
void setRomaMode();
void setRoamTrajectory(String trajectory);
/**
* 设置漫游模式 , 0:自由漫游，1:路径漫游
*/
void setRomaMode(int mode);
/**
* 获得当前地图视距模式

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

File diff suppressed because one or more lines are too long

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

@@ -78,11 +78,11 @@ public class MogoMapUIController implements IMogoMapUIController {
}
@Override
public void setRomaMode() {
public void setRomaMode(int mode) {
initDelegate();
if (mDelegate != null) {
CallerLogger.INSTANCE.d(TAG, "set setRomaMode: ");
mDelegate.setRomaMode();
CallerLogger.INSTANCE.d(TAG, "set setRomaMode: " + mode);
mDelegate.setRomaMode(mode);
}
}

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

@@ -69,9 +69,16 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public void setRomaMode() {
public void setRoamTrajectory(String trajectory) {
if (mClient != null) {
mClient.setRomaMode();
mClient.setRoamTrajectory(trajectory);
}
}
@Override
public void setRomaMode(int mode) {
if (mClient != null) {
mClient.setRomaMode(mode);
}
}