refactor(更新) :

- 锁定站修改

app/src/main/java/com/grkj/iscs/ble/BleConnectionManager.kt

@@ -24,6 +24,7 @@ import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_LOADING
 import com.grkj.iscs.util.ActivityUtils
 import com.grkj.iscs.util.CommonUtils
 import com.grkj.iscs.util.Executor
+import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.util.log.LogUtil
 import com.grkj.iscs.view.base.BaseActivity
 import com.sik.sikcore.activity.ActivityTracker
@@ -120,6 +121,7 @@ object BleConnectionManager {
     fun unregisterConnectListener(mac: String, bleBean: BleBean? = null) {
         LogUtil.i("蓝牙连接-unregisterConnectListener : $mac")
         connectListeners.removeAll { it.mac == mac }
+        currentConnectingMac = ""
     }
 
     /**
@@ -165,6 +167,8 @@ object BleConnectionManager {
                         listener.callBack?.invoke(false, null)
                         unregisterConnectListener(listener.mac)
                     }
+                    ModBusController.controlKeyBuckle(true, listener.mac)
+                    LogUtil.i("蓝牙连接-连接钥匙失败")
                     return@runOnMain
                 }
                 // 判断是否仍然待连，防止拿走

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

@@ -175,7 +175,6 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
     override fun onResume() {
         super.onResume()
         mChangePage?.let {
-            mBinding?.mapview?.visibility = View.VISIBLE
             refreshPage(it)
         }
     }
@@ -220,9 +219,6 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
                 mBinding?.mapview?.addLayer(stationLayer)
                 stationLayer?.setRatio(mapRatio)
                 mBinding?.mapview?.setMinZoom(mBinding?.mapview?.currentZoom ?: 0f)
-                ThreadUtils.runOnMain {
-                    mBinding?.mapview?.visibility = View.VISIBLE
-                }
             }
 
             override fun onMapLoadFail() {
@@ -556,8 +552,7 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
 
     override fun onPause() {
         super.onPause()
-        mBinding?.mapview?.release()
-        mBinding?.mapview?.visibility = View.GONE
+//        mBinding?.mapview?.release()
         mStep = 0
     }
 

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

@@ -55,7 +55,6 @@ class SwitchStatusFragment :
 
     override fun onResume() {
         super.onResume()
-        mBinding?.mapview?.visibility = View.VISIBLE
         presenter?.getMapData {
             getMap(it)
         }
@@ -74,8 +73,7 @@ class SwitchStatusFragment :
 
     override fun onPause() {
         super.onPause()
-        mBinding?.mapview?.visibility = View.GONE
-        mBinding?.mapview?.release()
+//        mBinding?.mapview?.release()
     }
 
     private fun getMap(mapId: String) {
@@ -164,9 +162,6 @@ class SwitchStatusFragment :
                 stationLayer?.stopAnimation()
                 stationLayer?.startAnimation()
                 mBinding?.mapview?.refresh()
-                ThreadUtils.runOnMain {
-                    mBinding?.mapview?.visibility = View.VISIBLE
-                }
             }
 
             override fun onMapLoadFail() {

app/src/main/res/layout/fragment_step.xml

@@ -162,8 +162,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_above="@id/rv_statistics"
-                    android:layout_marginTop="@dimen/common_spacing_small"
-                    android:visibility="gone"/>
+                    android:layout_marginTop="@dimen/common_spacing_small"/>
             </LinearLayout>
         </LinearLayout>
 

app/src/main/res/layout/fragment_switch_status.xml

@@ -10,6 +10,5 @@
     <com.onlylemi.mapview.library.MapView
         android:id="@+id/mapview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible"/>
+        android:layout_height="match_parent"/>
 </RelativeLayout>