作业票执行步骤页锁定站地图改用系统配置图标；修复glide加载url入参设置错误

app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -69,4 +69,8 @@ object Constants {
     fun getTicketKey(type: Int?): String? {
         return mTicketTypeList.find { it.type == type }?.key
     }
+
+    /*************************  地图  *************************/
+    const val MAP_CABINET_KEY = "sys.map.cabinet"     // 物资柜地图
+    const val MAP_PERMIT_KEY = "sys.map.permit"       // 作业票地图
 }

app/src/main/java/com/grkj/iscs/util/BitmapUtil.kt

@@ -102,10 +102,10 @@ object BitmapUtil {
                     }
                     return false
                 }
-            })
-                .submit()
+            }).submit()
         } catch (e: Exception) {
             e.printStackTrace()
+            LogUtil.e("loadBitmapFromUrl error: ${e.message} - $url")
             Executor.runOnMain {
                 callback(null)
             }

app/src/main/java/com/grkj/iscs/view/fragment/JobProgressFragment.kt

@@ -71,8 +71,8 @@ class JobProgressFragment(val goBack: () -> Unit) :
             object : CommonAdapter<TicketDetailMonitorRespVO.IsJobTicketUser>(requireActivity(), R.layout.item_rv_worker_status, mUserList) {
                 override fun convert(holder: ViewHolder, user: TicketDetailMonitorRespVO.IsJobTicketUser, position: Int) {
                     holder.setText(R.id.tv_name, user.userName)
-                    holder.setVisible(R.id.iv_ready_to_lock, user.jobStatus!! >= 3 || mStep >= 4)
-                    holder.setVisible(R.id.iv_locked, user.jobStatus >= 4)
+                    holder.setVisible(R.id.iv_ready_to_lock, mStep >= 6)
+                    holder.setVisible(R.id.iv_locked, user.jobStatus!! >= 4)
                     holder.setVisible(R.id.iv_unlocked, user.jobStatus >= 5)
                 }
             }

app/src/main/java/com/grkj/iscs/view/fragment/StepFragment.kt

@@ -203,13 +203,13 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
                                 val locationX = (itPoint.x!!.toFloat() - (itMapInfo.x!!.toFloat() / 50))  * 50 / itMapInfo.width!!.toFloat() * it.width
                                 val locationY = (itPoint.y!!.toFloat() + 1 - itMapInfo.y!!.toFloat() / 50) * 50 / itMapInfo.height!!.toFloat() * it.height
                                 BitmapUtil.loadBitmapFromUrl(
-                                    mBinding?.mapview?.context!!, itPoint.pointIcon!!, 18, 18
+                                    requireContext(), itPoint.pointIcon!!, reqWidth = 18, reqHeight = 18
                                 ) { itBitmap ->
                                     mStationList.add(
                                         CustomStationLayer.IsolationPoint(
                                             PointF(locationX, locationY),
                                             itPoint.entityName!!,
-                                            itBitmap,
+                                            itBitmap ?: BitmapUtil.getResizedBitmapFromMipmap(requireContext(), R.mipmap.ticket_type_placeholder, 18, 18),
                                             itPoint.entityId!!,
                                             mMachineryDetail?.pointIdList?.contains(itPoint.entityId) == true
                                         )

app/src/main/java/com/grkj/iscs/view/presenter/WorkshopPresenter.kt

@@ -1,10 +1,12 @@
 package com.grkj.iscs.view.presenter
 
+import com.grkj.iscs.model.Constants
 import com.grkj.iscs.model.vo.map.MapInfoRespVO
 import com.grkj.iscs.model.vo.map.MapPointPageRespVO
 import com.grkj.iscs.model.vo.ticket.WorkstationTicketListRespVO
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
+import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.view.base.BasePresenter
 import com.grkj.iscs.view.iview.IWorkshopView
 
@@ -27,9 +29,11 @@ class WorkshopPresenter : BasePresenter<IWorkshopView>() {
     }
 
     fun getMapPointPage(callBack: (MapPointPageRespVO?) -> Unit) {
-        NetApi.getMapPointPage(1, -1, 1) {
-            Executor.runOnMain {
-                callBack(it)
+        SPUtils.getAttributeValue(mContext!!, Constants.MAP_PERMIT_KEY)?.let {
+            NetApi.getMapPointPage(1, -1, it.toLong()) {
+                Executor.runOnMain {
+                    callBack(it)
+                }
             }
         }
     }