diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
index b9613b8..0081aae 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
@@ -74,7 +74,8 @@
val lng = location.longitude.toDegree()
val lat = location.latitude.toDegree()
- binding.gdGpsView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m"
+ binding.gdGpsView.text =
+ "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m\n类型:高德"
}
override fun onError() {
@@ -102,7 +103,7 @@
val lng = location.longitude.toDegree()
val lat = location.latitude.toDegree()
- binding.locationView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m"
+ binding.locationView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m\n类型:GPS"
}
private val gnssStatusListener = object : GnssStatus.Callback() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
index b9613b8..0081aae 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
@@ -74,7 +74,8 @@
val lng = location.longitude.toDegree()
val lat = location.latitude.toDegree()
- binding.gdGpsView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m"
+ binding.gdGpsView.text =
+ "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m\n类型:高德"
}
override fun onError() {
@@ -102,7 +103,7 @@
val lng = location.longitude.toDegree()
val lat = location.latitude.toDegree()
- binding.locationView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m"
+ binding.locationView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m\n类型:GPS"
}
private val gnssStatusListener = object : GnssStatus.Callback() {
diff --git a/app/src/main/res/drawable/ic_aim.xml b/app/src/main/res/drawable/ic_aim.xml
index ad05a1f..b36a39d 100644
--- a/app/src/main/res/drawable/ic_aim.xml
+++ b/app/src/main/res/drawable/ic_aim.xml
@@ -1,9 +1,9 @@
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
index b9613b8..0081aae 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt
@@ -74,7 +74,8 @@
val lng = location.longitude.toDegree()
val lat = location.latitude.toDegree()
- binding.gdGpsView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m"
+ binding.gdGpsView.text =
+ "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m\n类型:高德"
}
override fun onError() {
@@ -102,7 +103,7 @@
val lng = location.longitude.toDegree()
val lat = location.latitude.toDegree()
- binding.locationView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m"
+ binding.locationView.text = "经度:${lng} 纬度:${lat}\n精度:${location.accuracy}m\n类型:GPS"
}
private val gnssStatusListener = object : GnssStatus.Callback() {
diff --git a/app/src/main/res/drawable/ic_aim.xml b/app/src/main/res/drawable/ic_aim.xml
index ad05a1f..b36a39d 100644
--- a/app/src/main/res/drawable/ic_aim.xml
+++ b/app/src/main/res/drawable/ic_aim.xml
@@ -1,9 +1,9 @@
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1837bb5..9084b29 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,82 +18,22 @@
app:tbv_text="地下管线电子标识探测仪"
app:tbv_text_color="@color/white" />
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="0dp"
+ android:layout_weight="1">
-
-
-
-
-
@@ -122,11 +62,66 @@
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp_3"
android:layout_weight="1"
- android:background="@color/themeOpacityColor"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/app_name"
android:textColor="@color/white" />
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file