diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index f65f8d7..ba704e3 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -15,6 +15,7 @@
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.FileProvider
import androidx.lifecycle.ViewModelProvider
+import com.amap.api.location.AMapLocation
import com.amap.api.maps.AMap
import com.amap.api.maps.AMapOptions
import com.amap.api.maps.CameraUpdateFactory
@@ -24,6 +25,7 @@
import com.casic.detector.BuildConfig
import com.casic.detector.R
import com.casic.detector.bean.LabelBean
+import com.casic.detector.callback.ILocationListener
import com.casic.detector.cluster.ClusterItem
import com.casic.detector.cluster.ClusterOverlay
import com.casic.detector.cluster.RegionItem
@@ -96,10 +98,26 @@
aMap.setOnMyLocationChangeListener {
val longitude = it.longitude
val latitude = it.latitude
+ //经纬度逆编码
LocationHub.antiCodingLocation(context, it) { address ->
currentLocationView.text = address
}
}
+
+ //首次移动到定位点
+ LocationHub.getCurrentLocation(this, object : ILocationListener {
+ override fun onAMapLocationGet(location: AMapLocation?) {
+ if (location != null) {
+ aMap.moveCamera(
+ CameraUpdateFactory.newLatLngZoom(
+ LatLng(location.latitude, location.longitude), 15f
+ )
+ )
+ } else {
+ "当前位置信号差,无法移动地图到定位点".show(context)
+ }
+ }
+ })
}
private fun initData() {
@@ -328,6 +346,26 @@
}
}
})
+
+ //安装
+ installButton.setOnClickListener {
+
+ }
+
+ //查看
+ viewButton.setOnClickListener {
+
+ }
+
+ //巡检
+ inspectionButton.setOnClickListener {
+
+ }
+
+ //探测
+ detectionButton.setOnClickListener {
+
+ }
}
//更新数据
diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index f65f8d7..ba704e3 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -15,6 +15,7 @@
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.FileProvider
import androidx.lifecycle.ViewModelProvider
+import com.amap.api.location.AMapLocation
import com.amap.api.maps.AMap
import com.amap.api.maps.AMapOptions
import com.amap.api.maps.CameraUpdateFactory
@@ -24,6 +25,7 @@
import com.casic.detector.BuildConfig
import com.casic.detector.R
import com.casic.detector.bean.LabelBean
+import com.casic.detector.callback.ILocationListener
import com.casic.detector.cluster.ClusterItem
import com.casic.detector.cluster.ClusterOverlay
import com.casic.detector.cluster.RegionItem
@@ -96,10 +98,26 @@
aMap.setOnMyLocationChangeListener {
val longitude = it.longitude
val latitude = it.latitude
+ //经纬度逆编码
LocationHub.antiCodingLocation(context, it) { address ->
currentLocationView.text = address
}
}
+
+ //首次移动到定位点
+ LocationHub.getCurrentLocation(this, object : ILocationListener {
+ override fun onAMapLocationGet(location: AMapLocation?) {
+ if (location != null) {
+ aMap.moveCamera(
+ CameraUpdateFactory.newLatLngZoom(
+ LatLng(location.latitude, location.longitude), 15f
+ )
+ )
+ } else {
+ "当前位置信号差,无法移动地图到定位点".show(context)
+ }
+ }
+ })
}
private fun initData() {
@@ -328,6 +346,26 @@
}
}
})
+
+ //安装
+ installButton.setOnClickListener {
+
+ }
+
+ //查看
+ viewButton.setOnClickListener {
+
+ }
+
+ //巡检
+ inspectionButton.setOnClickListener {
+
+ }
+
+ //探测
+ detectionButton.setOnClickListener {
+
+ }
}
//更新数据
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bb962e0..aa3ec55 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,12 +38,14 @@
android:padding="@dimen/dp_5">