Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

 Conflicts:

	app/src/main/java/com/navinfo/omqs/tools/LayerConfigUtils.kt

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -111,6 +111,17 @@ class MainActivity : BaseActivity() {
             //处理页面跳转
             viewModel.navigation(this, it)
         }
+
+        viewModel.liveDataMenuState.observe(this) {
+            binding.mainActivityMenu.isSelected = it
+            if(it==true){
+                binding.mainActivityMenuLayout.visibility = View.VISIBLE
+            }else{
+                binding.mainActivityMenuLayout.visibility = View.GONE
+            }
+
+        }
+
         binding.mainActivitySignRecyclerview.layoutManager = LinearLayoutManager(this)
         binding.mainActivitySignRecyclerview.adapter = signAdapter
         //增加4dp的间隔
@@ -175,6 +186,43 @@ class MainActivity : BaseActivity() {
         viewModel.onClickCameraButton(this)
     }
 
+    /**
+     * 开关菜单
+     */
+    fun onClickMenu() {
+        //显示菜单图层
+        viewModel.onClickMenu()
+    }
+
+    /**
+     * 点击计算
+     */
+    fun onClickCalcDisance() {
+
+    }
+
+    /**
+     * 点击轨迹
+     */
+    fun onClickTrace() {
+
+    }
+
+    /**
+     * 点击搜索
+     */
+    fun onClickSerach() {
+
+    }
+
+    /**
+     * 点击2\3D
+     */
+    fun onClick2DOr3D() {
+
+    }
+
+
     /**
      * 点击录音按钮
      */

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -83,6 +83,10 @@ class MainViewModel @Inject constructor(
     var volume: ImageView? = null
     var mSoundMeter: SoundMeter? = null
 
+    var menuState :Boolean = false
+
+    val liveDataMenuState = MutableLiveData<Boolean>()
+
     init {
         mapController.markerHandle.setOnQsRecordItemClickListener(object :
             OnQsRecordItemClickListener {
@@ -221,6 +225,14 @@ class MainViewModel @Inject constructor(
         mapController.locationLayerHandler.animateToCurrentPosition()
     }
 
+    /**
+     * 点击菜单
+     */
+    fun onClickMenu() {
+        menuState = !menuState
+        liveDataMenuState.postValue(menuState)
+    }
+
     override fun onCleared() {
         super.onCleared()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {