微调构建

app/src/main/java/com/sd/demo/ui/TPolygonActivity.kt

@@ -2,13 +2,13 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLngM
 import com.cusc.map.ui.MapReadyView
-import com.cusc.map.maps.DelDrawInMap
-import com.cusc.map.maps.cdata.MapOverlay
-import com.cusc.map.maps.DrawInMap
-import com.cusc.map.maps.MethodAdv
-import com.cusc.map.maps.MsPolygonOptions
+import com.cusc.map.map2d.DelDrawInMap
+import com.cusc.map.map2d.cdata.MapOverlay
+import com.cusc.map.map2d.DrawInMap
+import com.cusc.map.map2d.MethodAdv
+import com.cusc.map.map2d.MsPolygonOptions
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityTpolygonBinding
 

app/src/main/java/com/sd/demo/ui/TReGeocodeActivity.kt

@@ -2,8 +2,8 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.cusc.map.maps.cdata.RegeocodeRes
-import com.cusc.map.maps.ReGeography
+import com.cusc.map.map2d.cdata.RegeocodeRes
+import com.cusc.map.map2d.ReGeography
 import com.sd.demo.databinding.ActivityTreGeocodeBinding
 
 

app/src/main/java/com/sd/demo/ui/WmsActivity.kt

@@ -5,8 +5,8 @@ import androidx.appcompat.app.AppCompatActivity
 import com.minedata.minenavi.SDKInitializer
 import com.minedata.minenavi.SDKInitializer.InitListener
 import com.minedata.minenavi.map.MineMap
-import com.cusc.map.maps.MethodAdv
-import com.cusc.map.maps.WmsLayer
+import com.cusc.map.map2d.MethodAdv
+import com.cusc.map.map2d.WmsLayer
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.cusc.map.ui.MapReadyView
 import com.sd.demo.databinding.ActivityWmtsBinding

build.gradle.kts

@@ -2,7 +2,7 @@
 buildscript {
 
     dependencies {
-//        classpath("org.jetbrains.dokka:dokka-base:2.0.0")
+//        classpath("org.jetbrains.dokka:dokka-base:2.1.0")
     }
 
 }

mapapi/build.gradle.kts

-import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -9,7 +7,7 @@ plugins {
 //    signing
 //    id ("org.jreleaser") version "1.20.0"//JReleaser now has support for publishing via the Central Publisher Portal and can be used via their Gradle plugin integration.
 //    id("org.jetbrains.dokka") version "2.0.0"
-//    kotlin("jvm") version "2.1.10"
+//    kotlin("jvm") version "2.1.0"
     // Generates HTML documentation
     id("org.jetbrains.dokka") version "2.1.0"
     // Generates Javadoc documentation
@@ -74,11 +72,8 @@ dependencies {
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
 
-    //Dokka插件增加了渲染源代码注释中的数学的能力。
-//    dokkaPlugin("org.jetbrains.dokka:mathjax-plugin:2.1.0")
-//    从Java的角度呈现Kotlin签名
-    dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:2.1.0")
-    runtimeOnly("org.jetbrains.dokka:android-documentation-plugin:2.1.0")
+//    implementation("org.jetbrains.dokka:android-documentation-plugin:2.1.0")
+    dokkaJavadocPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:2.1.0")
 
     api(project(":maplibs"))
 //    Webview交互
@@ -113,24 +108,26 @@ dokka {
         suppressInheritedMembers.set(false)
         suppressObviousFunctions.set(true)
         offlineMode.set(true)
-//        includes.from("package-info.java")
-
-        // Output directory for additional files
-        // Use this block instead of the standard when you
-        // want to change the output directory and include extra files
-//        outputDirectory.set(rootDir.resolve("docs/api/1.0"))
-        // Use fileTree to add multiple files
-//        includes.from(
-//            fileTree("docs") {
-//                include("**/*.md")
-//            }
-//        )
         dokkaSourceSets {
             configureEach {
+                includes.from("package-info.md")
+//                suppressEmptyPackages.set(false)
+                skipEmptyPackages.set(false)
+                skipDeprecated.set(false)
+                suppressGeneratedFiles.set(true)
+//                jdkVersion.set(17)
 //                documentedVisibilities.set(setOf(VisibilityModifier.Public)) // OR documentedVisibilities(VisibilityModifier.Public)
                 perPackageOption {
-                    matchingRegex.set("^com\\.cusc\\.map\\.test")
-                    suppress.set(false)//suppress = true：完全禁用匹配包的文档生成
+                    matchingRegex.set(".*map2d\\.amap|.*map2d\\.mine")
+                    suppress.set(true)//suppress = true：完全禁用匹配包的文档生成
+                }
+                perPackageOption {
+                    matchingRegex.set(".*core.*|.*fragments.*|.*scenario\\.mine.*|.*tests.*|overlay")
+                    suppress.set(true)//suppress = true：完全禁用匹配包的文档生成
+                }
+                perPackageOption {
+                    matchingRegex.set(".*ui\\.dialog.*|.*ui\\.widget.*|.*utils.*|.*vms.*")
+                    suppress.set(true)//suppress = true：完全禁用匹配包的文档生成
 //                    skipDeprecated.set(false)
 //                    reportUndocumented.set(false)
 //                    documentedVisibilities.set(

mapapi/package-info.md

-# 网络工具包 (com.cusc.map.maps)
+# Package com.cusc.map.map2d
+二维地图包，提供栅格地图显示、覆盖物绘制等功能。
 
-网络相关工具类集合，提供HTTP请求、WebSocket连接等功能。
\ No newline at end of file
+# Package com.cusc.map.location
+定位包，提供定位功能
+
+
+# Package com.cusc.map.parkroad
+车道局部地图包
+
+# Package com.cusc.map.map3d
+三维地图包，基于3dtitle的地图绘制
+
+# Package com.cusc.map.scenario
+业务相关包，提供车辆、感知物、预警管理
+
+# Package com.cusc.map.ui
+界面相关包，包含地图底图
\ No newline at end of file

mapapi/src/main/java/com/cusc/map/bean/WayPoi.kt

 package com.cusc.map.bean
 
 import android.os.Parcelable
-import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLngM
 import kotlinx.parcelize.Parcelize
 
 /**途经点Poi***/

mapapi/src/main/java/com/cusc/map/core/MShowMainCarModel.kt

@@ -6,9 +6,9 @@ import com.minedata.minenavi.map.Model
 import com.minedata.minenavi.map.ModelOptions
 import com.minedata.minenavi.map.Overlay
 import com.minedata.minenavi.mapdal.LatLng
-import com.cusc.map.MAP_TYPE
-import com.cusc.map.MapSdkInit
-import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.map2d.MAP_TYPE
+import com.cusc.map.map2d.MapSdkInit
+import com.cusc.map.map2d.cdata.LatLngM
 import com.cusc.map.ui.MapReadyView
 import com.cusc.map.utils.SmoothMoveUtils
 import com.cusc.map.utils.FileIoUtils

mapapi/src/main/java/com/cusc/map/fragments/AMapFragment.kt

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.amap.api.maps.AMap
-import com.cusc.map.UserCtx
+import com.cusc.map.map2d.UserCtx
 import com.cusc.map.databinding.FragmentAMapBinding
 import com.cusc.map.ui.MapReadyView
 import com.cusc.map.ui.MapView.OnMapReadyLis

mapapi/src/main/java/com/cusc/map/fragments/ForeMapFragment.kt

@@ -16,7 +16,7 @@ import com.minedata.minenavi.map.TrafficEventInfo
 import com.minedata.minenavi.mapdal.LatLng
 import com.minedata.minenavi.mapdal.NdsPoint
 import com.minedata.minenavi.util.Tools
-import com.cusc.map.UserCtx
+import com.cusc.map.map2d.UserCtx
 import com.cusc.map.databinding.FragmentForeMapBinding
 import com.cusc.map.location.LocCbM
 import com.cusc.map.ui.MapView.OnMapReadyLis

mapapi/src/main/java/com/cusc/map/fragments/UnityFragment.kt

@@ -7,7 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
-import com.cusc.map.UserCtx
+import com.cusc.map.map2d.UserCtx
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.cusc.map.ui.MapReadyView
 import com.unity3d.player.IUnityPlayerLifecycleEvents

mapapi/src/main/java/com/cusc/map/location/LocationM.kt

 package com.cusc.map.location
 
-import com.cusc.map.MAP_TYPE
-import com.cusc.map.MapSdkInit
-import com.cusc.map.maps.amap.AmapGpsLocation
+import com.cusc.map.map2d.MAP_TYPE
+import com.cusc.map.map2d.MapSdkInit
+import com.cusc.map.map2d.amap.AmapGpsLocation
 
 /**
  * 定位类

mapapi/src/main/java/com/cusc/map/location/MineGpsLocation.kt

@@ -6,10 +6,10 @@ import com.minedata.minenavi.location.MineLocationListener
 import com.minedata.minenavi.location.MineLocationManager
 import com.minedata.minenavi.location.MineLocationOptions
 import com.minedata.minenavi.mapdal.CoordType
-import com.cusc.map.UserCtx
+import com.cusc.map.map2d.UserCtx
 
 /**GPS定位类*/
-object MineGpsLocation {
+internal object MineGpsLocation {
 
 
     //  设置四维定位参数，并开始定位。

mapapi/src/main/java/com/cusc/map/map2d/CalcuMapUtil.kt

-package com.cusc.map.maps
+package com.cusc.map.map2d
 
 import android.location.Location
 import com.amap.api.maps.AMapUtils
 import com.amap.api.maps.model.LatLng
-import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLngM
 import kotlin.math.atan2
 import kotlin.math.cos
 import kotlin.math.sin

mapapi/src/main/java/com/cusc/map/map2d/DelDrawInMap.kt

-package com.cusc.map.maps
+package com.cusc.map.map2d
 
-import com.cusc.map.maps.cdata.MapOverlay
-import com.cusc.map.maps.cdata.MarkerM
+import com.cusc.map.map2d.cdata.MapOverlay
+import com.cusc.map.map2d.cdata.MarkerM
 
 /**
  * 删除地图上的绘制

mapapi/src/main/java/com/cusc/map/map2d/DrawInMap.kt

-package com.cusc.map.maps
+package com.cusc.map.map2d
 
 import androidx.core.graphics.toColorInt
-import com.cusc.map.maps.amap.AmapDrawInMap
-import com.cusc.map.maps.cdata.LatLngM
-import com.cusc.map.maps.cdata.MarkerM
-import com.cusc.map.maps.cdata.MapOverlay
-import com.cusc.map.maps.mine.MineDrawInMap
+import com.cusc.map.map2d.amap.AmapDrawInMap
+import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.MarkerM
+import com.cusc.map.map2d.cdata.MapOverlay
+import com.cusc.map.map2d.mine.MineDrawInMap
 
 /***绘制线选项**/
 class MsPolylineOptions {

mapapi/src/main/java/com/cusc/map/map2d/Gestures.kt

-package com.cusc.map.maps
+package com.cusc.map.map2d
 
-import com.cusc.map.maps.amap.AmapGestures
-import com.cusc.map.maps.mine.MineGestures
+import com.cusc.map.map2d.amap.AmapGestures
+import com.cusc.map.map2d.mine.MineGestures
 
 /**
  * 手势控制

mapapi/src/main/java/com/cusc/map/map2d/LayerOpt.kt

-package com.cusc.map.maps
+package com.cusc.map.map2d
 
-import com.cusc.map.maps.amap.AmapLayers
-import com.cusc.map.maps.mine.MineLayers
+import com.cusc.map.map2d.amap.AmapLayers
+import com.cusc.map.map2d.mine.MineLayers
 
 /**
  * 图层操作

mapapi/src/main/java/com/cusc/map/map2d/LocStyle.kt

-package com.cusc.map.maps
+package com.cusc.map.map2d
 
 import com.cusc.map.ui.MapReadyView
-import com.cusc.map.maps.amap.AmapLocationStyle
-import com.cusc.map.maps.mine.MineLocationStyle
+import com.cusc.map.map2d.amap.AmapLocationStyle
+import com.cusc.map.map2d.mine.MineLocationStyle
 
 /**
  * 显示定位蓝点

mapapi/src/main/java/com/cusc/map/map2d/LocStyleConstant.kt

-package com.cusc.map.maps
+package com.cusc.map.map2d
 
 /**
  * 定位蓝点常量