1. 翻译补充

2. 调整逻辑

app/src/main/java/com/grkj/iscs_mars/util/NetApi.kt

@@ -657,7 +657,7 @@ object NetApi {
             mapOf(
                 "pages" to pages,
                 "size" to size,
-                "workstationId" to workstationId,
+                // "workstationId" to workstationId, 拿到所有的工艺
                 "machineryType" to "工艺"
             ),
             { res, _, _ ->

app/src/main/java/com/grkj/iscs_mars/view/activity/HomeActivity.kt

@@ -78,7 +78,7 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
                     )
                 )
             }
-            if (userInfo.roles?.any { it == USER_ROLE_ADMHDWTESTER } == true) {
+            //if (userInfo.roles?.any { it == USER_ROLE_ADMHDWTESTER } == true) {
                 BusinessManager.isTestMode = true
                 mMenuList.add(
                     Menu(
@@ -87,7 +87,7 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
                         DockTestFragment()
                     )
                 )
-            }
+            //}
             if (userInfo.roles?.any { it == USER_ROLE_ADMHDWTESTER } == true) {
                 BusinessManager.isTestMode = true
                 mMenuList.add(

app/src/main/java/com/grkj/iscs_mars/view/fragment/LoginFragment.kt

@@ -43,20 +43,20 @@ class LoginFragment :
         get() = FragmentLoginBinding.inflate(layoutInflater)
 
     override fun initView() {
+        val ctx = context ?: return
         mBinding?.tvVersion?.post {
-            mBinding?.tvVersion?.text =
-                "v${AppUtils.getPkgVerName(requireContext())}-${requireContext().serialNo()}"
+            mBinding?.tvVersion?.text = "v${AppUtils.getPkgVerName(ctx)}-${ctx.serialNo()}"
         }
         mBinding?.cbMotor?.setDebouncedClickListener {
             vp2?.currentItem = 0
         }
         mBinding?.mainTitle?.setDebouncedClickListener {
             val activeDeviceInfo = ActiveDeviceInfo()
-            FaceEngine.getActiveDeviceInfo(requireContext(), activeDeviceInfo)
+            FaceEngine.getActiveDeviceInfo(ctx, activeDeviceInfo)
             ShellUtils.execCmd("echo ${activeDeviceInfo.deviceInfo} > /sdcard/iscs/activeDeviceInfo.txt")
         }
         mBinding?.tvVersion?.setDebouncedClickListener {
-            UrlConfigDialog(requireContext()).show()
+            UrlConfigDialog(ctx).show()
         }
 
         val pairList = mutableListOf(

app/src/main/java/com/grkj/iscs_mars/view/fragment/TechnologySopFragment.kt

@@ -1,6 +1,5 @@
 package com.grkj.iscs_mars.view.fragment
 
-import android.util.Log
 import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.recyclerview.widget.RecyclerView
@@ -187,10 +186,17 @@ class TechnologySopFragment(val changePage: (PageChangeBO) -> Unit) :
             it?.records?.let {
                 mMachineryList.addAll(it)
             }
+            mMachineryIdx = if (mMachineryList.isNotEmpty()) 0 else -1
+            if (mMachineryList.isNotEmpty()) {
+                // 将当前选中的机器图片加载出来
+                Glide.with(this@TechnologySopFragment).load(mMachineryList[0].machineryImg).into(mBinding!!.ivMachinery!!)
+                mMachineryTypeList.clear()
+                mMachineryTypeList.addAll(mMachineryList[0].sysDictDatas ?: emptyList())
+            }
+            mSopTypeIdx = -1
             mBinding?.rvTechnology?.adapter?.notifyDataSetChanged()
             mBinding?.sopList?.adapter?.notifyDataSetChanged()
-            mMachineryIdx = -1
-            mSopTypeIdx = -1
+            mBinding?.sopTypeList?.adapter?.notifyDataSetChanged()
             refreshSelected()
         }
     }

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

@@ -1,9 +1,6 @@
 package com.grkj.iscs_mars.view.fragment
 
-import android.graphics.Color
 import android.graphics.PointF
-import android.view.animation.DecelerateInterpolator
-import android.widget.FrameLayout
 import android.widget.ImageView
 import androidx.lifecycle.lifecycleScope
 import com.grkj.iscs_mars.R
@@ -21,9 +18,6 @@ import com.grkj.iscs_mars.view.iview.IWorkshopView
 import com.grkj.iscs_mars.view.presenter.WorkshopPresenter
 import com.grkj.iscs_mars.view.widget.CustomMarkLayerSample
 import com.onlylemi.mapview.library.MapViewListener
-import com.takusemba.spotlight.Spotlight
-import com.takusemba.spotlight.Target
-import com.takusemba.spotlight.shape.RoundedRectangle
 import com.zhy.adapter.recyclerview.CommonAdapter
 import com.zhy.adapter.recyclerview.base.ViewHolder
 import kotlinx.coroutines.Dispatchers
@@ -84,30 +78,7 @@ class WorkshopFragment(val changePage: (PageChangeBO) -> Unit) :
         }
 
         mBinding?.tvCreate?.setOnClickListener {
-            val bind = mBinding ?: return@setOnClickListener
-            val targets = ArrayList<Target>()
-
-            val tipsRoot = FrameLayout(requireContext())
-            val tips = layoutInflater.inflate(R.layout.tips_workshop_layout, tipsRoot)
-            val tipsTarget = Target.Builder()
-                .setAnchor(bind.mapRoot!!)
-                .setShape(RoundedRectangle(295f, 540f, 20f))
-                .setOverlay(tips)
-                .build()
-
-            targets.add(tipsTarget)
-
-            // 做引导提示
-            val spotlight = Spotlight.Builder(requireActivity())
-                .setTargets(targets)
-                .setBackgroundColor(Color.parseColor("#DD000000"))
-                .setDuration(1000L)
-                .setAnimation(DecelerateInterpolator(2f))
-                .build()
-
-            spotlight.start()
-            // 点击背景认为结束演示
-            tips.setOnClickListener { spotlight.finish() }
+            changePage(PageChangeBO(1, mPointList[0].workstationId, machineryName = mPointList[0].name))
         }
 
         initMap()
@@ -177,7 +148,6 @@ class WorkshopFragment(val changePage: (PageChangeBO) -> Unit) :
                         Executor.repeatOnMain({
                             val isAllBitmapLoaded = mPointList.all { it.ticketList.take(4).all { it.bitmap != null } }
                             if (isAllBitmapLoaded) {
-                                mBinding?.mapview?.currentZoom = 0.51f
                                 mBinding?.mapview?.refreshWorld()
                             }
                             return@repeatOnMain !isAllBitmapLoaded
@@ -192,7 +162,6 @@ class WorkshopFragment(val changePage: (PageChangeBO) -> Unit) :
         mBinding?.mapview?.isScaleAndRotateTogether = false
         mBinding?.mapview?.setMapViewListener(object : MapViewListener {
             override fun onMapLoadSuccess() {
-                mBinding?.mapview?.currentZoom = 0.51f
                 mBinding?.mapview?.post {
                     // 要加null判断，否则loadMap的时候会调用onMapLoadSuccess导致多次创建layer
                     if (markLayer != null) {
@@ -202,9 +171,9 @@ class WorkshopFragment(val changePage: (PageChangeBO) -> Unit) :
                     markLayer = CustomMarkLayerSample(mBinding?.mapview, mPointList)
                     markLayer?.setMarkIsClickListener(object : CustomMarkLayerSample.MarkIsClickListener {
                         override fun markIsClick(index: Int, btnIndex: Int, isClickIcon: Boolean) {
-                            if (btnIndex == -1) {
-                                changePage(PageChangeBO(1, mPointList[index].workstationId, machineryName = mPointList[index].name))
-                            }
+//                            if (btnIndex == -1) {
+//                                changePage(PageChangeBO(1, mPointList[index].workstationId, machineryName = mPointList[index].name))
+//                            }
                         }
                     })
                     mBinding?.mapview?.addLayer(markLayer)

app/src/main/java/com/grkj/iscs_mars/view/presenter/TechnologySopPresenter.kt

@@ -60,7 +60,7 @@ class TechnologySopPresenter : BasePresenter<ITechnologySopView>() {
                             }
                         }
                     } else {
-                        ToastUtils.tip("当前SOP已有工作在执行")
+                        ToastUtils.tip(mContext?.getString(R.string.sop_exec_progress))
                     }
                 }
             }

app/src/main/res/values-en/strings.xml

@@ -439,4 +439,5 @@
     <string name="lock_info">Lockout Info</string>
     <string name="together_info">Group Lock Info</string>
     <string name="guide_create_job">Click a workstation on the map to create.</string>
+    <string name="sop_exec_progress">Activities under the current SOP are already being carried out.</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -439,4 +439,5 @@
     <string name="lock_info">上锁信息</string>
     <string name="together_info">共锁信息</string>
     <string name="guide_create_job">请点击地图中的岗位进行创建</string>
+    <string name="sop_exec_progress">当前SOP已有工作在执行</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -439,4 +439,5 @@
     <string name="lock_info">上锁信息</string>
     <string name="together_info">共锁信息</string>
     <string name="guide_create_job">请点击地图中的岗位进行创建</string>
+    <string name="sop_exec_progress">当前SOP已有工作在执行</string>
 </resources>