From 7916939ad0887b8133fa4217de3a7f89fe4265b9 Mon Sep 17 00:00:00 2001 From: "e.pavlushov" Date: Wed, 28 Aug 2024 17:01:06 +0700 Subject: [PATCH 1/4] =?UTF-8?q?[SDK]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B5=D1=81=D0=B5=D1=82?= =?UTF-8?q?=D0=B0=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B8=20=D0=B2=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/dgis/sdk/demo/NavigationActivity.kt | 20 +++++++++++ .../main/res/layout/activity_navigation.xml | 36 +++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt b/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt index 18ec7a5..c626b2d 100644 --- a/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt +++ b/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.Gravity import android.view.View import android.view.ViewGroup +import android.widget.RadioGroup import android.widget.Toast import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity @@ -25,6 +26,7 @@ import ru.dgis.sdk.demo.databinding.ActivityNavigationBinding import ru.dgis.sdk.demo.vm.NavigationViewModel import ru.dgis.sdk.geometry.point import ru.dgis.sdk.map.DgisMapObject +import ru.dgis.sdk.map.GraphicsPreset import ru.dgis.sdk.map.Map import ru.dgis.sdk.map.MapView import ru.dgis.sdk.map.ScreenDistance @@ -42,6 +44,7 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { private var viewModel: NavigationViewModel? = null + private lateinit var presetOptionSwitch: RadioGroup private lateinit var map: Map private lateinit var mapView: MapView private lateinit var binding: ActivityNavigationBinding @@ -56,6 +59,15 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { binding = ActivityNavigationBinding.inflate(layoutInflater) setContentView(binding.root) + presetOptionSwitch = findViewById(R.id.presetOptionSwitch) + presetOptionSwitch.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.litePreset -> setGraphicsPreset(GraphicsPreset.LITE) + R.id.normalPreset -> setGraphicsPreset(GraphicsPreset.NORMAL) + R.id.immersivePreset -> setGraphicsPreset(GraphicsPreset.IMMERSIVE) + } + } + mapView = findViewById(R.id.mapView) routeEditorView = findViewById(R.id.routeEditorView) navigationView = findViewById(R.id.navigationView) @@ -119,6 +131,10 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { ) } + private fun setGraphicsPreset(preset: GraphicsPreset) { + map.graphicsPreset = preset + } + private fun initRouteTypeTabs() { binding.routeTypeTabsLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { @@ -150,6 +166,10 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { private fun initViewModel(map: Map) { val activity = this this.map = map + + presetOptionSwitch.check(R.id.normalPreset) + setGraphicsPreset(GraphicsPreset.NORMAL) + viewModel = NavigationViewModel(sdkContext, map, lifecycleScope).also { viewModel -> closeables.add(viewModel) viewModel.messageCallback = { diff --git a/app/src/main/res/layout/activity_navigation.xml b/app/src/main/res/layout/activity_navigation.xml index 4eca827..c19cbfa 100644 --- a/app/src/main/res/layout/activity_navigation.xml +++ b/app/src/main/res/layout/activity_navigation.xml @@ -163,6 +163,41 @@ android:text="Use simulation" tools:ignore="HardcodedText" /> + + + + + + + + + + + Date: Thu, 29 Aug 2024 13:45:57 +0700 Subject: [PATCH 2/4] =?UTF-8?q?fixup!=20[SDK]=20=D0=94=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BD=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B5=D1=81=D0=B5?= =?UTF-8?q?=D1=82=D0=B0=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/dgis/sdk/demo/NavigationActivity.kt | 33 +++++++++---------- .../main/res/layout/activity_navigation.xml | 2 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt b/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt index c626b2d..116e6cb 100644 --- a/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt +++ b/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt @@ -44,7 +44,7 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { private var viewModel: NavigationViewModel? = null - private lateinit var presetOptionSwitch: RadioGroup + private lateinit var graphicPreset: RadioGroup private lateinit var map: Map private lateinit var mapView: MapView private lateinit var binding: ActivityNavigationBinding @@ -59,15 +59,8 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { binding = ActivityNavigationBinding.inflate(layoutInflater) setContentView(binding.root) - presetOptionSwitch = findViewById(R.id.presetOptionSwitch) - presetOptionSwitch.setOnCheckedChangeListener { _, checkedId -> - when (checkedId) { - R.id.litePreset -> setGraphicsPreset(GraphicsPreset.LITE) - R.id.normalPreset -> setGraphicsPreset(GraphicsPreset.NORMAL) - R.id.immersivePreset -> setGraphicsPreset(GraphicsPreset.IMMERSIVE) - } - } - + graphicPreset = findViewById(R.id.graphicPreset) + graphicPreset.check(R.id.normalPreset) mapView = findViewById(R.id.mapView) routeEditorView = findViewById(R.id.routeEditorView) navigationView = findViewById(R.id.navigationView) @@ -88,6 +81,18 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { ) } ) + it.graphicsPreset = GraphicsPreset.NORMAL + + } + } + + graphicPreset.setOnCheckedChangeListener { _, checkedId -> + mapView.getMapAsync { map -> + when (checkedId) { + R.id.litePreset -> map.graphicsPreset = GraphicsPreset.LITE + R.id.normalPreset -> map.graphicsPreset = GraphicsPreset.NORMAL + R.id.immersivePreset -> map.graphicsPreset = GraphicsPreset.IMMERSIVE + } } } @@ -131,10 +136,6 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { ) } - private fun setGraphicsPreset(preset: GraphicsPreset) { - map.graphicsPreset = preset - } - private fun initRouteTypeTabs() { binding.routeTypeTabsLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { @@ -166,10 +167,6 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { private fun initViewModel(map: Map) { val activity = this this.map = map - - presetOptionSwitch.check(R.id.normalPreset) - setGraphicsPreset(GraphicsPreset.NORMAL) - viewModel = NavigationViewModel(sdkContext, map, lifecycleScope).also { viewModel -> closeables.add(viewModel) viewModel.messageCallback = { diff --git a/app/src/main/res/layout/activity_navigation.xml b/app/src/main/res/layout/activity_navigation.xml index c19cbfa..73f0437 100644 --- a/app/src/main/res/layout/activity_navigation.xml +++ b/app/src/main/res/layout/activity_navigation.xml @@ -164,7 +164,7 @@ tools:ignore="HardcodedText" /> Date: Thu, 29 Aug 2024 13:53:56 +0700 Subject: [PATCH 3/4] =?UTF-8?q?fixup!=20fixup!=20[SDK]=20=D0=94=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D0=B5=D1=82=D0=B0=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B2=20=D0=BD=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt b/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt index 116e6cb..f91b010 100644 --- a/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt +++ b/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt @@ -82,7 +82,6 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { } ) it.graphicsPreset = GraphicsPreset.NORMAL - } } From 5bcaf82bf7aa89df2c473755c5dcf25f0718e385 Mon Sep 17 00:00:00 2001 From: "e.pavlushov" Date: Thu, 29 Aug 2024 15:47:54 +0700 Subject: [PATCH 4/4] =?UTF-8?q?fixup!=20fixup!=20fixup!=20[SDK]=20=D0=94?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D1=81=D0=B5=D1=82=D0=B0=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B2=20=D0=BD=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt b/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt index f91b010..5c13587 100644 --- a/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt +++ b/app/src/main/java/ru/dgis/sdk/demo/NavigationActivity.kt @@ -81,7 +81,12 @@ class NavigationActivity : AppCompatActivity(), TouchEventsObserver { ) } ) - it.graphicsPreset = GraphicsPreset.NORMAL + when (it.graphicsPresetHintChannel.value) { + GraphicsPreset.LITE -> graphicPreset.check(R.id.litePreset) + GraphicsPreset.NORMAL -> graphicPreset.check(R.id.normalPreset) + GraphicsPreset.IMMERSIVE -> graphicPreset.check(R.id.immersivePreset) + else -> {} + } } }