diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 8b9abd1..061f398 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -201,9 +201,9 @@ if (RuntimeCache.currentSegment == CurrentSegment.SearchMarker) { if (signalEnergy > 1000) { binding.markerIdButton.isEnabled = true - binding.markerIdButton.setTextColor(Color.WHITE) + binding.markerIdButton.setTextColor(Color.parseColor("#428d00")) binding.markerIdButton.backgroundTintList = ColorStateList.valueOf( - Color.parseColor("#FFA200") + Color.parseColor("#7EFF00") ) binding.searchResultView.text = "已检测到标识器" diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 8b9abd1..061f398 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -201,9 +201,9 @@ if (RuntimeCache.currentSegment == CurrentSegment.SearchMarker) { if (signalEnergy > 1000) { binding.markerIdButton.isEnabled = true - binding.markerIdButton.setTextColor(Color.WHITE) + binding.markerIdButton.setTextColor(Color.parseColor("#428d00")) binding.markerIdButton.backgroundTintList = ColorStateList.valueOf( - Color.parseColor("#FFA200") + Color.parseColor("#7EFF00") ) binding.searchResultView.text = "已检测到标识器" diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml index e9f00ff..1e8643e 100644 --- a/app/src/main/res/layout/activity_search_marker.xml +++ b/app/src/main/res/layout/activity_search_marker.xml @@ -10,10 +10,10 @@ @@ -67,8 +67,9 @@ app:radar_radius="120dp" /> @@ -143,8 +144,9 @@ diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 8b9abd1..061f398 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -201,9 +201,9 @@ if (RuntimeCache.currentSegment == CurrentSegment.SearchMarker) { if (signalEnergy > 1000) { binding.markerIdButton.isEnabled = true - binding.markerIdButton.setTextColor(Color.WHITE) + binding.markerIdButton.setTextColor(Color.parseColor("#428d00")) binding.markerIdButton.backgroundTintList = ColorStateList.valueOf( - Color.parseColor("#FFA200") + Color.parseColor("#7EFF00") ) binding.searchResultView.text = "已检测到标识器" diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml index e9f00ff..1e8643e 100644 --- a/app/src/main/res/layout/activity_search_marker.xml +++ b/app/src/main/res/layout/activity_search_marker.xml @@ -10,10 +10,10 @@ @@ -67,8 +67,9 @@ app:radar_radius="120dp" /> @@ -143,8 +144,9 @@ diff --git a/app/src/main/res/layout/activity_search_marker_audit.xml b/app/src/main/res/layout/activity_search_marker_audit.xml index 1fd0506..1b2e3e4 100644 --- a/app/src/main/res/layout/activity_search_marker_audit.xml +++ b/app/src/main/res/layout/activity_search_marker_audit.xml @@ -10,7 +10,8 @@ @@ -59,8 +61,9 @@ diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 8b9abd1..061f398 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -201,9 +201,9 @@ if (RuntimeCache.currentSegment == CurrentSegment.SearchMarker) { if (signalEnergy > 1000) { binding.markerIdButton.isEnabled = true - binding.markerIdButton.setTextColor(Color.WHITE) + binding.markerIdButton.setTextColor(Color.parseColor("#428d00")) binding.markerIdButton.backgroundTintList = ColorStateList.valueOf( - Color.parseColor("#FFA200") + Color.parseColor("#7EFF00") ) binding.searchResultView.text = "已检测到标识器" diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml index e9f00ff..1e8643e 100644 --- a/app/src/main/res/layout/activity_search_marker.xml +++ b/app/src/main/res/layout/activity_search_marker.xml @@ -10,10 +10,10 @@ @@ -67,8 +67,9 @@ app:radar_radius="120dp" /> @@ -143,8 +144,9 @@ diff --git a/app/src/main/res/layout/activity_search_marker_audit.xml b/app/src/main/res/layout/activity_search_marker_audit.xml index 1fd0506..1b2e3e4 100644 --- a/app/src/main/res/layout/activity_search_marker_audit.xml +++ b/app/src/main/res/layout/activity_search_marker_audit.xml @@ -10,7 +10,8 @@ @@ -59,8 +61,9 @@ diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 427cc8c..d4bb2f7 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -7,16 +7,4 @@ \ No newline at end of file