diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e2b347b..0bb8ba1 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -19,6 +19,7 @@ import androidx.lifecycle.ViewModelProvider import com.amap.api.location.AMapLocation import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.CameraPosition import com.amap.api.maps.model.LatLng @@ -106,7 +107,9 @@ } is LoadState.Success -> { //断开连接 - BLEManager.disConnectDevice() + if (curConnectState) { + BLEManager.disConnectDevice() + } homeView.deviceStatusView.text = "设备编号：未连接" homeView.inspectNameView.text = "" homeView.inspectTimeView.text = "" @@ -147,6 +150,7 @@ aMap = homeView.mapView.map val uiSettings = aMap.uiSettings + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER uiSettings.isCompassEnabled = true uiSettings.isZoomControlsEnabled = true uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt index e2b347b..0bb8ba1 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/HomePageFragment.kt @@ -19,6 +19,7 @@ import androidx.lifecycle.ViewModelProvider import com.amap.api.location.AMapLocation import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.CameraPosition import com.amap.api.maps.model.LatLng @@ -106,7 +107,9 @@ } is LoadState.Success -> { //断开连接 - BLEManager.disConnectDevice() + if (curConnectState) { + BLEManager.disConnectDevice() + } homeView.deviceStatusView.text = "设备编号：未连接" homeView.inspectNameView.text = "" homeView.inspectTimeView.text = "" @@ -147,6 +150,7 @@ aMap = homeView.mapView.map val uiSettings = aMap.uiSettings + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER uiSettings.isCompassEnabled = true uiSettings.isZoomControlsEnabled = true uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 diff --git a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt index 0e0d177..1eb4984 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/fragment/HomePageFragment.kt @@ -18,13 +18,13 @@ import androidx.fragment.app.Fragment import com.amap.api.location.AMapLocation import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory import com.amap.api.maps.model.CameraPosition import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.MyLocationStyle import com.amap.api.maps.model.PolylineOptions import com.casic.birmm.inspect.R -import com.casic.birmm.inspect.callback.OnDataAddListener import com.casic.birmm.inspect.extensions.addAll import com.casic.birmm.inspect.extensions.id import com.casic.birmm.inspect.extensions.toDataModel @@ -50,13 +50,16 @@ @SuppressLint("MissingPermission") class HomePageFragment : Fragment(), Handler.Callback { + companion object { + lateinit var weakReferenceHandler: WeakReferenceHandler + } + private val kTag = "HomePageFragment" private val blueToothBeans: MutableList = ArrayList()//搜索展示列表 private val latLngs = LinkedList() private lateinit var homeView: View private lateinit var vibrator: Vibrator private lateinit var aMap: AMap - private lateinit var weakReferenceHandler: WeakReferenceHandler private var newInspectionModel: NewInspectionModel? = null//新建巡检数据结构模型 private var isBluetoothOn = true private var curConnectState = false @@ -91,6 +94,7 @@ aMap = homeView.mapView.map val uiSettings = aMap.uiSettings + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER uiSettings.isCompassEnabled = true uiSettings.isZoomControlsEnabled = true uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 @@ -377,6 +381,30 @@ kTag, "接收失败-> ${msg.obj as String}" ) LocaleConstant.DISCONNECT_SUCCESS -> curConnectState = false + 2023081301 -> { + //断开连接 + if (curConnectState) { + BLEManager.disConnectDevice() + } + homeView.deviceStatusView.text = "设备编号：未连接" + homeView.inspectNameView.text = "" + homeView.inspectTimeView.text = "" + homeView.currentValueView.text = "--" + homeView.settingsValueView.text = "--" + homeView.maxValueView.text = "--" + + //按钮状态 + homeView.stopInspectButton.isEnabled = false + homeView.addInspectionButton.isEnabled = true + + //清除缓存 + blueToothBeans.clear() + latLngs.clear() + SaveKeyValues.removeKey(LocaleConstant.DEVICE_CODE) + + LoadingDialogHub.dismiss() + "巡检记录保存成功".show(requireContext()) + } } return true } @@ -507,31 +535,7 @@ startLat = newInspectionModel!!.startLat, endLng = latLngs.last.longitude, endLat = latLngs.last.latitude, - routes = newInspectionModel!!.routes, - object : OnDataAddListener { - override fun onAddSuccess() { - //断开连接 - BLEManager.disConnectDevice() - homeView.deviceStatusView.text = "设备编号：未连接" - homeView.inspectNameView.text = "" - homeView.inspectTimeView.text = "" - homeView.currentValueView.text = "--" - homeView.settingsValueView.text = "--" - homeView.maxValueView.text = "--" - - //按钮状态 - homeView.stopInspectButton.isEnabled = false - homeView.addInspectionButton.isEnabled = true - - //清除缓存 - blueToothBeans.clear() - latLngs.clear() - SaveKeyValues.removeKey(LocaleConstant.DEVICE_CODE) - - LoadingDialogHub.dismiss() - "巡检记录保存成功".show(requireContext()) - } - } + routes = newInspectionModel!!.routes ) }