修改线选择
This commit is contained in:
squallzhjch
parent
9f7bf771c2
commit
8501f64b2c
@ -114,9 +114,9 @@ class MainActivity : BaseActivity() {
|
||||
|
||||
viewModel.liveDataMenuState.observe(this) {
|
||||
binding.mainActivityMenu.isSelected = it
|
||||
if(it==true){
|
||||
if (it == true) {
|
||||
binding.mainActivityMenuLayout.visibility = View.VISIBLE
|
||||
}else{
|
||||
} else {
|
||||
binding.mainActivityMenuLayout.visibility = View.GONE
|
||||
}
|
||||
|
||||
@ -138,7 +138,10 @@ class MainActivity : BaseActivity() {
|
||||
|
||||
lifecycleScope.launch {
|
||||
// 初始化地图图层控制接收器
|
||||
FlowEventBus.subscribe<List<ImportConfig>>(lifecycle, Constant.EVENT_LAYER_MANAGER_CHANGE) {
|
||||
FlowEventBus.subscribe<List<ImportConfig>>(
|
||||
lifecycle,
|
||||
Constant.EVENT_LAYER_MANAGER_CHANGE
|
||||
) {
|
||||
viewModel.refreshOMDBLayer(it)
|
||||
}
|
||||
}
|
||||
@ -227,15 +230,16 @@ class MainActivity : BaseActivity() {
|
||||
* 点击录音按钮
|
||||
*/
|
||||
fun voiceOnclick() {
|
||||
val naviController = findNavController(R.id.main_activity_right_fragment)
|
||||
val naviController = findNavController(R.id.main_activity_right_fragment)
|
||||
naviController.navigate(R.id.EvaluationResultFragment)
|
||||
}
|
||||
|
||||
/**
|
||||
* 点击线选择
|
||||
*/
|
||||
fun selectLineOnclick(){
|
||||
fun selectLineOnclick() {
|
||||
viewModel.setSelectRoad(!viewModel.isSelectRoad())
|
||||
binding.mainActivitySelectLine.isSelected = viewModel.isSelectRoad()
|
||||
}
|
||||
|
||||
fun voiceOnTouchStart() {
|
||||
|
||||
@ -425,6 +425,10 @@ class MainViewModel @Inject constructor(
|
||||
*/
|
||||
fun setSelectRoad(select: Boolean) {
|
||||
bSelectRoad = select
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
mapController.lineHandler.removeLine()
|
||||
liveDataSignList.value = mutableListOf()
|
||||
}
|
||||
}
|
||||
|
||||
fun isSelectRoad(): Boolean {
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:tint="@color/white"
|
||||
android:viewportHeight="24" android:viewportWidth="24"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M23,8c0,1.1 -0.9,2 -2,2c-0.18,0 -0.35,-0.02 -0.51,-0.07l-3.56,3.55C16.98,13.64 17,13.82 17,14c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2c0,-0.18 0.02,-0.36 0.07,-0.52l-2.55,-2.55C10.36,10.98 10.18,11 10,11s-0.36,-0.02 -0.52,-0.07l-4.55,4.56C4.98,15.65 5,15.82 5,16c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2s0.9,-2 2,-2c0.18,0 0.35,0.02 0.51,0.07l4.56,-4.55C8.02,9.36 8,9.18 8,9c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,0.18 -0.02,0.36 -0.07,0.52l2.55,2.55C14.64,12.02 14.82,12 15,12s0.36,0.02 0.52,0.07l3.55,-3.56C19.02,8.35 19,8.18 19,8c0,-1.1 0.9,-2 2,-2S23,6.9 23,8z"/>
|
||||
</vector>
|
||||
5
app/src/main/res/drawable/selector_road_line_btn_bg.xml
Normal file
5
app/src/main/res/drawable/selector_road_line_btn_bg.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/shape_card_bg_select" android:state_selected="true"></item>
|
||||
<item android:drawable="@drawable/shape_card_bg_default" />
|
||||
</selector>
|
||||
5
app/src/main/res/drawable/selector_road_line_src.xml
Normal file
5
app/src/main/res/drawable/selector_road_line_src.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/baseline_timeline_select_24" android:state_selected="true"></item>
|
||||
<item android:drawable="@drawable/baseline_timeline_24" />
|
||||
</selector>
|
||||
@ -1,11 +1,26 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="@dimen/default_widget_padding"></corners>
|
||||
<padding
|
||||
android:bottom="@dimen/nimap_defalut_padding"
|
||||
android:left="@dimen/nimap_defalut_padding"
|
||||
android:right="@dimen/nimap_defalut_padding"
|
||||
android:top="@dimen/nimap_defalut_padding"></padding>
|
||||
<solid android:color="@color/colorSurface"></solid>
|
||||
</shape>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- 灰色阴影 -->
|
||||
<item
|
||||
android:bottom="1dp"
|
||||
android:left="1dp"
|
||||
android:right="1dp"
|
||||
android:top="1dp">
|
||||
<shape>
|
||||
<solid android:color="#A1DBDCDF" />
|
||||
<corners android:radius="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<!-- 白色前景 -->
|
||||
<item
|
||||
android:bottom="2dp"
|
||||
android:left="2dp"
|
||||
android:right="2dp"
|
||||
android:top="2dp">
|
||||
<shape>
|
||||
<solid android:color="#FFFFFF" />
|
||||
<corners android:radius="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
||||
|
||||
26
app/src/main/res/drawable/shape_card_bg_select.xml
Normal file
26
app/src/main/res/drawable/shape_card_bg_select.xml
Normal file
@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- 灰色阴影 -->
|
||||
<item
|
||||
android:bottom="1dp"
|
||||
android:left="1dp"
|
||||
android:right="1dp"
|
||||
android:top="1dp">
|
||||
<shape>
|
||||
<solid android:color="#A1DBDCDF" />
|
||||
<corners android:radius="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<!-- 白色前景 -->
|
||||
<item
|
||||
android:bottom="2dp"
|
||||
android:left="2dp"
|
||||
android:right="2dp"
|
||||
android:top="2dp">
|
||||
<shape>
|
||||
<solid android:color="#03A9F4" />
|
||||
<corners android:radius="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
||||
@ -67,6 +67,16 @@
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
tools:ignore="MissingConstraints">
|
||||
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/main_activity_select_line"
|
||||
android:layout_width="38dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:background="@drawable/selector_road_line_btn_bg"
|
||||
android:onClick="@{()->mainActivity.selectLineOnclick()}"
|
||||
android:src="@drawable/selector_road_line_src" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/main_activity_voice"
|
||||
android:layout_width="48dp"
|
||||
@ -133,13 +143,6 @@
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/main_activity_select_line"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:background="@drawable/shape_card_bg_default"
|
||||
android:onClick="@{()->mainActivity.selectLineOnclick()}"
|
||||
android:src="@drawable/baseline_timeline_24" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/main_activity_serach"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user