From c4e2c2fdcc9a1992e23b9ac70eda6b1eff6b52d7 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Sat, 6 May 2023 15:42:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collect-library/src/main/assets/editormarker.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 4e45ee2a..80c3bd1c 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1,5 +1,5 @@ - From b164338ec748e112071a9e7c9709ba64addd59ce Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Sat, 6 May 2023 15:58:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/fm_card_map_down_status_bg.xml | 8 ++++---- app/src/main/res/layout/adapter_task_list.xml | 15 ++++++++------- .../main/res/layout/fragment_layer_manager.xml | 2 +- app/src/main/res/layout/fragment_offline_map.xml | 2 +- app/src/main/res/layout/fragment_task_list.xml | 2 +- app/src/main/res/values/dimens.xml | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/src/main/res/drawable/fm_card_map_down_status_bg.xml b/app/src/main/res/drawable/fm_card_map_down_status_bg.xml index 25e52a9f..ce2676d0 100644 --- a/app/src/main/res/drawable/fm_card_map_down_status_bg.xml +++ b/app/src/main/res/drawable/fm_card_map_down_status_bg.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/app/src/main/res/layout/adapter_task_list.xml b/app/src/main/res/layout/adapter_task_list.xml index 69d797fe..386f29d4 100644 --- a/app/src/main/res/layout/adapter_task_list.xml +++ b/app/src/main/res/layout/adapter_task_list.xml @@ -15,9 +15,11 @@ android:id="@+id/task_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="5dp" + android:layout_toLeftOf="@id/task_download_btn" android:text="任务名称" - android:textSize="12sp" /> + android:textStyle="bold" + android:textColor="@color/black" + android:textSize="@dimen/default_font_size" /> @@ -49,6 +51,7 @@ android:layout_height="wrap_content" android:layout_below="@id/task_data_version" android:layout_marginTop="5dp" + android:drawableLeft="@mipmap/point_blue" android:text="路线颜色" android:textSize="@dimen/card_title_font_3size" /> @@ -62,7 +65,6 @@ android:gravity="center" android:shadowColor="@android:color/transparent" android:text="下载" - android:textColor="@color/btn_blue_solid" android:textSize="@dimen/card_title_font_2size" /> 8dp 176dp 10dp - 22sp + 20sp 15sp 24sp 13sp @@ -37,5 +37,5 @@ 75dp 48dp - 6dp + 36dp \ No newline at end of file From 51be5bd178a2f132478887eec3a25a32520652e0 Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Sat, 6 May 2023 16:13:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BA=BF=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/fragment/tasklist/TaskListViewModel.kt | 29 +++++++++++-------- .../library/map/handler/LineHandler.kt | 2 +- .../library/map/layers/OmdbTaskLinkLayer.kt | 1 + 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt index 5866c2c9..58fcd762 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt @@ -22,6 +22,7 @@ import kotlinx.coroutines.withContext import java.util.* import javax.inject.Inject + @HiltViewModel class TaskListViewModel @Inject constructor( private val networkService: NetworkService, @@ -30,6 +31,9 @@ class TaskListViewModel @Inject constructor( val liveDataTaskList = MutableLiveData>() + val colors = + arrayOf(Color.RED, Color.YELLOW, Color.BLUE, Color.MAGENTA, Color.GREEN, Color.CYAN) + /** * 下载任务列表 */ @@ -43,7 +47,8 @@ class TaskListViewModel @Inject constructor( val realm = Realm.getDefaultInstance() realm.executeTransaction { result.data.obj?.let { list -> - for (task in list) { + for (index in list.indices) { + val task = list[index] val item = realm.where(TaskBean::class.java).equalTo( "id", task.id ).findFirst() @@ -54,14 +59,17 @@ class TaskListViewModel @Inject constructor( task.currentSize = item.currentSize task.color = item.color } else { - val random = Random() - task.color = Color.argb( - 255, - random.nextInt(256), - random.nextInt(256), - random.nextInt(256) - ) - Log.e("jingo", "任务颜色 ${task.color}") + if (index < 6) + task.color = colors[index] + else { + val random = Random() + task.color = Color.argb( + 255, + random.nextInt(256), + random.nextInt(256), + random.nextInt(256) + ) + } } realm.copyToRealmOrUpdate(task) } @@ -105,9 +113,6 @@ class TaskListViewModel @Inject constructor( mapController.lineHandler.omdbTaskLinkLayer.addLineList(item.hadLinkDvoList) } } - } - } - } diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt index 970a326f..b34a9612 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt @@ -70,7 +70,7 @@ class LineHandler(context: AppCompatActivity, mapView: NIMapView) : BaseHandler( .fillColor(context.resources.getColor(R.color.draw_line_red_color, null)) .fillAlpha(0.5f) .strokeColor(context.resources.getColor(R.color.draw_line_red_color, null)) - .strokeWidth(4f) + .strokeWidth(8f) .fixed(true).build() ) addLayer(omdbTaskLinkLayer, NIMapView.LAYER_GROUPS.VECTOR) diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt index ecda4133..d6e8bff5 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt @@ -31,6 +31,7 @@ class OmdbTaskLinkLayer(map: Map, private var style: Style) : VectorLayer(map) { hadLinkDvoBeanList.forEach { addLine(it, style) } + update() } fun removeLine(linkPid: String): Boolean {