Эх сурвалжийг харах

refactor(更新) :
- 修改道岔状态页面,默认隐藏右侧的checkbox列表
- 优化车间概览图片加载,imageUrl为空时不执行加载
- 优化BitmapUtil工具类,当缓存中存在图片时不再执行后续代码

周文健 2 сар өмнө
parent
commit
76b2b97ca9

+ 0 - 1
app/src/main/java/com/grkj/iscs_mars/util/BitmapUtil.kt

@@ -172,7 +172,6 @@ object BitmapUtil {
         reqH: Int
         reqH: Int
     ): Bitmap? = withContext(Dispatchers.IO) {
     ): Bitmap? = withContext(Dispatchers.IO) {
         smallCache[url]?.let { return@withContext it }
         smallCache[url]?.let { return@withContext it }
-
         runCatching {
         runCatching {
             val future: FutureTarget<Bitmap> = Glide.with(ctx)
             val future: FutureTarget<Bitmap> = Glide.with(ctx)
                 .asBitmap()
                 .asBitmap()

+ 1 - 1
app/src/main/java/com/grkj/iscs_mars/view/fragment/WorkshopFragment.kt

@@ -66,7 +66,7 @@ class WorkshopFragment(val changePage: (PageChangeBO) -> Unit) :
     fun refreshPage() {
     fun refreshPage() {
         presenter?.getMapInfo {
         presenter?.getMapInfo {
             LogUtil.i("开始加载地图工作区域:${it?.imageUrl}")
             LogUtil.i("开始加载地图工作区域:${it?.imageUrl}")
-            BitmapUtil.loadBitmapFromUrl(requireContext(), it?.imageUrl!!) {
+            BitmapUtil.loadBitmapFromUrl(requireContext(), it?.imageUrl) {
                 if (it == null) {
                 if (it == null) {
                     LogUtil.e("Map pic is null")
                     LogUtil.e("Map pic is null")
                     return@loadBitmapFromUrl
                     return@loadBitmapFromUrl

+ 1 - 1
app/src/main/res/layout/activity_switch_status.xml

@@ -35,7 +35,7 @@
                 android:minWidth="200dp"
                 android:minWidth="200dp"
                 android:orientation="vertical"
                 android:orientation="vertical"
                 android:padding="@dimen/common_spacing"
                 android:padding="@dimen/common_spacing"
-                android:visibility="visible"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@id/cb_show"
                 app:layout_constraintStart_toStartOf="@id/cb_show"