diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt
index 741fd6480e..706272381a 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt
@@ -62,10 +62,16 @@ class SwitchLineAdapter(
line.taskList,
object : SwitchLineTaskAdapter.TaskItemClickListener {
override fun onItemClick(position: Int,isCheck:Boolean) {
- if(isCheck) {
- checkLineId = line.lineId
- checkTaskId = line.taskList[position].id
- }else{
+ try {
+ if (isCheck) {
+ checkLineId = line.lineId
+ checkTaskId = line.taskList[position].id
+ } else {
+ checkLineId = -1
+ checkTaskId = -1
+ }
+ }catch (e:Exception){
+ e.printStackTrace()
checkLineId=-1
checkTaskId=-1
}
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
index 932ad16fe8..8999c7ab14 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
@@ -30,10 +30,6 @@ class AdvanceVideoView @JvmOverloads constructor(
private var videoRelativeLayout: RelativeLayout? = null
private var cacheImage: ImageView? = null
- private var connerTopLeft: ImageView? = null
- private var connerTopRight: ImageView? = null
- private var connerBottomLeft: ImageView? = null
- private var connerBottomRight: ImageView? = null
private var videoViewPlayer: AdvanceGSYVideoPlayer? = null
private var gsyVideoOptionBuilder: GSYVideoOptionBuilder? = null
@@ -44,7 +40,7 @@ class AdvanceVideoView @JvmOverloads constructor(
private var mVideoDirPath: String? = ""
init {
- mVideoDirPath = context.filesDir.absolutePath+ File.separator + "video" + File.separator
+ mVideoDirPath = context.filesDir.absolutePath + File.separator + "video" + File.separator
// mVideoDirPath = Config.downLoadPath
initView()
}
@@ -63,7 +59,7 @@ class AdvanceVideoView @JvmOverloads constructor(
private fun initVideoView() {
videoRelativeLayout = RelativeLayout(context)
val outLayout = LayoutParams(-1, -1)
- addView(videoRelativeLayout,outLayout)
+ addView(videoRelativeLayout, outLayout)
if (videoViewPlayer === null) {
//视频播放控件
@@ -78,49 +74,15 @@ class AdvanceVideoView @JvmOverloads constructor(
layoutParams.addRule(ALIGN_PARENT_BOTTOM)
videoRelativeLayout?.addView(videoViewPlayer, layoutParams)
-
- val imageSize = AutoSizeUtils.dp2px(context, 25f)
- if(connerTopLeft==null){
- connerTopLeft = ImageView(context)
- connerTopLeft?.setImageResource(R.drawable.m2_video_top_left)
- }
- val layoutParentTopLeft = LayoutParams(imageSize, imageSize)
- layoutParentTopLeft.addRule(ALIGN_PARENT_TOP)
- layoutParentTopLeft.addRule(ALIGN_PARENT_LEFT)
- videoRelativeLayout?.addView(connerTopLeft, layoutParentTopLeft)
- if(connerTopRight==null){
- connerTopRight = ImageView(context)
- connerTopRight?.setImageResource(R.drawable.m2_video_top_right)
- }
- val layoutParentTopRight = LayoutParams(imageSize, imageSize)
- layoutParentTopRight.addRule(ALIGN_PARENT_TOP)
- layoutParentTopRight.addRule(ALIGN_PARENT_RIGHT)
- videoRelativeLayout?.addView(connerTopRight, layoutParentTopRight)
- if(connerBottomLeft==null){
- connerBottomLeft = ImageView(context)
- connerBottomLeft?.setImageResource(R.drawable.m2_video_bottom_left)
- }
- val layoutParentBottomLeft = LayoutParams(imageSize, imageSize)
- layoutParentBottomLeft.addRule(ALIGN_PARENT_BOTTOM)
- layoutParentBottomLeft.addRule(ALIGN_PARENT_LEFT)
- videoRelativeLayout?.addView(connerBottomLeft, layoutParentBottomLeft)
- if(connerBottomRight==null){
- connerBottomRight = ImageView(context)
- connerBottomRight?.setImageResource(R.drawable.m2_video_bottom_right)
- }
- val layoutParentBottomRight = LayoutParams(imageSize, imageSize)
- layoutParentBottomRight.addRule(ALIGN_PARENT_RIGHT)
- layoutParentBottomRight.addRule(ALIGN_PARENT_BOTTOM)
- videoRelativeLayout?.addView(connerBottomRight, layoutParentBottomRight)
}
- fun setVideoPath(path: String,cacheImageUrl: String) {
+ fun setVideoPath(path: String, cacheImageUrl: String) {
// https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v
// https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4
this.fileNetPath = path
this.cacheImageUrl = cacheImageUrl
val pathList = path.split("/")
- if (pathList.isNotEmpty()){
+ if (pathList.isNotEmpty()) {
this.downloadVideoName = pathList[pathList.size - 1]
}
}
@@ -129,7 +91,7 @@ class AdvanceVideoView @JvmOverloads constructor(
// BitmapHelper.getVideoThumbnail(path) /*获取第一帧图*
// OCHThreadPoolManager.getsInstance().execute {
// var bitmap = BitmapHelper.getVideoThumbnail(fileNetPath)
- Logger.d(ImageAndVideoRotation.TAG, "setVideoPath")
+ Logger.d(ImageAndVideoRotation.TAG, "setVideoPath")
// ThreadUtils.runOnUiThread {
// Logger.d(ImageAndVideoRotation.TAG, "bitmap加载")
cacheImage?.setImageResource(R.drawable.m2_p_video_holder)
@@ -150,9 +112,10 @@ class AdvanceVideoView @JvmOverloads constructor(
// }
}
- fun clearLocalErrorVideo(){
+ fun clearLocalErrorVideo() {
if (downloadVideoName.isNotEmpty()
- && FileUtils.isFileExists(mVideoDirPath + downloadVideoName)){
+ && FileUtils.isFileExists(mVideoDirPath + downloadVideoName)
+ ) {
FileUtils.delete(mVideoDirPath + downloadVideoName)
}
}
@@ -178,28 +141,30 @@ class AdvanceVideoView @JvmOverloads constructor(
Logger.d(ImageAndVideoRotation.TAG, "setVideo")
mOnCompletionListener = onCompletionListener
//判断是否已经下载
- if (downloadVideoName.isNotEmpty()){
- Logger.d(ImageAndVideoRotation.TAG,
+ if (downloadVideoName.isNotEmpty()) {
+ Logger.d(
+ ImageAndVideoRotation.TAG,
"video local url = $mVideoDirPath$downloadVideoName"
)
- if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){
+ if (FileUtils.isFileExists(mVideoDirPath + downloadVideoName)) {
Logger.d(ImageAndVideoRotation.TAG, "have cache startPlay")
- startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
+ startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString())
return
}
startDownLoadVideo()
}
}
- private fun startDownLoadVideo(){
+ private fun startDownLoadVideo() {
//下载视频， 下载成功后再播放
Logger.d(ImageAndVideoRotation.TAG, "startDownLoadVideo")
FileUtils.createFileDir(mVideoDirPath)
- DownloadUtils.downLoad(context,fileNetPath,mVideoDirPath
- ,downloadVideoName,5,downListener)
+ DownloadUtils.downLoad(
+ context, fileNetPath, mVideoDirPath, downloadVideoName, 5, downListener
+ )
}
- fun startPlay(localVideoPath: String?){
+ fun startPlay(localVideoPath: String?) {
if (localVideoPath === "") return
try {
Logger.d(ImageAndVideoRotation.TAG, "startPlay")
@@ -215,12 +180,12 @@ class AdvanceVideoView @JvmOverloads constructor(
videoViewPlayer?.isFocusableInTouchMode = false
videoViewPlayer?.setVideoAllCallBack(mOnCompletionListener)
videoViewPlayer?.startPlayLogic()
- }catch (e: Exception){
+ } catch (e: Exception) {
Logger.d(ImageAndVideoRotation.TAG, "startPlay e = ${e.message}")
}
}
- fun onVideoReset(){
+ fun onVideoReset() {
videoViewPlayer?.onVideoReset()
mOnCompletionListener = null
}
@@ -237,7 +202,7 @@ class AdvanceVideoView @JvmOverloads constructor(
}
}
- private val downListener = object : IDownload{
+ private val downListener = object : IDownload {
override fun onStart(url: String?) {
setCacheImageViewVisible()
Logger.d(ImageAndVideoRotation.TAG, "download-onStart")
@@ -257,21 +222,23 @@ class AdvanceVideoView @JvmOverloads constructor(
override fun onFinished(url: String?, threadBean: ThreadBean?) {
Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = $url")
- if (url.equals(fileNetPath)){ //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题
+ if (url.equals(fileNetPath)) { //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题
//下载完成
ThreadUtils.runOnUiThread {
- startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
+ startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString())
}
- }else{//如果当前文件不存在再次去下载当前的
- Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = not current" +
- ",currentUrl = $fileNetPath ")
- if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){
+ } else {//如果当前文件不存在再次去下载当前的
+ Logger.d(
+ ImageAndVideoRotation.TAG, "download-onFinished = not current" +
+ ",currentUrl = $fileNetPath "
+ )
+ if (FileUtils.isFileExists(mVideoDirPath + downloadVideoName)) {
Logger.d(ImageAndVideoRotation.TAG, "have download startPlay")
ThreadUtils.runOnUiThread {
- startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
+ startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString())
}
return
- }else{
+ } else {
startDownLoadVideo()
}
}
@@ -281,7 +248,7 @@ class AdvanceVideoView @JvmOverloads constructor(
Logger.d(ImageAndVideoRotation.TAG, "download-onError-$errorMsg")
//出错再次下载
if (errorMsg != null) {
- if (errorMsg.startsWith("initFailed")){
+ if (errorMsg.startsWith("initFailed")) {
startDownLoadVideo()
}
}
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png
index fd161d3dd6..6f0795edaf 100644
Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png differ
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png
index ad3bd7fda7..1f6ea692f5 100644
Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png differ
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png
index 539077b16b..5e1fb2c752 100644
Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png differ
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png
index 7b76bef075..19ae887a57 100644
Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png differ
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png
index 8c3e9278f8..3fb0a40ce3 100644
Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png differ
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png
index 7e245de50c..dbc80b2254 100644
Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png differ
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml
index 30d343900d..648b1a9c96 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
index 2dbbcac38a..ae19ca5741 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
@@ -45,7 +45,7 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
index a40c28419a..10af0a7b63 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
@@ -85,6 +85,16 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml
index 20461e6c5a..dc4f1090d5 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml
@@ -16,7 +16,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_gravity="center"
- android:layout_marginStart="@dimen/dp_50" />
+ android:layout_marginStart="@dimen/dp_40" />
@@ -64,8 +64,8 @@
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/m2_status_bar_logo"
android:scaleType="fitXY"
- android:layout_width="@dimen/dp_96"
- android:layout_height="@dimen/dp_28"/>
+ android:layout_width="@dimen/dp_94"
+ android:layout_height="@dimen/dp_25"/>
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
index ec59b620fe..40e7769b2b 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
@@ -31,8 +31,8 @@
#6617417B
#17417B
#2D3E5F
- #1F860D
- #B9E7C0
+ #34A61F
+ #AEEDB8
#43CEFE
#1466FB
#7094AD
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt
index 624477723d..971e7b2af2 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt
@@ -12,7 +12,6 @@ class AiCloudSocketBizProvider : IMoGoFunctionServerProvider {
get() = "AiCloudSocketBizProvider"
override fun init(context: Context?) {
- //todo bus加载
context?.let {
SocketManager.getInstance().init(it, 0.0, 0.0)
SocketManager.getInstance().registerOnMessageListener(401012, V2XMessageListener401012())
diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
index f22ffd93a5..763e91b5f1 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
@@ -569,7 +569,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
TrafficLightEnum.BLACK,
-1,
- DataSourceType.TELEMATIC
+ DataSourceType.OBU
)
}
// 红灯
@@ -578,7 +578,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
TrafficLightEnum.RED,
red,
- DataSourceType.TELEMATIC
+ DataSourceType.OBU
)
}
// 绿灯
@@ -587,7 +587,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
TrafficLightEnum.GREEN,
green,
- DataSourceType.TELEMATIC
+ DataSourceType.OBU
)
}
// 黄灯
@@ -596,7 +596,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
TrafficLightEnum.YELLOW,
yellow,
- DataSourceType.TELEMATIC
+ DataSourceType.OBU
)
}
}
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 7486d917f1..0aaa533b50 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -2061,11 +2061,11 @@ internal class DebugSettingView @JvmOverloads constructor(
}
override fun onLogCatch(lineLog: String) {
- logInfoView?.let {
- if (logViewAttach) {
- it.onLogCatch(lineLog)
- }
- }
+// logInfoView?.let {
+// if (logViewAttach) {
+// it.onLogCatch(lineLog)
+// }
+// }
}
private fun restartApp() {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index de3da3b4da..8ab5d63bac 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -1968,6 +1968,7 @@
android:layout_margin="2dp"
android:padding="@dimen/dp_20"
android:gravity="center"
+ android:visibility="gone"
android:textOff="展示日志过滤面板"
android:textOn="关闭日志过滤面板"
android:textSize="@dimen/dp_24" />
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
index b2400ffa9a..dd01df2f90 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
@@ -65,10 +65,10 @@ object TrackerSourceColorHelper {
//僵尸车
if(data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE){
- color = "#AD7488FF"
+ color = "#7A8499FF"
CallerMapUIServiceManager.getMapUIController()?.let {
if(it.isDayMode){
- color = "#AE7887FF"
+ color = "#9BA8BCFF"
}
}
}
diff --git a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d
index 55c7942ec7..da40d786d6 100644
Binary files a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d and b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d differ
diff --git a/core/mogo-core-res/src/main/res/raw/cuzuche.nt3d b/core/mogo-core-res/src/main/res/raw/cuzuche.nt3d
new file mode 100644
index 0000000000..55c7942ec7
Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/cuzuche.nt3d differ
diff --git a/gradle.properties b/gradle.properties
index a80d2290f6..0dfa2aba59 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,7 +63,7 @@ BIZCONFIG_VERSION=1.3.2
SERVICE_BIZ_VERSION=1.2.4
################ 外部依赖引用 ################
# loglib
-LOGLIB_VERSION=1.5.25
+LOGLIB_VERSION=1.5.26
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
MOGO_NETWORK_VERSION=1.4.6.6
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
index db7f17f988..6924f0926f 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
@@ -23,6 +23,7 @@ import com.mogo.map.utils.ObjectUtils;
import com.zhidaoauto.map.sdk.open.MapAutoApi;
import com.zhidaoauto.map.sdk.open.data.MapDataApi;
import com.zhidaoauto.map.sdk.open.data.SinglePointRoadInfo;
+import com.zhidaoauto.map.sdk.open.marker.BatchMarkerOptions;
import com.zhidaoauto.map.sdk.open.marker.Marker;
import com.zhidaoauto.map.sdk.open.marker.MarkerHelper;
import com.zhidaoauto.map.sdk.open.marker.MarkerOptions;
@@ -114,6 +115,8 @@ public class AMapWrapper implements IMogoMap {
}
}
+ BatchMarkerOptions batchMarkerOptions = new BatchMarkerOptions();
+
@SuppressLint("NewApi")
@Override
public void updateBatchMarkerPosition(HashMap optionsArrayList) {
@@ -134,9 +137,17 @@ public class AMapWrapper implements IMogoMap {
return;
}
long time = markerOptionsArrayList.get(0).getTime();
- MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
+ batchMarkerOptions.list = markerOptionsArrayList;
+ batchMarkerOptions.delayStrategy = false;
+ batchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f;
+ batchMarkerOptions.controlIcon = 1;
+ batchMarkerOptions.duration = (int) time;
+ batchMarkerOptions.deleteRule = 1;
+ MarkerHelper.INSTANCE.updateBatchMarkerPositon(batchMarkerOptions);
}
+ BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions();
+
@SuppressLint("NewApi")
@Override
public void updateBatchAiMarkerPosition(HashMap optionsArrayList) {
@@ -158,7 +169,13 @@ public class AMapWrapper implements IMogoMap {
}
long time = markerOptionsArrayList.get(0).getTime();
// 最后一个参数，是否管理锚点的删除
- MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
+ aiBatchMarkerOptions.list = markerOptionsArrayList;
+ aiBatchMarkerOptions.delayStrategy = false;
+ aiBatchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f;
+ aiBatchMarkerOptions.controlIcon = 1;
+ aiBatchMarkerOptions.duration = (int) time;
+ aiBatchMarkerOptions.deleteRule = 1;
+ MarkerHelper.INSTANCE.updateBatchMarkerPositon(aiBatchMarkerOptions);
}
@Override