修改包名

79461a4b · p x · 8a4fd9a7 · 79461a4b · 79461a4b · 79461a4b
Commit 79461a4b authored Sep 08, 2025 by p x
--- a/app/src/main/java/com/sd/mapmultiengine/ui/TLayersActivity.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/ui/TLayersActivity.kt
-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui


 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.R
-import com.sd.mapmultiengine.databinding.ActivityTlayersBinding
+import com.sd.api.core.MapReadyView
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.R
+import com.sd.demo.databinding.ActivityTlayersBinding


 /***切换图层**/

--- a/app/src/main/java/com/sd/mapmultiengine/ui/TLineActivity.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/ui/TLineActivity.kt
-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui

 import android.graphics.Color
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSDrawInMap
-import com.sd.maplibrary.core.basic.MSOverlay
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityTlineBinding
+import com.sd.api.bean.MSLatLng
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSDrawInMap
+import com.sd.api.core.basic.MSOverlay
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityTlineBinding

 /*****绘制一条线**/
 class TLineActivity : AppCompatActivity() {

--- a/app/src/main/java/com/sd/mapmultiengine/ui/TMarkerActivity.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/ui/TMarkerActivity.kt
-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui

 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSDrawInMap
-import com.sd.maplibrary.core.basic.MSMarker
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityTmarkerBinding
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSDrawInMap
+import com.sd.api.core.basic.MSMarker
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityTmarkerBinding

 /***绘制Marker点***/
 class TMarkerActivity : AppCompatActivity() {

--- a/app/src/main/java/com/sd/mapmultiengine/ui/TPoiSearchActivity.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/ui/TPoiSearchActivity.kt
-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui

 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.bean.PoiSearchRes
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.OnMSPoiSearchLis
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.adapter.PoiAdapter
-import com.sd.mapmultiengine.databinding.ActivityTpoiSearchBinding
+import com.sd.api.bean.PoiSearchRes
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.OnMSPoiSearchLis
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.adapter.PoiAdapter
+import com.sd.demo.databinding.ActivityTpoiSearchBinding

 /****poi关键字搜索，范围搜索**/
 class TPoiSearchActivity : AppCompatActivity() {

--- a/app/src/main/java/com/sd/mapmultiengine/ui/TPolygonActivity.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/ui/TPolygonActivity.kt
-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui

 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.core.basic.MSDrawInMap
-import com.sd.maplibrary.core.basic.MSOverlay
-import com.sd.maplibrary.factorys.MapCoreApi
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.mapmultiengine.databinding.ActivityTpolygonBinding
+import com.sd.api.bean.MSLatLng
+import com.sd.api.core.MapReadyView
+import com.sd.api.core.basic.MSDrawInMap
+import com.sd.api.core.basic.MSOverlay
+import com.sd.api.factorys.MapCoreApi
+import com.sd.api.ui.MapMultiView.OnMapReadyLis
+import com.sd.demo.databinding.ActivityTpolygonBinding

 /**绘制一个面***/
 class TPolygonActivity : AppCompatActivity() {

--- a/app/src/main/java/com/sd/mapmultiengine/ui/TReGeocodeActivity.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/ui/TReGeocodeActivity.kt
-package com.sd.mapmultiengine.ui
+package com.sd.demo.ui

 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.bean.RegeocodeRes
-import com.sd.maplibrary.core.basic.MSRegeoCode
-import com.sd.mapmultiengine.databinding.ActivityTreGeocodeBinding
+import com.sd.api.bean.RegeocodeRes
+import com.sd.api.core.basic.MSRegeoCode
+import com.sd.demo.databinding.ActivityTreGeocodeBinding


 /***逆地理编码***/

--- a/app/src/main/java/com/sd/mapmultiengine/utils/DisplayUtil.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/utils/DisplayUtil.kt
-package com.sd.mapmultiengine.utils
+package com.sd.demo.utils

 import android.app.Activity
 import android.content.Context

--- a/app/src/main/java/com/sd/mapmultiengine/utils/MyContants.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/utils/MyContants.kt
-package com.sd.mapmultiengine.utils
+package com.sd.demo.utils

 object MyContants {
    const val IS_DEBUG = true

--- a/app/src/main/java/com/sd/mapmultiengine/utils/MyGeoTools.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/utils/MyGeoTools.kt
-package com.sd.mapmultiengine.utils
+package com.sd.demo.utils

 import android.location.Location
 import com.minedata.minenavi.addons.DistanceBean

--- a/app/src/main/java/com/sd/mapmultiengine/utils/SystemUtils.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/utils/SystemUtils.kt
-package com.sd.mapmultiengine.utils
+package com.sd.demo.utils

 import android.app.Activity
 import android.app.ActivityManager

--- a/maplibrary/src/main/java/com/sd/maplibrary/utils/ToastHelper.kt
+++ b/maplibrary/src/main/java/com/sd/maplibrary/utils/ToastHelper.kt
-package com.sd.maplibrary.utils
+package com.sd.demo.utils

 import android.content.Context
 import android.widget.Toast

--- a/app/src/main/java/com/sd/mapmultiengine/utils/Utils.java
+++ b/app/src/main/java/com/sd/mapmultiengine/utils/Utils.java
@@ -20,7 +20,7 @@
 *
 * You may also get a copy of the license at http://navicore.cn/license/NC_MIT_0.1
 **********************************************************************************************************************************/
-package com.sd.mapmultiengine.utils;
+package com.sd.demo.utils;

 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -54,14 +54,12 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.Toast;

-import com.minedata.minenavi.SDKInitializer;
 import com.minedata.minenavi.addons.DistanceBean;
 import com.minedata.minenavi.addons.TimeBean;
 import com.minedata.minenavi.map.MineMap;
 import com.minedata.minenavi.mapdal.DistanceStringInfo;
 import com.minedata.minenavi.mapdal.NativeEnv;
 import com.minedata.minenavi.util.MineNaviUtil;
-import com.minedata.minenavi.util.ScreenUtil;

 import java.io.BufferedReader;
 import java.io.FileReader;

--- a/app/src/main/java/com/sd/mapmultiengine/viewmodels/MapDemoVm.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/viewmodels/MapDemoVm.kt
-package com.sd.mapmultiengine.viewmodels
+package com.sd.demo.viewmodels

 import androidx.lifecycle.ViewModel


--- a/app/src/main/java/com/sd/mapmultiengine/TextMainActivity.kt
+++ b/app/src/main/java/com/sd/mapmultiengine/TextMainActivity.kt
-package com.sd.mapmultiengine
-
-import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
-import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
-import com.sd.maplibrary.MAP_TYPE
-import com.sd.maplibrary.MSDKInitializer
-import com.sd.maplibrary.OnSdkInitCb
-import com.sd.maplibrary.bean.MSLatLng
-import com.sd.maplibrary.bean.MSLocBean
-import com.sd.maplibrary.bean.RegeocodeRes
-import com.sd.maplibrary.core.basic.MSRegeoCode
-import com.sd.maplibrary.core.MapReadyView
-import com.sd.maplibrary.ui.MapMultiView.OnMapReadyLis
-import com.sd.maplibrary.vms.MainVM
-import com.sd.mapmultiengine.databinding.ActivityTextMainBinding
-
-
-class TextMainActivity : AppCompatActivity() {
-    //    val yy:Yy by viewModels()
-    val mainVM: MainVM by viewModels()
-
-    private lateinit var binding: ActivityTextMainBinding
-
-    var mapReadView: MapReadyView? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        binding = ActivityTextMainBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-//        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-//            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-//            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-//            insets
-//        }
-        initMap()
-        binding.mapMultiView.addMapRenderCallback(object : OnMapReadyLis {
-            override fun onMapReady(mapReadyView: MapReadyView) {
-                this@TextMainActivity.mapReadView = mapReadyView
-                test()
-            }
-        })
-        jumpAct()
-    }
-
-    private fun jumpAct() {
-        binding.btSeartch.setOnClickListener {
-            //到搜索页面
-        }
-        binding.btLoc.setOnClickListener {
-
-        }
-    }
-
-    fun test() {
-        //显示定位蓝点
-//        mainVM.showMyLocLandian(this@MainActivity.mapReadView)
-        //手势交互
-//        MSGestures.setTiltGesturesEnabled(mapReadView!!,true)
-        //改变地图中心点
-//        MSMethodAdv.setMapCenter(mapReadView)
-//        MSMethodAdv.setMapCenter(mapReadView, 39.977290, 116.337000)
-
-        //改变缩放级别
-//        MSMethodAdv.setMapZoom(mapReadView, 10f)
-        //绘制Marker点
-//        MSDrawInMap.drawMarket(mapReadView, 39.977290, 116.337000)
-        //绘制一条线
-        var msLatLng = listOf<MSLatLng>(
-            MSLatLng(39.999391, 116.135972), MSLatLng(39.898323, 116.057694),
-            MSLatLng(39.900430, 116.265061), MSLatLng(39.955192, 116.140092)
-        )
-//        MSDrawInMap.drawPolyline(mapReadView, msLatLng)
-        //绘制一个圆形
-//        MSDrawInMap.drawCircle(mapReadView, 39.997290, 116.337000, 2000f)
-        //绘制一个面
-        var mspLatLng = listOf<MSLatLng>(
-            MSLatLng(39.993391, 116.135272), MSLatLng(39.808323, 116.057604),
-            MSLatLng(39.904430, 116.265061), MSLatLng(39.950192, 116.140002)
-        )
-//        MSDrawInMap.drawPolygon(mapReadView, mspLatLng)
-        //Poi搜索
-//        testPoiSearch()
-        //POi范围搜索
-//        testPoiSearchBound()
-        //逆地理编码
-        MSRegeoCode.geoCoder(41.80196, 123.43326, object : MSRegeoCode.MSOnRegeo {
-            override fun onRegeo(regeocodeRes: RegeocodeRes?) {
-                var a = 0
-            }
-        })
-    }
-
-    //poi搜索
-    fun testPoiSearch() {
- /*       MSPoiSearch.startPoiSearch(
-            "北京大学",
-            41.80196,
-            123.43326,
-            object : MSPoiSearch.OnMSPoiSearchLis {
-                override fun onPoiLis(
-                    poiList: List<PoiSearchRes>
-                ) {
-//                    println("------------poiList = ${poiList}")
-                }
-            })*/
-    }
-
-    //poi 范围搜索
-    fun testPoiSearchBound() {
-    /*    MSPoiSearch.startPoiSearchBound(
-            "北京大学",
-            39.977290,
-            116.337000,
-            25000,
-            object : MSPoiSearch.OnMSPoiSearchLis {
-                override fun onPoiLis(
-                    poiList: List<PoiSearchRes>
-                ) {
-//                    println("------------poiList = ${poiList}")
-                }
-            })*/
-    }
-
-
-
-
-    fun initMap() {
-        MSDKInitializer.initializeMap(this, MAP_TYPE.MINE, object : OnSdkInitCb {
-            override fun onInitSuccess() {
-                println("--------onMapInitSuccess}")
-            }
-
-            override fun onInitFailed(msg: String) {
-            }
-        })
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-    }
-
-
-}
\ No newline at end of file
--- a/app/src/main/res/layout/activity_amap_wms.xml
+++ b/app/src/main/res/layout/activity_amap_wms.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
+
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
-    tools:context=".ui.AMapWmsActivity">
+    >


    <com.amap.api.maps.MapView

--- a/app/src/main/res/layout/activity_calculate_distance.xml
+++ b/app/src/main/res/layout/activity_calculate_distance.xml
@@ -67,7 +67,7 @@
        android:text="计算" />


-    <com.sd.maplibrary.ui.MapMultiView
+    <com.sd.api.ui.MapMultiView
        android:id="@+id/mapMultiView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />

--- a/app/src/main/res/layout/activity_change_map_center.xml
+++ b/app/src/main/res/layout/activity_change_map_center.xml
@@ -57,7 +57,7 @@
 <!--            android:text="设置地图边界范围" />-->
    </LinearLayout>

-    <com.sd.maplibrary.ui.MapMultiView
+    <com.sd.api.ui.MapMultiView
        android:id="@+id/mapMultiView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />

--- a/app/src/main/res/layout/activity_display_map.xml
+++ b/app/src/main/res/layout/activity_display_map.xml
@@ -4,7 +4,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <com.sd.maplibrary.ui.MapMultiView
+    <com.sd.api.ui.MapMultiView
        android:id="@+id/mapMultiView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />

--- a/app/src/main/res/layout/activity_gesture_demo.xml
+++ b/app/src/main/res/layout/activity_gesture_demo.xml
@@ -24,7 +24,7 @@

    </LinearLayout>

-    <com.sd.maplibrary.ui.MapMultiView
+    <com.sd.api.ui.MapMultiView
        android:id="@+id/mapMultiView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />

--- a/app/src/main/res/layout/activity_high_map.xml
+++ b/app/src/main/res/layout/activity_high_map.xml
@@ -18,7 +18,7 @@
    <!--    </LinearLayout>-->


-    <com.sd.maplibrary.ui.MapMultiView
+    <com.sd.api.ui.MapMultiView
        android:id="@+id/mapMultiView"
        android:layout_width="match_parent"
        android:layout_height="match_parent"