微调构建

.idea/gradle.xml

@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

@@ -6,7 +6,7 @@
     <option name="OPTION_SCOPE" value="public" />
     <option name="OTHER_OPTIONS" value="-encoding utf-8 -charset utf-8" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/sd/demo/MainActivity.kt

@@ -4,9 +4,9 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.cusc.map.MAP_TYPE
-import com.cusc.map.MapSdkInit
-import com.cusc.map.OnSdkInitCb
+import com.cusc.map.map2d.MAP_TYPE
+import com.cusc.map.map2d.MapSdkInit
+import com.cusc.map.map2d.OnSdkInitCb
 import com.sd.demo.adapter.DemoListAdapter
 import com.sd.demo.databinding.ActivityMainBinding
 import com.sd.demo.ui.CalculateDistanceActivity

app/src/main/java/com/sd/demo/adapter/PoiAdapter.kt

@@ -11,9 +11,9 @@ import android.view.ViewGroup
 import androidx.core.text.set
 import androidx.recyclerview.widget.RecyclerView
 import com.chad.library.adapter4.BaseQuickAdapter
-import com.cusc.map.maps.CalcuMapUtil
-import com.cusc.map.maps.cdata.LatLngM
-import com.cusc.map.maps.cdata.PoiSearchRes
+import com.cusc.map.map2d.CalcuMapUtil
+import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.cdata.PoiSearchRes
 import com.sd.demo.databinding.PoiSearchListItemBinding
 
 

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

@@ -2,9 +2,9 @@ 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.CalcuMapUtil
+import com.cusc.map.map2d.CalcuMapUtil
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.sd.demo.utils.ToastHelper
 import com.sd.demo.databinding.ActivityCalculateDistanceBinding

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

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.cusc.map.ui.MapReadyView
-import com.cusc.map.maps.MethodAdv
+import com.cusc.map.map2d.MethodAdv
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityChangeMapCenterBinding
 

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

 package com.sd.demo.ui
 
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.cusc.map.maps.DelDrawInMap
-import com.cusc.map.maps.DrawInMap
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.cusc.map.ui.MapReadyView
-import com.sd.demo.R
 import com.sd.demo.databinding.ActivityControlBinding
-import com.sd.demo.databinding.ActivityTmarkerBinding
-import com.sd.demo.ui.TMarkerActivity
 
 /**UI控件展示****/
 class ControlActivity : AppCompatActivity() {

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

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.cusc.map.ui.MapReadyView
-import com.cusc.map.maps.Gestures
+import com.cusc.map.map2d.Gestures
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityGestureDemoBinding
 

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

@@ -4,9 +4,9 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.google.gson.Gson
-import com.cusc.map.maps.CalcuMapUtil
-import com.cusc.map.maps.MethodAdv
-import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.map2d.CalcuMapUtil
+import com.cusc.map.map2d.MethodAdv
+import com.cusc.map.map2d.cdata.LatLngM
 import com.cusc.map.scenario.CucsVehicle
 import com.cusc.map.scenario.bean.VehiclePos
 import com.cusc.map.ui.MapView.OnMapReadyLis

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

@@ -5,12 +5,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.cusc.map.ui.MapReadyView
 import com.google.gson.Gson
-import com.cusc.map.maps.CalcuMapUtil
-import com.cusc.map.maps.cdata.LatLngM
-import com.cusc.map.parkroad.OnPrAddCar
+import com.cusc.map.map2d.CalcuMapUtil
+import com.cusc.map.map2d.cdata.LatLngM
 import com.cusc.map.parkroad.ParkRoadM
 import com.cusc.map.parkroad.PartType
-import com.cusc.map.parkroad.RoadPos
 import com.cusc.map.scenario.CucsVehicle
 import com.cusc.map.scenario.PerceptionManager
 import com.cusc.map.scenario.V2xWarn

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

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.map2d.cdata.LatLngM
 import com.cusc.map.core.MShowMainCarModel
 import com.cusc.map.ui.MapReadyView
 import com.cusc.map.ui.MapView.OnMapReadyLis

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

@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.cusc.map.ui.MapReadyView
-import com.cusc.map.maps.LocStyle
+import com.cusc.map.map2d.LocStyle
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityShowMyLocLandianBinding
 import com.sd.demo.viewmodels.MapDemoVm

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

@@ -3,11 +3,11 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 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.CircleOptionsM
-import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.map2d.DelDrawInMap
+import com.cusc.map.map2d.cdata.MapOverlay
+import com.cusc.map.map2d.DrawInMap
+import com.cusc.map.map2d.CircleOptionsM
+import com.cusc.map.map2d.cdata.LatLngM
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityTcircelBinding
 

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

@@ -13,13 +13,13 @@ import com.minedata.minenavi.navi.TmcSections
 import com.minedata.minenavi.util.Tools
 import com.cusc.map.bean.DriverRouteBean
 import com.cusc.map.bean.WayPoi
-import com.cusc.map.intfaces.OnNaviPresenterListener
-import com.cusc.map.maps.Navigate
-import com.cusc.map.maps.PathPlanning
-import com.cusc.map.maps.cdata.LatLngM
-import com.cusc.map.maps.inters.OnDriveRoute
-import com.cusc.map.maps.mine.MineNai
-import com.cusc.map.maps.mine.MineRoutePlans
+import com.cusc.map.map2d.inters.OnNaviPresenterListener
+import com.cusc.map.map2d.Navigate
+import com.cusc.map.map2d.PathPlanning
+import com.cusc.map.map2d.cdata.LatLngM
+import com.cusc.map.map2d.inters.OnDriveRoute
+import com.cusc.map.map2d.mine.MineNai
+import com.cusc.map.map2d.mine.MineRoutePlans
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.cusc.map.ui.MapReadyView
 import com.sd.demo.databinding.ActivityTdriveRouteBinding

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

@@ -5,9 +5,9 @@ import androidx.appcompat.app.AppCompatActivity
 import com.cusc.map.location.LocCbM
 import com.cusc.map.location.LocationM
 import com.cusc.map.location.OnGpsLoc
-import com.cusc.map.maps.DrawInMap
-import com.cusc.map.maps.MethodAdv
-import com.cusc.map.maps.cdata.MarkerM
+import com.cusc.map.map2d.DrawInMap
+import com.cusc.map.map2d.MethodAdv
+import com.cusc.map.map2d.cdata.MarkerM
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.cusc.map.ui.MapReadyView
 import com.sd.demo.databinding.ActivityTgpsBinding

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

@@ -4,11 +4,11 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.google.gson.Gson
-import com.cusc.map.highmap.AllLine
-import com.cusc.map.highmap.CarNavPath
-import com.cusc.map.highmap.ThreeHighMap
-import com.cusc.map.maps.CalcuMapUtil
-import com.cusc.map.maps.cdata.LatLngM
+import com.cusc.map.map3d.AllLine
+import com.cusc.map.map3d.CarNavPath
+import com.cusc.map.map3d.ThreeHighMap
+import com.cusc.map.map2d.CalcuMapUtil
+import com.cusc.map.map2d.cdata.LatLngM
 import com.cusc.map.scenario.CucsVehicle
 import com.cusc.map.scenario.PerceptionManager
 import com.cusc.map.scenario.V2xWarn

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

@@ -3,7 +3,7 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.cusc.map.maps.LayerOpt
+import com.cusc.map.map2d.LayerOpt
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.cusc.map.ui.MapReadyView
 import com.sd.demo.R

app/src/main/java/com/sd/demo/ui/TLineActivity.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.MsPolylineOptions
+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.MsPolylineOptions
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityTlineBinding
 

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

@@ -3,9 +3,9 @@ package com.sd.demo.ui
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.cusc.map.ui.MapReadyView
-import com.cusc.map.maps.DelDrawInMap
-import com.cusc.map.maps.cdata.MarkerM
-import com.cusc.map.maps.DrawInMap
+import com.cusc.map.map2d.DelDrawInMap
+import com.cusc.map.map2d.cdata.MarkerM
+import com.cusc.map.map2d.DrawInMap
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.sd.demo.databinding.ActivityTmarkerBinding
 

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

@@ -2,9 +2,9 @@ package com.sd.demo.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.cusc.map.maps.PoiSearch
-import com.cusc.map.maps.cdata.PoiSearchRes
-import com.cusc.map.maps.inters.OnMSPoiSearchLis
+import com.cusc.map.map2d.PoiSearch
+import com.cusc.map.map2d.cdata.PoiSearchRes
+import com.cusc.map.map2d.inters.OnMSPoiSearchLis
 import com.cusc.map.ui.MapView.OnMapReadyLis
 import com.cusc.map.ui.MapReadyView
 import com.sd.demo.adapter.PoiAdapter