diff --git a/app/.gitignore b/app/.gitignore index 42afabf..8895f3b 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +*.zip \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore index 42afabf..8895f3b 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +*.zip \ No newline at end of file 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 ca723c7..add127a 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 @@ -2,7 +2,6 @@ import android.bluetooth.BluetoothGatt import android.bluetooth.BluetoothGattCharacteristic -import android.content.Context import android.graphics.Color import android.os.Bundle import android.os.Vibrator @@ -47,9 +46,11 @@ import com.clj.fastble.callback.BleWriteCallback import com.clj.fastble.data.BleDevice import com.clj.fastble.exception.BleException +import com.clj.fastble.scan.BleScanRuleConfig import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.getStatusBarHeight +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -74,13 +75,13 @@ private val bluetoothDevices by lazy { java.util.ArrayList() } private val latLngs = LinkedList() private lateinit var userName: String - private lateinit var vibrator: Vibrator private lateinit var eventViewModel: EventViewModel private lateinit var inspectionViewModel: InspectionViewModel private lateinit var routeViewModel: RouteViewModel private lateinit var aMap: AMap private lateinit var writeUuid: String private lateinit var notifyUuid: String + private var vibrator: Vibrator? = null private var newModel: NewInspectionModel? = null//新建巡检数据结构模型 private var connectedDevice: BleDevice? = null private var isGeneratingTask = false @@ -103,9 +104,11 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - vibrator = requireContext().getSystemService(Context.VIBRATOR_SERVICE) as Vibrator + vibrator = requireContext().getSystemService() - bleManager.enableLog(true).setSplitWriteNum(16).init(BaseApplication.get()) + bleManager.init(BaseApplication.get()) + val scanConfig = BleScanRuleConfig.Builder().setScanTimeOut(3000).build() + bleManager.enableLog(true).initScanRule(scanConfig) //Map binding.mapView.onCreate(savedInstanceState) @@ -617,7 +620,7 @@ if (dataModel.potency >= dataModel.alarmValue) { //当前值大于设置值，需要报警 SoundPoolHelper.playSound(requireContext(), R.raw.alarm) - vibrator.vibrate(1000) + vibrator?.vibrate(1000) val isRecord = SaveKeyValues.getValue( LocaleConstant.SINGLE_AUTO_RECORD, false ) as Boolean diff --git a/app/.gitignore b/app/.gitignore index 42afabf..8895f3b 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +*.zip \ No newline at end of file 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 ca723c7..add127a 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 @@ -2,7 +2,6 @@ import android.bluetooth.BluetoothGatt import android.bluetooth.BluetoothGattCharacteristic -import android.content.Context import android.graphics.Color import android.os.Bundle import android.os.Vibrator @@ -47,9 +46,11 @@ import com.clj.fastble.callback.BleWriteCallback import com.clj.fastble.data.BleDevice import com.clj.fastble.exception.BleException +import com.clj.fastble.scan.BleScanRuleConfig import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.getStatusBarHeight +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -74,13 +75,13 @@ private val bluetoothDevices by lazy { java.util.ArrayList() } private val latLngs = LinkedList() private lateinit var userName: String - private lateinit var vibrator: Vibrator private lateinit var eventViewModel: EventViewModel private lateinit var inspectionViewModel: InspectionViewModel private lateinit var routeViewModel: RouteViewModel private lateinit var aMap: AMap private lateinit var writeUuid: String private lateinit var notifyUuid: String + private var vibrator: Vibrator? = null private var newModel: NewInspectionModel? = null//新建巡检数据结构模型 private var connectedDevice: BleDevice? = null private var isGeneratingTask = false @@ -103,9 +104,11 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - vibrator = requireContext().getSystemService(Context.VIBRATOR_SERVICE) as Vibrator + vibrator = requireContext().getSystemService() - bleManager.enableLog(true).setSplitWriteNum(16).init(BaseApplication.get()) + bleManager.init(BaseApplication.get()) + val scanConfig = BleScanRuleConfig.Builder().setScanTimeOut(3000).build() + bleManager.enableLog(true).initScanRule(scanConfig) //Map binding.mapView.onCreate(savedInstanceState) @@ -617,7 +620,7 @@ if (dataModel.potency >= dataModel.alarmValue) { //当前值大于设置值，需要报警 SoundPoolHelper.playSound(requireContext(), R.raw.alarm) - vibrator.vibrate(1000) + vibrator?.vibrate(1000) val isRecord = SaveKeyValues.getValue( LocaleConstant.SINGLE_AUTO_RECORD, false ) as Boolean 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 6621f33..f38bc93 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 @@ -2,7 +2,6 @@ import android.bluetooth.BluetoothGatt import android.bluetooth.BluetoothGattCharacteristic -import android.content.Context import android.graphics.Color import android.os.Bundle import android.os.Vibrator @@ -42,9 +41,11 @@ import com.clj.fastble.callback.BleWriteCallback import com.clj.fastble.data.BleDevice import com.clj.fastble.exception.BleException +import com.clj.fastble.scan.BleScanRuleConfig import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.getStatusBarHeight +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -67,10 +68,10 @@ private val bleManager by lazy { BleManager.getInstance() } private val bluetoothDevices by lazy { ArrayList() } private val latLngs = LinkedList() - private lateinit var vibrator: Vibrator private lateinit var aMap: AMap private lateinit var writeUuid: String private lateinit var notifyUuid: String + private var vibrator: Vibrator? = null private var newModel: NewInspectionModel? = null//新建巡检数据结构模型 private var connectedDevice: BleDevice? = null private var isGeneratingTask = false @@ -93,9 +94,11 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - vibrator = requireContext().getSystemService(Context.VIBRATOR_SERVICE) as Vibrator + vibrator = requireContext().getSystemService() - bleManager.enableLog(true).init(BaseApplication.get()) + bleManager.init(BaseApplication.get()) + val scanConfig = BleScanRuleConfig.Builder().setScanTimeOut(3000).build() + bleManager.enableLog(true).initScanRule(scanConfig) binding.mapView.onCreate(savedInstanceState) aMap = binding.mapView.map @@ -572,7 +575,7 @@ if (dataModel.potency >= dataModel.alarmValue) { //当前值大于设置值，需要报警 SoundPoolHelper.playSound(requireContext(), R.raw.alarm) - vibrator.vibrate(1000) + vibrator?.vibrate(1000) val isRecord = SaveKeyValues.getValue( LocaleConstant.SINGLE_AUTO_RECORD, false ) as Boolean