From e352a34ef9551633026421e08a5c7324194f04a9 Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Wed, 14 Jun 2023 13:47:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E6=8E=A7?= =?UTF-8?q?=E8=81=94=E5=8A=A8UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 11 - .../omqs/ui/activity/login/LoginActivity.kt | 4 +- .../omqs/ui/activity/map/MainActivity.kt | 155 ++++- .../console/ConsoleFragment.kt} | 126 ++-- .../EvaluationResultFragment.kt | 48 +- ...gerFragment.kt => LayerManagerFragment.kt} | 12 +- .../fragment/offlinemap/OfflineMapFragment.kt | 5 +- .../personalcenter/PersonalCenterFragment.kt | 5 +- .../qsrecordlist/QsRecordListFragment.kt | 12 +- .../fragment/tasklist/TaskManagerFragment.kt | 4 +- .../res/drawable-v24/baseline_minimize_24.xml | 10 + .../drawable-xxhdpi/icon_main_bottom_home.png | Bin 0 -> 8002 bytes .../icon_main_bottom_offline_map.png | Bin 0 -> 5513 bytes .../drawable-xxhdpi/icon_main_bottom_res.png | Bin 0 -> 4378 bytes .../icon_main_bottom_route.png | Bin 0 -> 3909 bytes .../drawable-xxhdpi/icon_main_bottom_task.png | Bin 0 -> 4256 bytes .../main/res/drawable/shape_bottom_sheet.xml | 15 + app/src/main/res/layout/activity_main.xml | 614 +++++++++++------- app/src/main/res/layout/adapter_sign.xml | 2 +- app/src/main/res/layout/console_off.xml | 2 +- app/src/main/res/layout/console_on.xml | 2 +- ...ivity_console.xml => fragment_console.xml} | 3 +- .../res/navigation/left_drawer_nav_graph.xml | 2 +- app/src/main/res/values/styles.xml | 5 + .../src/main/assets/editormarker.xml | 28 +- .../src/main/assets/omdb/icon_4002_0.png | Bin 7441 -> 0 bytes .../src/main/assets/omdb/icon_4002_0.svg | 1 + .../src/main/assets/omdb/icon_4002_1.png | Bin 9099 -> 0 bytes .../src/main/assets/omdb/icon_4002_1.svg | 1 + .../src/main/assets/omdb/icon_4003_0.png | Bin 9181 -> 0 bytes .../src/main/assets/omdb/icon_4003_0.svg | 1 + .../src/main/assets/omdb/icon_4003_1.png | Bin 10639 -> 0 bytes .../src/main/assets/omdb/icon_4003_1.svg | 1 + .../src/main/assets/omdb/icon_4004_0.png | Bin 8316 -> 0 bytes .../src/main/assets/omdb/icon_4004_0.svg | 1 + .../src/main/assets/omdb/icon_4004_1.png | Bin 9309 -> 0 bytes .../src/main/assets/omdb/icon_4006_0.png | Bin 9738 -> 0 bytes .../src/main/assets/omdb/icon_4006_0.svg | 1 + .../src/main/assets/omdb/icon_4022_0.png | Bin 26723 -> 0 bytes .../src/main/assets/omdb/icon_4022_0.svg | 162 +++++ .../src/main/assets/omdb/icon_arrow_right.png | Bin 1032 -> 0 bytes .../src/main/assets/omdb/icon_arrow_right.svg | 40 ++ .../collect/library/map/NIMapView.java | 3 +- .../map/handler/LayerManagerHandler.kt | 55 +- vtm | 2 +- 45 files changed, 900 insertions(+), 433 deletions(-) rename app/src/main/java/com/navinfo/omqs/ui/{activity/console/ConsoleActivity.kt => fragment/console/ConsoleFragment.kt} (63%) rename app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/{LayermanagerFragment.kt => LayerManagerFragment.kt} (82%) create mode 100644 app/src/main/res/drawable-v24/baseline_minimize_24.xml create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_home.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_offline_map.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_res.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_route.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_task.png create mode 100644 app/src/main/res/drawable/shape_bottom_sheet.xml rename app/src/main/res/layout/{activity_console.xml => fragment_console.xml} (81%) delete mode 100644 collect-library/src/main/assets/omdb/icon_4002_0.png create mode 100644 collect-library/src/main/assets/omdb/icon_4002_0.svg delete mode 100644 collect-library/src/main/assets/omdb/icon_4002_1.png create mode 100644 collect-library/src/main/assets/omdb/icon_4002_1.svg delete mode 100644 collect-library/src/main/assets/omdb/icon_4003_0.png create mode 100644 collect-library/src/main/assets/omdb/icon_4003_0.svg delete mode 100644 collect-library/src/main/assets/omdb/icon_4003_1.png create mode 100644 collect-library/src/main/assets/omdb/icon_4003_1.svg delete mode 100644 collect-library/src/main/assets/omdb/icon_4004_0.png create mode 100644 collect-library/src/main/assets/omdb/icon_4004_0.svg delete mode 100644 collect-library/src/main/assets/omdb/icon_4004_1.png delete mode 100644 collect-library/src/main/assets/omdb/icon_4006_0.png create mode 100644 collect-library/src/main/assets/omdb/icon_4006_0.svg delete mode 100644 collect-library/src/main/assets/omdb/icon_4022_0.png create mode 100644 collect-library/src/main/assets/omdb/icon_4022_0.svg delete mode 100644 collect-library/src/main/assets/omdb/icon_arrow_right.png create mode 100644 collect-library/src/main/assets/omdb/icon_arrow_right.svg diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 184ccfd4..449d6cf9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -63,17 +63,6 @@ android:launchMode="singleTask" android:screenOrientation="landscape" android:theme="@style/Theme.OMQualityInspection" /> - - - - - diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt index d7ed2643..5def15d7 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt @@ -13,8 +13,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.navinfo.omqs.R import com.navinfo.omqs.databinding.ActivityLoginBinding import com.navinfo.omqs.ui.activity.CheckPermissionsActivity -import com.navinfo.omqs.ui.activity.PermissionsActivity -import com.navinfo.omqs.ui.activity.console.ConsoleActivity import com.navinfo.omqs.ui.activity.map.MainActivity import dagger.hilt.android.AndroidEntryPoint @@ -90,7 +88,7 @@ class LoginActivity : CheckPermissionsActivity() { LoginStatus.LOGIN_STATUS_SUCCESS -> { loginDialog?.dismiss() loginDialog = null - val intent = Intent(this@LoginActivity, ConsoleActivity::class.java) + val intent = Intent(this@LoginActivity, MainActivity::class.java) startActivity(intent) finish() } 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 5a130f78..d5574fb1 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 @@ -12,12 +12,9 @@ import android.widget.EditText import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels -import androidx.annotation.RequiresApi -import androidx.core.view.WindowCompat import androidx.databinding.DataBindingUtil +import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope -import androidx.navigation.NavController -import androidx.navigation.NavDestination import androidx.navigation.findNavController import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -30,6 +27,10 @@ import com.navinfo.omqs.databinding.ActivityMainBinding import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager import com.navinfo.omqs.tools.LayerConfigUtils import com.navinfo.omqs.ui.activity.BaseActivity +import com.navinfo.omqs.ui.fragment.console.ConsoleFragment +import com.navinfo.omqs.ui.fragment.offlinemap.OfflineMapFragment +import com.navinfo.omqs.ui.fragment.qsrecordlist.QsRecordListFragment +import com.navinfo.omqs.ui.fragment.tasklist.TaskManagerFragment import com.navinfo.omqs.ui.widget.RecyclerViewSpacesItemDecoration import com.navinfo.omqs.util.FlowEventBus import com.navinfo.omqs.util.SpeakMode @@ -49,6 +50,14 @@ class MainActivity : BaseActivity() { private lateinit var binding: ActivityMainBinding private val viewModel by viewModels() + /** + * 左侧fragment + */ + private var leftFragment: Fragment? = null + + /** + * 是否开启右侧面板 + */ var switchFragment = false /** @@ -79,7 +88,7 @@ class MainActivity : BaseActivity() { * 提前显示要素看板 */ private val signAdapter by lazy { - SignAdapter { position, autoSave,signBean -> + SignAdapter { _, autoSave, signBean -> rightController.currentDestination?.let { if (it.id == R.id.RightEmptyFragment) { val bundle = Bundle() @@ -95,7 +104,7 @@ class MainActivity : BaseActivity() { * 道路信息看板 */ private val topSignAdapter by lazy { - TopSignAdapter { position, signBean -> + TopSignAdapter { _, signBean -> rightController.currentDestination?.let { if (it.id == R.id.RightEmptyFragment) { val bundle = Bundle() @@ -108,7 +117,6 @@ class MainActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { - WindowCompat.setDecorFitsSystemWindows(window, false) super.onCreate(savedInstanceState) val checkIntent = Intent() @@ -138,22 +146,19 @@ class MainActivity : BaseActivity() { //给xml传递viewModel对象 binding.viewModel = viewModel - binding.mainActivityVoice.setOnTouchListener(object : View.OnTouchListener { - @RequiresApi(Build.VERSION_CODES.Q) - override fun onTouch(v: View?, event: MotionEvent?): Boolean { - when (event?.action) { - MotionEvent.ACTION_DOWN -> { - voiceOnTouchStart()//Do Something - Log.e("qj", "voiceOnTouchStart") - } - MotionEvent.ACTION_UP -> { - voiceOnTouchStop()//Do Something - Log.e("qj", "voiceOnTouchStop") - } + binding.mainActivityVoice.setOnTouchListener { v, event -> + when (event?.action) { + MotionEvent.ACTION_DOWN -> { + voiceOnTouchStart()//Do Something + Log.e("qj", "voiceOnTouchStart") + } + MotionEvent.ACTION_UP -> { + voiceOnTouchStop()//Do Something + Log.e("qj", "voiceOnTouchStop") } - return v?.onTouchEvent(event) ?: true } - }) + v?.onTouchEvent(event) ?: true + } viewModel.liveDataQsRecordIdList.observe(this) { //处理页面跳转 @@ -217,7 +222,7 @@ class MainActivity : BaseActivity() { } } - findNavController(R.id.main_activity_right_fragment).addOnDestinationChangedListener { controller, destination, arguments -> + findNavController(R.id.main_activity_right_fragment).addOnDestinationChangedListener { _, destination, arguments -> if (destination.id == R.id.RightEmptyFragment) { binding.mainActivityRightVisibilityButtonsGroup.visibility = View.VISIBLE } else { @@ -226,6 +231,9 @@ class MainActivity : BaseActivity() { binding.mainActivitySelectLine.isSelected = false } } + + supportFragmentManager.beginTransaction() + .add(R.id.console_fragment_layout, ConsoleFragment()).commit() } //根据输入的经纬度跳转坐标 @@ -292,7 +300,15 @@ class MainActivity : BaseActivity() { * 打开个人中菜单 */ fun openMenu() { - binding.mainActivityDrawer.open() + supportFragmentManager.beginTransaction() + .replace(R.id.console_fragment_layout, ConsoleFragment()).commit() + if (leftFragment != null) { + supportFragmentManager.beginTransaction().remove(leftFragment!!).commit() + leftFragment = null + binding.mainActivityBottomSheetGroup.visibility = View.GONE + binding.mainActivityLeftFragment.visibility = View.GONE + } +// binding.mainActivityDrawer.open() } /** @@ -328,7 +344,7 @@ class MainActivity : BaseActivity() { /** * 点击搜索 */ - fun onClickSerach() { + fun onClickSearch() { } @@ -389,18 +405,89 @@ class MainActivity : BaseActivity() { binding.mainActivitySelectLine.isSelected = viewModel.isSelectRoad() } - fun voiceOnTouchStart() { - viewModel.startSoundMetter(this, binding.mainActivityVoice) - } - @RequiresApi(Build.VERSION_CODES.Q) - fun voiceOnTouchStop() { - if (Constant.IS_VIDEO_SPEED) { - viewModel.stopSoundMeter() + /** + * 打开或关闭底部导航栏 + */ + fun onSwitchSheet() { + if (binding.mainActivityBottomSheetGroup.visibility == View.VISIBLE) { + binding.mainActivityBottomSheetGroup.visibility = View.GONE + } else { + binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE } } -// override fun onBackPressed() { -// super.onBackPressed() -// } + private fun voiceOnTouchStart() { + viewModel.startSoundMetter(this, binding.mainActivityVoice) + } + + private fun voiceOnTouchStop() { + if (Constant.IS_VIDEO_SPEED) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + viewModel.stopSoundMeter() + } + } + } + + /** + * 打开测评任务面板 + */ + fun onClickTaskFragment() { + if (leftFragment !is TaskManagerFragment) { + if (leftFragment == null) { + binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE + binding.mainActivityLeftFragment.visibility = View.VISIBLE + } + leftFragment = TaskManagerFragment { + binding.mainActivityLeftFragment.visibility = View.GONE + supportFragmentManager.beginTransaction() + .remove(leftFragment!!).commit() + leftFragment = null + null + } + supportFragmentManager.beginTransaction() + .replace(R.id.main_activity_left_fragment, leftFragment!!).commit() + } + } + + /** + * 打开测评结果面板 + */ + fun onClickResFragment() { + if (leftFragment !is QsRecordListFragment) { + if (leftFragment == null) { + binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE + binding.mainActivityLeftFragment.visibility = View.VISIBLE + } + leftFragment = QsRecordListFragment { + binding.mainActivityLeftFragment.visibility = View.GONE + supportFragmentManager.beginTransaction() + .remove(leftFragment!!).commit() + leftFragment = null + null + } + supportFragmentManager.beginTransaction() + .replace(R.id.main_activity_left_fragment, leftFragment!!).commit() + } + } + /** + * 打开离线地图 + */ + fun onClickOfflineMapFragment(){ + if (leftFragment !is OfflineMapFragment) { + if (leftFragment == null) { + binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE + binding.mainActivityLeftFragment.visibility = View.VISIBLE + } + leftFragment = OfflineMapFragment { + binding.mainActivityLeftFragment.visibility = View.GONE + supportFragmentManager.beginTransaction() + .remove(leftFragment!!).commit() + leftFragment = null + null + } + supportFragmentManager.beginTransaction() + .replace(R.id.main_activity_left_fragment, leftFragment!!).commit() + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt similarity index 63% rename from app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt rename to app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt index 589d33f2..c882bb55 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt @@ -1,27 +1,30 @@ -package com.navinfo.omqs.ui.activity.console +package com.navinfo.omqs.ui.fragment.console -import android.content.Intent import android.os.Bundle import android.util.Log +import android.view.LayoutInflater import android.view.View import android.view.View.OnClickListener +import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.transition.AutoTransition import androidx.transition.Scene import androidx.transition.TransitionManager import com.navinfo.omqs.R -import com.navinfo.omqs.databinding.ActivityConsoleBinding -import com.navinfo.omqs.ui.activity.BaseActivity +import com.navinfo.omqs.databinding.FragmentConsoleBinding import com.navinfo.omqs.ui.activity.map.MainActivity -import com.navinfo.omqs.ui.fragment.layermanager.LayermanagerFragment +import com.navinfo.omqs.ui.fragment.BaseFragment +import com.navinfo.omqs.ui.fragment.evaluationresult.EvaluationResultFragment +import com.navinfo.omqs.ui.fragment.layermanager.LayerManagerFragment import com.navinfo.omqs.ui.fragment.offlinemap.OfflineMapFragment import com.navinfo.omqs.ui.fragment.personalcenter.PersonalCenterFragment +import com.navinfo.omqs.ui.fragment.qsrecordlist.QsRecordListFragment import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint -class ConsoleActivity : BaseActivity(), OnClickListener { +class ConsoleFragment : BaseFragment(), OnClickListener { - private var _binding: ActivityConsoleBinding? = null + private var _binding: FragmentConsoleBinding? = null private val binding get() = _binding!! private var sceneFlag = true private val aTransition = AutoTransition() @@ -32,14 +35,14 @@ class ConsoleActivity : BaseActivity(), OnClickListener { // 创建a场景 private val aScene by lazy { Scene.getSceneForLayout( - binding.consoleRoot, R.layout.console_on, this + binding.consoleRoot, R.layout.console_on, requireContext() ) } // 创建b场景 private val bScene by lazy { Scene.getSceneForLayout( - binding.consoleRoot, R.layout.console_off, this + binding.consoleRoot, R.layout.console_off, requireContext() ) } @@ -48,18 +51,21 @@ class ConsoleActivity : BaseActivity(), OnClickListener { // .inflateTransitionManager(R.transition.transitionmanager_console, binding.consoleRoot) // } + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? + ): View { + _binding = FragmentConsoleBinding.inflate(inflater, container, false) + return binding.root + } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - _binding = ActivityConsoleBinding.inflate(layoutInflater) - setContentView(_binding!!.root) -// mTransitionAManager.setTransition(bScene, transition) - + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) aTransition.addListener(object : androidx.transition.Transition.TransitionListener { override fun onTransitionStart(transition: androidx.transition.Transition) { + sceneFlag = true if (mFragment != null) { Log.e("jingo", "动画开始B mFragment 不为null") - supportFragmentManager.beginTransaction().remove(mFragment!!).commit() + childFragmentManager.beginTransaction().remove(mFragment!!).commit() mFragment = null } } @@ -81,9 +87,10 @@ class ConsoleActivity : BaseActivity(), OnClickListener { }) bTransition.addListener(object : androidx.transition.Transition.TransitionListener { override fun onTransitionStart(transition: androidx.transition.Transition) { + sceneFlag = false if (mFragment != null) { Log.e("jingo", "动画开始A mFragment 不为null") - supportFragmentManager.beginTransaction().replace(fragmentId, mFragment!!) + childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!) .commit() } } @@ -105,6 +112,7 @@ class ConsoleActivity : BaseActivity(), OnClickListener { initOnClickListener() } + /** * 设置点击事件 */ @@ -142,8 +150,12 @@ class ConsoleActivity : BaseActivity(), OnClickListener { */ binding.consoleRoot.findViewById(R.id.console_evaluation_icon_bg) ?.setOnClickListener(this) - binding.consoleRoot.findViewById(R.id.console_evaluation_bg) - ?.setOnClickListener(this) + binding.consoleRoot.findViewById(R.id.console_evaluation_bg)?.setOnClickListener(this) + /** + * 评测任务 + */ + binding.consoleRoot.findViewById(R.id.console_task_bg)?.setOnClickListener(this) + binding.consoleRoot.findViewById(R.id.console_task_icon_bg)?.setOnClickListener(this) } override fun onDestroy() { @@ -158,39 +170,37 @@ class ConsoleActivity : BaseActivity(), OnClickListener { * 地图点击事件 */ R.id.console_map_bg, R.id.console_map_icon_bg -> { - val intent = Intent(this, MainActivity::class.java) - startActivity(intent) + activity?.let { a -> + a.supportFragmentManager.beginTransaction().remove(this).commit() + } } /** * 离线地图点击 */ R.id.console_offline_map_icon_bg, R.id.console_offline_map_bg -> { - if (sceneFlag) { - mFragment = OfflineMapFragment() - sceneFlag = false - TransitionManager.go(bScene, bTransition) - } else { - if (mFragment !is OfflineMapFragment) { - mFragment = OfflineMapFragment() - supportFragmentManager.beginTransaction() - .replace(fragmentId, mFragment!!).commit() - } - return + activity?.let { a -> + a.supportFragmentManager.beginTransaction().remove(this).commit() + (a as MainActivity).onClickOfflineMapFragment() } + } /** * 个人中心点击 */ R.id.console_personal_center_bg, R.id.console_personal_center_icon_bg -> { if (sceneFlag) { - mFragment = PersonalCenterFragment() + mFragment = PersonalCenterFragment { + TransitionManager.go(aScene, aTransition) + } sceneFlag = false TransitionManager.go(bScene, bTransition) } else { if (mFragment !is PersonalCenterFragment) { - mFragment = PersonalCenterFragment() - supportFragmentManager.beginTransaction() - .replace(fragmentId, mFragment!!).commit() + mFragment = PersonalCenterFragment { + TransitionManager.go(aScene, aTransition) + } + childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!) + .commit() } return } @@ -199,36 +209,38 @@ class ConsoleActivity : BaseActivity(), OnClickListener { * 图层设置 */ R.id.console_layer_setting_bg, R.id.console_layer_setting_icon_bg -> { -/* if (sceneFlag) { - mFragment = LayermanagerFragment() + if (sceneFlag) { + mFragment = LayerManagerFragment { + TransitionManager.go(aScene, aTransition) + } sceneFlag = false TransitionManager.go(bScene, bTransition) } else { - if (mFragment !is LayermanagerFragment) { - mFragment = LayermanagerFragment() - supportFragmentManager.beginTransaction() - .replace(fragmentId, mFragment!!).commit() + if (mFragment !is LayerManagerFragment) { + mFragment = LayerManagerFragment { + TransitionManager.go(aScene, aTransition) + } + childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!) + .commit() } return - }*/ + } } /** * 测评结果列表 */ - R.id.console_evaluation_icon_bg, - R.id.console_evaluation_bg -> { -// if (sceneFlag) { -// mFragment = LayermanagerFragment() -// sceneFlag = false -// TransitionManager.go(bScene, bTransition) -// } else { -// if (mFragment !is LayermanagerFragment) { -// mFragment = LayermanagerFragment() -// supportFragmentManager.beginTransaction() -// .replace(fragmentId, mFragment!!).commit() -// } -// return -// } + R.id.console_evaluation_icon_bg, R.id.console_evaluation_bg -> { + activity?.let { a -> + a.supportFragmentManager.beginTransaction().remove(this).commit() + (a as MainActivity).onClickResFragment() + } + } + R.id.console_task_icon_bg, R.id.console_task_bg -> { + activity?.let { a -> + a.supportFragmentManager.beginTransaction().remove(this).commit() + (a as MainActivity).onClickTaskFragment() + } + } else -> {} } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt index f44a8f3c..d2f0ccae 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt @@ -93,29 +93,26 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener { } - binding.evaluationVoice.setOnTouchListener(object : View.OnTouchListener { - @RequiresApi(Build.VERSION_CODES.Q) - override fun onTouch(v: View?, event: MotionEvent?): Boolean { - Log.e("qj", event?.action.toString()) - when (event?.action) { - MotionEvent.ACTION_DOWN -> { - voiceOnTouchStart()//Do Something - Log.e("qj", "voiceOnTouchStart") - } - - MotionEvent.ACTION_UP -> { - voiceOnTouchStop()//Do Something - Log.e("qj", "ACTION_UP") - } - - MotionEvent.ACTION_CANCEL -> { - voiceOnTouchStop()//Do Something - Log.e("qj", "ACTION_CANCEL") - } + binding.evaluationVoice.setOnTouchListener { _, event -> + Log.e("qj", event?.action.toString()) + when (event?.action) { + MotionEvent.ACTION_DOWN -> { + voiceOnTouchStart()//Do Something + Log.e("qj", "voiceOnTouchStart") + } + + MotionEvent.ACTION_UP -> { + voiceOnTouchStop()//Do Something + Log.e("qj", "ACTION_UP") + } + + MotionEvent.ACTION_CANCEL -> { + voiceOnTouchStop()//Do Something + Log.e("qj", "ACTION_CANCEL") } - return true } - }) + true + } /** * 读取元数据 @@ -308,15 +305,16 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener { } } - fun voiceOnTouchStart() { + private fun voiceOnTouchStart() { viewModel.startSoundMetter(requireActivity(), binding.evaluationVoice) } - @RequiresApi(Build.VERSION_CODES.Q) - fun voiceOnTouchStop() { + private fun voiceOnTouchStop() { Log.e("qj", "voiceOnTouchStop====${Constant.IS_VIDEO_SPEED}") if (Constant.IS_VIDEO_SPEED) { - viewModel.stopSoundMeter() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + viewModel.stopSoundMeter() + } } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayermanagerFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt similarity index 82% rename from app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayermanagerFragment.kt rename to app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt index ba11a236..69230988 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayermanagerFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt @@ -4,17 +4,12 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController -import com.blankj.utilcode.util.SPStaticUtils -import com.navinfo.omqs.Constant -import com.navinfo.omqs.databinding.FragmentEmptyBinding import com.navinfo.omqs.databinding.FragmentLayerManagerBinding import com.navinfo.omqs.ui.fragment.BaseFragment -import com.navinfo.omqs.ui.fragment.offlinemap.OfflineMapCityListViewModel -class LayermanagerFragment : BaseFragment(){ +class LayerManagerFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment(){ private var _binding: FragmentLayerManagerBinding? = null private val binding get() = _binding!! @@ -44,13 +39,14 @@ class LayermanagerFragment : BaseFragment(){ } binding.imgBack.setOnClickListener { - findNavController().navigateUp() + backListener?.invoke() } - binding.tvTitle.text = findNavController().currentDestination?.label + binding.tvTitle.text = "图层设置"//findNavController().currentDestination?.label binding.imgConfirm.setOnClickListener { // 用户点击确认，重新设置当前的图层显隐控制 viewModel.saveLayerConfigList(adapter.parentItems) + backListener?.invoke() } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt index c04ceb9d..2e8d7ac3 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt @@ -13,7 +13,8 @@ import com.navinfo.omqs.ui.fragment.BaseFragment /** * 离线地图总页面 */ -class OfflineMapFragment : BaseFragment() { +class OfflineMapFragment(private var backListener: (() -> Unit?)? = null) : + BaseFragment() { private var _binding: FragmentOfflineMapBinding? = null @@ -48,7 +49,7 @@ class OfflineMapFragment : BaseFragment() { //处理返回按钮 binding.offlineMapBack.setOnClickListener { - findNavController().popBackStack() + backListener?.invoke() } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt index 5d53c83a..82b04705 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt @@ -29,7 +29,8 @@ import javax.inject.Inject * 个人中心 */ @AndroidEntryPoint -class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks { +class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment(), + FSAFActivityCallbacks { private var _binding: FragmentPersonalCenterBinding? = null private val binding get() = _binding!! @@ -111,7 +112,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks { viewModel.readRealmData() // 定位到指定位置 niMapController.mMapView.vtmMap.animator() - .animateTo(GeoPoint(40.031657799200346, 116.32207834810715 )) + .animateTo(GeoPoint(40.031657799200346, 116.32207834810715)) } R.id.personal_center_menu_task_list -> { findNavController().navigate(R.id.TaskManagerFragment) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt index e4fb1819..30d52e77 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt @@ -16,7 +16,7 @@ import com.navinfo.omqs.ui.fragment.tasklist.QsRecordListAdapter import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint -class QsRecordListFragment : BaseFragment(){ +class QsRecordListFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment() { private var _binding: FragmentQsRecordListBinding? = null private val viewModel by viewModels() private val binding get() = _binding!! @@ -44,7 +44,7 @@ class QsRecordListFragment : BaseFragment(){ binding.qsRecyclerview.adapter = adapter viewModel.liveDataQSList.observe(viewLifecycleOwner) { adapter.refreshData(it) - binding.tvTitleCount.text = "共"+adapter.data.size+"条" + binding.tvTitleCount.text = "共" + adapter.data.size + "条" } val itemDecoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL) itemDecoration.setDrawable(resources.getDrawable(R.drawable.separator)) @@ -53,13 +53,13 @@ class QsRecordListFragment : BaseFragment(){ // itemClick adapter.setOnKotlinItemClickListener(object : QsRecordListAdapter.IKotlinItemClickListener { override fun onItemClickListener(position: Int) { - viewModel.onItemClickListener(activity as MainActivity,position) - findNavController().popBackStack() + viewModel.onItemClickListener(activity as MainActivity, position) + backListener?.invoke() } }) - binding.imgBack.setOnClickListener{ - findNavController().navigateUp() + binding.imgBack.setOnClickListener { + backListener?.invoke() } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt index 8c74cdfc..ec11bd80 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt @@ -15,7 +15,7 @@ import dagger.hilt.android.AndroidEntryPoint * 评测任务viewpager管理页面 */ @AndroidEntryPoint -class TaskManagerFragment : BaseFragment() { +class TaskManagerFragment(private var backListener: ((TaskManagerFragment) -> Unit?)? = null) : BaseFragment() { private var _binding: FragmentTaskManagerBinding? = null private val binding get() = _binding!! @@ -53,7 +53,7 @@ class TaskManagerFragment : BaseFragment() { }.attach() viewModel.getTaskList(requireContext()) binding.taskBack.setOnClickListener { - findNavController().navigateUp() + backListener?.invoke(this) } } diff --git a/app/src/main/res/drawable-v24/baseline_minimize_24.xml b/app/src/main/res/drawable-v24/baseline_minimize_24.xml new file mode 100644 index 00000000..73c835c2 --- /dev/null +++ b/app/src/main/res/drawable-v24/baseline_minimize_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_home.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_home.png new file mode 100644 index 0000000000000000000000000000000000000000..5b5ad319c5b16435785592866ac2c37de1b672c6 GIT binary patch literal 8002 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_offline_map.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_offline_map.png new file mode 100644 index 0000000000000000000000000000000000000000..3ca4ce2bb77bd3a1ab5214251b995478b7fdec13 GIT binary patch literal 5513 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 LNkvXXu0mjfjca2d literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_res.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_res.png new file mode 100644 index 0000000000000000000000000000000000000000..e14eff80f17fb5fa9a678b087cab028da550313a GIT binary patch literal 4378 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 U9+)pE{{R3007*qoM6N<$f>auV^#A|> literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_route.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_route.png new file mode 100644 index 0000000000000000000000000000000000000000..38b06d45738a0a9e675f0378ecb904274fee9377 GIT binary patch literal 3909 zcmV-L54!M)P)Px@|4BqaRA@u(S_yDe*Ok5Z{r|gLYlsb!7h=m8WI%usV$4ny#1difL?_=0`#3x*f|3b?OWeBrq2RH0#@m8GGR zVYRk2uw|HyFTFdqxi@p{a~3Ynt<4~lmNCIJU>Ym{ZUp8lNYDz*6$o5znOItO4u3`Gj44N_Sg7z86Q(>}xUeSPhTp$)M> zf36muKjl<05^ewhUnCHpNQMwM%-eb(^92vU;*8w^vtRme0bnVTirmVw4rpWu66<$t zJU;y6z72TN>3nxonnm%c`;(BLO@(^5`Ie;?F>QV`TL9i4;3@#U3Pf-1-1U`Hu~yl;UNoutC&1z zX9AW#YklP%mm|koH0sziX4;7iNnYAg*Zr6R#FsOk`K&CQS8(-4zij;`B0i>z#G6@$ z90p{Q1TR-=pbH;Zp{q3j{0GDI|7TfwT9k#_FGSJgnz<-xD>EmAb1o4WA`vXv@~@Y# zh~@u#YDiE$w`kOnG-k0*fHs@R3X>2wm0dPM+R!z%BhSTJ>~4crVPSnjla=@#CVJRs zq-II8QL&pg_p|q%aznNE9KwL0fdCCyw$`$wr?;19tmk4$yxRd`aK->$gh(|QDQYpv&xT(mVL;H6T zOCj)k>pmF$hgjCN=ib>(xw)(-+;Cx!E&}7pYH?Rx4Dd#%l!-6#+ zHrG7&_TZ)MC%0(SktFF0>;Q&5ryPtZ9Ms~47uKzwI1ILI{mJa2c)@l6Jg4yDZBo*4 z1WXKbTKj#D8`~}&xo0EFw~nP;WQpgLbwJcW%wK(e|B%D&Cs~|*EKi`=0nAC>B6sJ~ zg5jJ=NtvamhFra7!1)EA{+F&Nd`DW%4)f`(T5&Duq$6S9!zxX*b7MPVN4Q_uO28|5 zU&Rm0ph&i#=)%!eztXgXAFKB}_q(ngF^)SX3E~CoPK|l4Ct#y2toCkl|Nbo`gYM*` z(@kWe7a%}axzfB^15854gbbCN74WEi9l6Kt$*X8DFR+2b%JvNTq_fFBIJ)W;9rPKb za=qFoT}5O%fTl`hv#a zdBkGYtoj=gO}Ppg3z6;38YU#|-O{h6fZ2L={FZk!4|X=eC3k(067pFm5%4CCP(Rcb zQz{38tXTiS=$v@Kb#_k#;7@l8z}%>y5#`csTUA<(Pwm(>@MoP3Hg9U(PZ9A+CaF0t z-49G4r1-O?Gyd~fTap`*H+^rEbzKh#Cy zucd7A>R(f1Sg`iw=f{a_tiuXeFd996>_7G2K+xviaSiiSbNODIIlnV3otyta$E^b&m^}{krdyS|YwV zN*s&e$r|VYWWK%q)q#_{8?Gq5V?7h=dRrdO|9F7UNIb8~!LYg?cIh?} zqC7xHKadQz0LgvGXae&zfrgJ2OKYbsci_VSt(s-r{_N4g=VMK7@sPud4Uw?UlFa~; zngoi!eWqs2>#?5e?s`(J7ln^IC zt8q7(A^KKXRhHt8-G073_{cyB@&qs>+V5f7wXQZN-!0?a6cTHc=<88{=gc`jL?bw9 z=g{^o4-c$*zO%kh`(nYPm(gsk8G-LBJ)9M%l^7QfKD-=>|4DhBDlwTtYoGaW+`~PC z*>-mn;QV~{8*p|#G8DH7bWXRf10m_GZ1g0WPPnuxIEduF&6UF^^<=WSuv;HADD`z9 znt}|dp#f3`-_fKt56-~Ht6{9!lkqwv|AJZP?j|q~06`!s(z+zX7VA9s4CmSIl@N!_ z*pcs!O^1ia6wBKKP@wP3NO>HX9~U4{1yW+O6$zh5mT!@?4y-vp^=Lf6J7qiHm~m!> z5c-eoQqdzJFIqw*^rwn)#0VlYJNy1%vH!nsi zA?|*6M0>Tu1lI0N6~np|;d^4yc<=o|+H2{iWvm6_naH3UYSF3Xrz;z#Ew_ylYoNm1 zV>dA;Rw8KWo>*r;6eXWVcOP7~Rc8iiLRnST*;wzm9@iiFQu#mnAmNu5D?yT~S2pI^ z^><9b>ZbWqPfcVNZwdxITt2oxa1u>OLMXYo^vLjDsS~|fh#w@qmTqa^Ux*8^k{jnwu6Y6hpJ;!4NQ4D=$I7aVloVXE`S6HqQWbjxGVQJVBkcE z8&sA#Z)gd_esgu=#W(>gk)Yb2d{w-pxe}`9)@|A`fq_coYuZ*?IlR-B%4Y>8o^igP z{Km@y^;s%vs}lt)oAO4+?b6;03JbSs_?PTD!P-E3KS#N--88E-L!4K3EbC%Cle!-F zC{~u03V+mCTTE<%4+0S4mPNm7n!d5efYk$q6Y6gj)KY~2sb1-)S}?$LnHgtqK0IuH zB#=eJkKG2s9E%}17)Y@$t?uRF(5@Cq0Ug>825JPq*Fc-4n&!5;!q%acO?mgkm4~|; ze8Jcg#fZ2Gm~741z$B2=SX^2$JnBT;10&u`*O`y{MQWO9T`?KpH6(f)i1!#)=){`Z z@i9C0@p!>^Z`?gykeCld3w8D-OAdk{4H&Kc{-pjhR-C)LsaJs2!^LB(pD={KM72K5 z(B);NmBaoRIk~wx?TCk4I)ahm69jl_W#cq;rmMpz?kFA4%17R_EQgIy z@cl_lQ~(5%bPVJuz$%cm5g50p9MSAXb~=&@01}4JeUQtMoiirRb1HVIazPM+$*qTU zhHcC(8&)>X?zBBAfia4g+u-f99m)fub+f1fB|=CP z_IJ&ut`;>15pe@ZxmM_{$5&pQ9kW+_-7MVQViXRnPe>4FC+PyFBfvP2d?z3q8iT=- z4QEpJp;70cnrg!nw<0qkLp?~|t0BDbyGv8wj(5>}9khD-qFDDYO5c@~z{xkEp{GgZ zvz7&hP1zBdWY7qPJ{-`n_fiRz*e5Kn_4Bz{_*y6XSv>bwz@Nn`_T@3Ya2Ec5pHrK} Tyo8FA00000NkvXXu0mjfIT(a) literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_task.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_task.png new file mode 100644 index 0000000000000000000000000000000000000000..a9942030c4edda090800eb5e8fbefeed185f0ac8 GIT binary patch literal 4256 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 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index bb17c8e4..690d0642 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,265 +17,397 @@ type="com.navinfo.omqs.ui.activity.map.MainViewModel" /> - + android:layout_height="match_parent"> - + - + + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:layout_width="wrap_content" + android:layout_height="0dp" + android:elevation="3dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:navGraph="@navigation/right_fragment_nav_graph" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_sign.xml b/app/src/main/res/layout/adapter_sign.xml index 382b591b..98d10cb5 100644 --- a/app/src/main/res/layout/adapter_sign.xml +++ b/app/src/main/res/layout/adapter_sign.xml @@ -27,7 +27,7 @@ android:gravity="center" android:text="80" android:textColor="#2F2F2F" - android:textSize="14sp" /> + android:textSize="16sp" /> + tools:context=".ui.fragment.console.ConsoleFragment"> + tools:context=".ui.fragment.console.ConsoleFragment"> + tools:context=".ui.fragment.console.ConsoleFragment"> \ No newline at end of file diff --git a/app/src/main/res/navigation/left_drawer_nav_graph.xml b/app/src/main/res/navigation/left_drawer_nav_graph.xml index 2e2c94b3..81d0f6be 100644 --- a/app/src/main/res/navigation/left_drawer_nav_graph.xml +++ b/app/src/main/res/navigation/left_drawer_nav_graph.xml @@ -39,7 +39,7 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d8672f37..d0a4d202 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,5 +1,10 @@ + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4002_1.png b/collect-library/src/main/assets/omdb/icon_4002_1.png deleted file mode 100644 index db1014dad788839cb14d712bb2b946a598dcf61a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9099 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 diff --git a/collect-library/src/main/assets/omdb/icon_4002_1.svg b/collect-library/src/main/assets/omdb/icon_4002_1.svg new file mode 100644 index 00000000..158b4f48 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_4002_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4003_0.png b/collect-library/src/main/assets/omdb/icon_4003_0.png deleted file mode 100644 index 747e7357768e958dc47ae204e5a563b65525e0f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9181 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 diff --git a/collect-library/src/main/assets/omdb/icon_4003_0.svg b/collect-library/src/main/assets/omdb/icon_4003_0.svg new file mode 100644 index 00000000..50a7b3b7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_4003_0.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4003_1.png b/collect-library/src/main/assets/omdb/icon_4003_1.png deleted file mode 100644 index 4b798ec4c452f91fd093e8876d75754e0bab9f5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10639 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 eEnQ#UaE}*6zGMlFc*8m@;gl8B \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4004_0.png b/collect-library/src/main/assets/omdb/icon_4004_0.png deleted file mode 100644 index 889aabb6a18a2e6867403772895285b7de2e164d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8316 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 DR4hdX diff --git a/collect-library/src/main/assets/omdb/icon_4004_0.svg b/collect-library/src/main/assets/omdb/icon_4004_0.svg new file mode 100644 index 00000000..54de0465 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_4004_0.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4004_1.png b/collect-library/src/main/assets/omdb/icon_4004_1.png deleted file mode 100644 index f152c1f1e6321332743d988f0c5fa81b1c3630ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9309 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 S!F(ro!O2P~N>+&*1^pjvyN`PS diff --git a/collect-library/src/main/assets/omdb/icon_4006_0.svg b/collect-library/src/main/assets/omdb/icon_4006_0.svg new file mode 100644 index 00000000..f5b3b3c5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_4006_0.svg @@ -0,0 +1 @@ +限 \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4022_0.png b/collect-library/src/main/assets/omdb/icon_4022_0.png deleted file mode 100644 index a718c8e2cf3ae8ce74361640afb95acf228cb0e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26723 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 a&eF??GwOweEDt_wE2oy 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 A3;+NC diff --git a/collect-library/src/main/assets/omdb/icon_4022_0.svg b/collect-library/src/main/assets/omdb/icon_4022_0.svg new file mode 100644 index 00000000..63378323 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_4022_0.svg @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_arrow_right.png b/collect-library/src/main/assets/omdb/icon_arrow_right.png deleted file mode 100644 index b0246785a209f0298a7435042062a26414f0ca3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmV+j1o!)iP)Px&!bwCyRCr$P*iB3nXB@}z-}CJIu4}p?i`q1Z<;4WFr&3Bx6c4>LCPoiEaA@KI zjfa8?c+p5qdMMOZ5=}~)G$tB7*d`{v#9pk4FQIBLCeTn;ieOk51Xgg_-PxJvX=Y&s z4cpAqV4BJP_r&3uVfM4%=RZ5kK(A#57`ZGjKrngAAQ*yC8yZv$6+^|S2~aU=UNmE< z7%E0hfQnJ`q8UTQP%&x(RE(Mz%@`_%icu4wV${57#!xX-jG6!ylNB&WhqNMBNHbvND)DaG9$=B6lQAYG1~qZ& z>uCC?5e+8L^l~@_0dqd=Zv3de=)!yN`;boP`18&Lk`fP2#*$5a2}}Z6AY&vfghgF)nA*XK7ls6Lx)IpZ2ImKxvwx?0 zuONB*0%l(5h&-G`GHJZ(8P9xnb5@Vo2Ig6F`S%_#Z&5UP^CL13W(>X^jqud&Lh85k zNd0~l+~q)GTEl4HOTpcztQQtl6T4W6^r z7d-P~$J;As{4O4}_I4LnWrRd#;c?*YV;KXa#DJ9I^OCN}6FWWSr)n!ypsm{=rYHI~IRpDA;0hZ~X6$ zjoz}3;gpqaSun*|!C1P6VDg9&48f>vCMt%Cp<>hos2DXbnlV%i6{99V#i)7FjG8Dgs0mOpYF;#Bs2D0nO@N9~^ZExES0W1-p + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java index 0b459fb7..f599fcb7 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java @@ -596,7 +596,8 @@ public final class NIMapView extends RelativeLayout { VECTOR(2)/*高亮组*/, OPERATE_LINE(3)/*操作图层组*/, OPERATE_MARKER(4)/*操作图层组*/, - NAVIGATION(5)/*定位导航组*/; + NAVIGATION(5)/*定位导航组*/, + LABEL(6)/*图标，文字图层*/; int groupIndex; diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt index 75aafa44..d3348487 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt @@ -22,10 +22,11 @@ import java.io.File /** * Layer 操作 */ -class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePath: String) : BaseHandler(context, mapView) { +class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView, tracePath: String) : + BaseHandler(context, mapView) { private var baseGroupLayer // 用于盛放所有基础底图的图层组，便于统一管理 : GroupLayer? = null - private val mTracePath:String = tracePath + private val mTracePath: String = tracePath /** * 轨迹渲染图层 @@ -70,12 +71,13 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePa vectorNiLocationTileLayer = VectorTileLayer(mMapView.vtmMap, mapLifeNiLocationTileSource) - labelNiLocationLayer = LabelLayer(mMapView.vtmMap, vectorNiLocationTileLayer, LabelTileLoaderHook(), 15) + labelNiLocationLayer = + LabelLayer(mMapView.vtmMap, vectorNiLocationTileLayer, LabelTileLoaderHook(), 15) - if(vectorNiLocationTileLayer!=null){ - addLayer(vectorNiLocationTileLayer,NIMapView.LAYER_GROUPS.BASE) + if (vectorNiLocationTileLayer != null) { + addLayer(vectorNiLocationTileLayer, NIMapView.LAYER_GROUPS.BASE) } - if(labelNiLocationLayer!=null){ + if (labelNiLocationLayer != null) { addLayer(labelNiLocationLayer, NIMapView.LAYER_GROUPS.BASE) } @@ -92,7 +94,7 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePa mMapView.vtmMap.events.bind(UpdateListener { e, mapPosition -> if (e == org.oscim.map.Map.SCALE_EVENT) { // 测评数据图层在指定Zoom后开始显示 - val isOmdbZoom = mapPosition.zoomLevel>=Constant.OMDB_MIN_ZOOM + val isOmdbZoom = mapPosition.zoomLevel >= Constant.OMDB_MIN_ZOOM baseGroupLayer?.layers?.forEach { it.isEnabled = !isOmdbZoom } @@ -103,25 +105,36 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePa } private fun initOMDBVectorTileLayer() { - // 初始化OMDB相关图层 - omdbVectorTileLayer = VectorTileLayer(mMapView.vtmMap, omdbTileSource) - omdbLabelLayer = LabelLayer(mMapView.vtmMap, omdbVectorTileLayer, LabelTileLoaderHook(), Constant.OMDB_MIN_ZOOM) - if(omdbVectorTileLayer!=null){ - addLayer(omdbVectorTileLayer,NIMapView.LAYER_GROUPS.VECTOR_TILE) - } - if(omdbLabelLayer!=null){ - addLayer(omdbLabelLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE) - } // 初始化OMDB参考相关图层 omdbReferenceTileLayer = VectorTileLayer(mMapView.vtmMap, omdbReferenceTileSource) - omdbReferenceLabelLayer = LabelLayer(mMapView.vtmMap, omdbReferenceTileLayer, LabelTileLoaderHook(), Constant.OMDB_MIN_ZOOM) - if(omdbReferenceTileLayer!=null){ - addLayer(omdbReferenceTileLayer,NIMapView.LAYER_GROUPS.VECTOR_TILE) + omdbReferenceLabelLayer = LabelLayer( + mMapView.vtmMap, + omdbReferenceTileLayer, + LabelTileLoaderHook(), + Constant.OMDB_MIN_ZOOM + ) + if (omdbReferenceTileLayer != null) { + addLayer(omdbReferenceTileLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE) } - if(omdbReferenceLabelLayer!=null){ - addLayer(omdbReferenceLabelLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE) + if (omdbReferenceLabelLayer != null) { + addLayer(omdbReferenceLabelLayer, NIMapView.LAYER_GROUPS.LABEL) } + // 初始化OMDB相关图层 + omdbVectorTileLayer = VectorTileLayer(mMapView.vtmMap, omdbTileSource) + omdbLabelLayer = LabelLayer( + mMapView.vtmMap, + omdbVectorTileLayer, + LabelTileLoaderHook(), + Constant.OMDB_MIN_ZOOM + ) + if (omdbVectorTileLayer != null) { + addLayer(omdbVectorTileLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE) + } + if (omdbLabelLayer != null) { + addLayer(omdbLabelLayer, NIMapView.LAYER_GROUPS.LABEL) + } + } /** diff --git a/vtm b/vtm index dd13e533..1ee201a4 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit dd13e533c38b5738ab404c2737d7ccadeff01323 +Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a From 876d5bef44b15382d7455c7e31c3b860b7af1191 Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Wed, 14 Jun 2023 14:06:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E6=8E=A7?= =?UTF-8?q?=E8=81=94=E5=8A=A8UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layermanager/LayerManagerFragment.kt | 21 ++++++++----------- .../layermanager/LayerManagerViewModel.kt | 5 +---- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt index 415ff400..b9c14e46 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt @@ -4,21 +4,17 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentActivity -import androidx.fragment.app.FragmentController import androidx.fragment.app.viewModels -import androidx.navigation.fragment.findNavController import com.navinfo.omqs.databinding.FragmentLayerManagerBinding import com.navinfo.omqs.ui.fragment.BaseFragment -class LayerManagerFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment(){ +class LayerManagerFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment() { private var _binding: FragmentLayerManagerBinding? = null private val binding get() = _binding!! private val viewModel by viewModels() -// private val viewModel by lazy { viewModels().value} + + // private val viewModel by lazy { viewModels().value} override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -29,12 +25,13 @@ class LayerManagerFragment(private var backListener: (() -> Unit?)? = null) : Ba override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val adapter = LayerManagerExpandableListAdapter(requireContext(), viewModel.getLayerConfigList()) + val adapter = + LayerManagerExpandableListAdapter(requireContext(), viewModel.getLayerConfigList()) binding.elvLayerManager.setAdapter(adapter) // 默认显示第一个父项下的子类 binding.elvLayerManager.expandGroup(0) binding.elvLayerManager.setGroupIndicator(null) - binding.elvLayerManager.setOnGroupClickListener { expandableListView, view, groupPosition, l -> + binding.elvLayerManager.setOnGroupClickListener { expandableListView, _, groupPosition, _ -> if (expandableListView.isGroupExpanded(groupPosition)) { binding.elvLayerManager.collapseGroup(groupPosition) } else { @@ -43,17 +40,17 @@ class LayerManagerFragment(private var backListener: (() -> Unit?)? = null) : Ba } binding.imgConfirm.setOnClickListener { - viewModel.saveLayerConfigList(requireContext(),adapter.parentItems) + viewModel.saveLayerConfigList(requireContext(), adapter.parentItems) } binding.imgBack.setOnClickListener { - backListener?.invoke() + backListener?.invoke() } binding.tvTitle.text = "图层管理"//findNavController().currentDestination?.label binding.imgConfirm.setOnClickListener { // 用户点击确认，重新设置当前的图层显隐控制 - viewModel.saveLayerConfigList(adapter.parentItems) + viewModel.saveLayerConfigList(requireContext(), adapter.parentItems) backListener?.invoke() } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerViewModel.kt index c747c423..0e889dbd 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerViewModel.kt @@ -4,10 +4,8 @@ import android.content.Context import android.widget.Toast import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.blankj.utilcode.util.FileIOUtils import com.blankj.utilcode.util.SPStaticUtils import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.navinfo.omqs.Constant import com.navinfo.omqs.bean.ImportConfig import com.navinfo.omqs.tools.LayerConfigUtils @@ -15,9 +13,8 @@ import com.navinfo.omqs.util.FlowEventBus import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import java.io.File -class LayerManagerViewModel(): ViewModel() { +class LayerManagerViewModel() : ViewModel() { private val gson = Gson() fun getLayerConfigList(): List {