[6.5.0] merge

2024-06-27 19:05:12 +08:00
parent 1f06c9a89e
commit 46f3eccecf
47 changed files with 908 additions and 127 deletions
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.kt
@@ -52,6 +52,10 @@ open class MogoMapView : MogoBaseMapView, ILifeCycle {
        }
    }

+    override fun getInstanceTag(): String {
+        return ""
+    }
+
    /**
     * 子类实现
     * 代码StyleParams和XML初始化设置同时仅支持一种
@@ -61,10 +65,6 @@ open class MogoMapView : MogoBaseMapView, ILifeCycle {
    protected val styleParams: MapStyleParams?
        protected get() = null

-    override fun getInstanceTag(): String {
-        return MogoMap.DEFAULT
-    }
-
    override fun onCreate(bundle: Bundle?) {
        super.onCreate(bundle)
        d(TAG, "onCreate")