From 300e4b2b39bdea1866cfa655202f7401907a6785 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Wed, 25 Dec 2024 18:54:53 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.4][Feat]=E6=96=B0=E5=A2=9E=E7=93=A6?=
 =?UTF-8?q?=E7=89=87=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?,=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/setting/DebugSettingView.kt        | 13 +++++++++
 .../main/res/layout/view_debug_setting.xml    | 16 +++++++++++
 gradle.properties                             |  3 +-
 libraries/mapmodule/build.gradle              |  2 +-
 .../src/main/java/com/mogo/map/IMogoData.kt   |  6 ++++
 .../main/java/com/mogo/map/MapDataWrapper.kt  | 12 ++++++++
 .../java/com/mogo/map/TileFileLogCallback.kt  | 28 +++++++++++++++++++
 7 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/TileFileLogCallback.kt

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 17d52a5c62..e9f5787c40 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
@@ -338,6 +338,7 @@ import kotlin.collections.set
 import kotlin.math.abs
 import kotlin.system.exitProcess
 import com.mogo.eagle.core.function.hmi.ui.tools.ShowDevicesManagerStateDialog
+import kotlinx.android.synthetic.main.view_debug_setting.view.tbTileFileLog
 
 
 /**
@@ -1188,6 +1189,18 @@ internal class DebugSettingView @JvmOverloads constructor(
             CallerMapUIServiceManager.getMapUIController()?.setIsDrawPointCloud(isChecked)
             CallerSopSettingManager.invokePointCloudListener(isChecked)
         }
+        tbTileFileLog.setOnCheckedChangeListener { compoundButton, isChecked ->
+            if (!compoundButton.isPressed) {
+                return@setOnCheckedChangeListener
+            }
+            if (isChecked) {
+                mogoMapData.get()?.openTileFileLog(true)
+                mogoMapData.get()?.listenTileFileLog()
+            } else {
+                mogoMapData.get()?.openTileFileLog(false)
+                mogoMapData.get()?.stopListenTileFileLog()
+            }
+        }
 
         //设置点云大小
         btnPointCloudSize.setOnClickListener {
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 a39a16afc2..f1ecdf7c4f 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
@@ -1904,6 +1904,22 @@
                         app:layout_constraintRight_toRightOf="@id/tbChangeAutoPilotStatus"
                         app:layout_constraintTop_toBottomOf="@id/tbChangeAutoPilotStatus"
                         />
+
+                    <ToggleButton
+                        android:id="@+id/tbTileFileLog"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
+                        android:textColor="#000"
+                        android:textOff="开启地图瓦片日志"
+                        android:textOn="关闭地图瓦片日志"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toRightOf="@id/tbDrawPointCloudData"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tbCarAperture"
+                        />
+
                     <Button
                         android:id="@+id/btnPointCloudSize"
                         android:layout_width="wrap_content"
diff --git a/gradle.properties b/gradle.properties
index ba822ad5c7..5088783952 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -83,7 +83,8 @@ MOGO_TELEMATIC_VERSION=1.4.7.59
 MOGO_SKIN_VERSION=1.4.7.50
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=3.5.0.0
+MAP_SDK_VERSION=3.5.0.3
+MAP_SDK_CORE_VERSION=3.5.0.4
 MAP_SDK_DATA_VERSION=1.0.0.9
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
diff --git a/libraries/mapmodule/build.gradle b/libraries/mapmodule/build.gradle
index 87fe9afa20..aa3513aafa 100644
--- a/libraries/mapmodule/build.gradle
+++ b/libraries/mapmodule/build.gradle
@@ -65,7 +65,7 @@ dependencies {
 
 
     implementation 'com.zhidaoauto.map:net:1.0.1'
-    implementation "com.zhidaoauto.machine:mapcore:${MAP_SDK_VERSION}"
+    implementation "com.zhidaoauto.machine:mapcore:${MAP_SDK_CORE_VERSION}"
     implementation "com.zhidaoauto.machine:mapdata:${MAP_SDK_DATA_VERSION}"
 
 }
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoData.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoData.kt
index abc831d808..c145956393 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoData.kt
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoData.kt
@@ -129,4 +129,10 @@ interface IMogoData {
      * 获取路口数据
      */
     fun getCrossRoad(lon: Double, lat: Double, angle: Double): CrossRoad?
+
+    fun listenTileFileLog()
+
+    fun stopListenTileFileLog()
+
+    fun openTileFileLog(isOpen: Boolean)
 }
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt
index b87e1ed44a..0300161df4 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt
@@ -376,4 +376,16 @@ object MapDataWrapper : IMogoData {
         }
         return temp.get()
     }
+
+    override fun listenTileFileLog() {
+        MapAutoApi.setTileFileCallback(TileFileLogCallback())
+    }
+
+    override fun stopListenTileFileLog() {
+        MapAutoApi.clearTileFileCallback()
+    }
+
+    override fun openTileFileLog(isOpen: Boolean) {
+        MapAutoApi.openTileLog(isOpen)
+    }
 }
\ No newline at end of file
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/TileFileLogCallback.kt b/libraries/mogo-map/src/main/java/com/mogo/map/TileFileLogCallback.kt
new file mode 100644
index 0000000000..a077e90210
--- /dev/null
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/TileFileLogCallback.kt
@@ -0,0 +1,28 @@
+package com.mogo.map
+
+import com.autonavi.nge.hdmap.ITileCallback
+import com.mogo.eagle.core.data.deva.chain.ChainConstant
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
+import com.zhjt.service.chain.ChainLog
+
+class TileFileLogCallback: ITileCallback {
+
+    companion object {
+        private const val TAG = "TileFileLogCallback"
+    }
+
+    override fun onLogCallback(msg: String) {
+        invokeNettyConnResult(msg)
+    }
+
+    @ChainLog(
+        linkChainLog = ChainConstant.CHAIN_TYPE_WEAK_NETWORK,
+        linkCode = ChainConstant.CHAIN_SOURCE_WEAK_NETWORK,
+        nodeAliasCode = ChainConstant.CHAIN_CODE_RECORD_WEAK_NETWORK,
+        paramIndexes = [0]
+    )
+    private fun invokeNettyConnResult(msg: String) {
+        d(M_MAP + TAG, " TileFileLogCallback : $msg")
+    }
+}
\ No newline at end of file