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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt

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

@@ -462,6 +462,24 @@ class MainActivity : BaseActivity() {
         }
     }
 
+    /**
+     * 准星的显隐控制
+     */
+    fun setHomeCenterVisibility(visible: Int) {
+        binding.mainActivityHomeCenter.visibility = visible
+        binding.mainActivityHomeCenterText.visibility = visible
+        if (visible != View.VISIBLE) {
+            binding.mainActivityHomeCenterText.text = ""
+        }
+    }
+
+    /**
+     * 设置屏幕中心文字内容
+     */
+    fun setHomeCenterText(str: String) {
+        binding.mainActivityHomeCenterText.text = str
+    }
+
     /**
      * 隐藏或显示右侧展开按钮
      */
@@ -474,6 +492,10 @@ class MainActivity : BaseActivity() {
      */
     fun setTopMenuButtonVisibility(visibility: Int) {
         binding.mainActivityMenu.visibility = visibility
+        if (visibility != View.VISIBLE) {
+            binding.mainActivityMenuGroup.visibility = View.INVISIBLE
+            binding.mainActivityMenu.isSelected = false
+        }
     }
 
     /**
@@ -608,8 +630,14 @@ class MainActivity : BaseActivity() {
      */
     fun onClickNewNote() {
         rightController.navigate(R.id.NoteFragment)
-        binding.mainActivityMenu.isSelected = false
-        binding.mainActivityMenuGroup.visibility = View.INVISIBLE
+    }
+
+    /**
+     * 新增评测link
+     */
+    fun onClickTaskLink() {
+        rightController.navigate(R.id.TaskLinkFragment)
+
     }
 
     /**