diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 12464cbf..c46932f7 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -440,6 +440,12 @@ class MainActivity : BaseActivity() { */ fun onSwitchSheet() { if (binding.mainActivityBottomSheetGroup.visibility == View.VISIBLE) { + leftFragment?.let { + supportFragmentManager.beginTransaction().remove(it).commit() + leftFragment = null + binding.mainActivityLeftFragment.visibility = View.GONE + } + binding.mainActivityBottomSheetGroup.visibility = View.GONE } else { binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE @@ -500,6 +506,13 @@ class MainActivity : BaseActivity() { } } + /** + * 路径规划 + */ + fun onClickRouteFragment() { + Toast.makeText(this, "功能开发中", Toast.LENGTH_SHORT).show() + } + /** * 打开离线地图 */ diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt index 966f5666..3318c4c6 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.View import android.view.View.OnClickListener import android.view.ViewGroup +import android.widget.Toast import androidx.fragment.app.Fragment import androidx.transition.AutoTransition import androidx.transition.Scene @@ -153,6 +154,11 @@ class ConsoleFragment : BaseFragment(), OnClickListener { */ binding.consoleRoot.findViewById(R.id.console_task_bg)?.setOnClickListener(this) binding.consoleRoot.findViewById(R.id.console_task_icon_bg)?.setOnClickListener(this) + /** + * 路径规划 + */ + binding.consoleRoot.findViewById(R.id.console_route_bg)?.setOnClickListener(this) + binding.consoleRoot.findViewById(R.id.console_route_icon_bg)?.setOnClickListener(this) } override fun onDestroy() { @@ -232,6 +238,9 @@ class ConsoleFragment : BaseFragment(), OnClickListener { (a as MainActivity).onClickResFragment() } } + /** + * 任务列表 + */ R.id.console_task_icon_bg, R.id.console_task_bg -> { activity?.let { a -> a.supportFragmentManager.beginTransaction().remove(this).commit() @@ -239,6 +248,12 @@ class ConsoleFragment : BaseFragment(), OnClickListener { } } + /** + * 路径规划 + */ + R.id.console_route_bg, R.id.console_route_icon_bg -> { + Toast.makeText(requireContext(), "功能开发中", Toast.LENGTH_SHORT).show() + } else -> {} } } diff --git a/app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png b/app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png index e8342f10..c10da04a 100644 Binary files a/app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png and b/app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 99828062..77fc36a0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -423,6 +423,7 @@ android:background="@drawable/icon_main_bottom_route" app:layout_constraintBottom_toTopOf="@id/main_bottom_route_text" app:layout_constraintLeft_toRightOf="@id/main_bottom_offline_map" + android:onClick="@{()->mainActivity.onClickRouteFragment()}" app:layout_constraintRight_toRightOf="@id/main_activity_bottom_sheet_bg" app:layout_constraintTop_toTopOf="@id/main_bottom_task" app:layout_constraintVertical_chainStyle="packed" /> @@ -434,6 +435,7 @@ android:text="路径规划" android:textColor="@color/blue" android:textSize="10sp" + android:onClick="@{()->mainActivity.onClickRouteFragment()}" app:layout_constraintBottom_toBottomOf="@id/main_activity_bottom_sheet_bg" app:layout_constraintLeft_toLeftOf="@id/main_bottom_route" app:layout_constraintRight_toRightOf="@id/main_bottom_route"