diff --git a/app/build.gradle b/app/build.gradle index 876b951..f10e240 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,8 +127,6 @@ implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航、定位、地图三合一 - implementation 'com.amap.api:navi-3dmap:latest.integration' //生成二维码 implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //OpenCV diff --git a/app/build.gradle b/app/build.gradle index 876b951..f10e240 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,8 +127,6 @@ implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航、定位、地图三合一 - implementation 'com.amap.api:navi-3dmap:latest.integration' //生成二维码 implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //OpenCV diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d02d2cb..9a9e12d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,10 +25,6 @@ android:minSdkVersion="33" /> - - - - @@ -92,14 +88,6 @@ - - - - - - diff --git a/app/build.gradle b/app/build.gradle index 876b951..f10e240 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,8 +127,6 @@ implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航、定位、地图三合一 - implementation 'com.amap.api:navi-3dmap:latest.integration' //生成二维码 implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //OpenCV diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d02d2cb..9a9e12d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,10 +25,6 @@ android:minSdkVersion="33" /> - - - - @@ -92,14 +88,6 @@ - - - - - - diff --git a/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt index 949ba83..3272030 100644 --- a/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt @@ -16,8 +16,6 @@ Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { @@ -25,16 +23,12 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } else { arrayOf( Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } diff --git a/app/build.gradle b/app/build.gradle index 876b951..f10e240 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,8 +127,6 @@ implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航、定位、地图三合一 - implementation 'com.amap.api:navi-3dmap:latest.integration' //生成二维码 implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //OpenCV diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d02d2cb..9a9e12d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,10 +25,6 @@ android:minSdkVersion="33" /> - - - - @@ -92,14 +88,6 @@ - - - - - - diff --git a/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt index 949ba83..3272030 100644 --- a/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt @@ -16,8 +16,6 @@ Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { @@ -25,16 +23,12 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } else { arrayOf( Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } diff --git a/app/src/main/java/com/casic/br/app/utils/LocationManager.kt b/app/src/main/java/com/casic/br/app/utils/LocationManager.kt deleted file mode 100644 index 99762ec..0000000 --- a/app/src/main/java/com/casic/br/app/utils/LocationManager.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.br.app.utils - -import android.content.Context -import android.util.Log -import com.amap.api.location.AMapLocation -import com.amap.api.location.AMapLocationClient -import com.amap.api.location.AMapLocationClientOption - -class LocationManager constructor(context: Context) { - - private val kTag = "LocationManager" - private val locationClient by lazy { AMapLocationClient(context) } - - fun getCurrentLocation(isOnceLocation: Boolean, listener: OnGetLocationListener) { - val locationOption = AMapLocationClientOption() - locationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Hight_Accuracy - locationOption.isOnceLocation = isOnceLocation - locationOption.isNeedAddress = true - locationClient.setLocationOption(locationOption) - locationClient.setLocationListener { - if (it.errorCode == 0) { - listener.onAMapLocationGet(it) - } else { - listener.onAMapLocationGet(null) - Log.e(kTag, "errCode:${it.errorCode}, errInfo:${it.errorInfo}") - } - } - locationClient.startLocation() - } - - fun stopLocation() { - locationClient.stopLocation() - } - - /** - * 经纬度定位回调 - * */ - interface OnGetLocationListener { - fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 876b951..f10e240 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,8 +127,6 @@ implementation 'io.github.lucksiege:pictureselector:v3.11.1' //图片压缩 implementation 'top.zibin:Luban:1.1.8' - //高德导航、定位、地图三合一 - implementation 'com.amap.api:navi-3dmap:latest.integration' //生成二维码 implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2' //OpenCV diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d02d2cb..9a9e12d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,10 +25,6 @@ android:minSdkVersion="33" /> - - - - @@ -92,14 +88,6 @@ - - - - - - diff --git a/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt index 949ba83..3272030 100644 --- a/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/app/utils/LocaleConstant.kt @@ -16,8 +16,6 @@ Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { @@ -25,16 +23,12 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } else { arrayOf( Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA ) } diff --git a/app/src/main/java/com/casic/br/app/utils/LocationManager.kt b/app/src/main/java/com/casic/br/app/utils/LocationManager.kt deleted file mode 100644 index 99762ec..0000000 --- a/app/src/main/java/com/casic/br/app/utils/LocationManager.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.br.app.utils - -import android.content.Context -import android.util.Log -import com.amap.api.location.AMapLocation -import com.amap.api.location.AMapLocationClient -import com.amap.api.location.AMapLocationClientOption - -class LocationManager constructor(context: Context) { - - private val kTag = "LocationManager" - private val locationClient by lazy { AMapLocationClient(context) } - - fun getCurrentLocation(isOnceLocation: Boolean, listener: OnGetLocationListener) { - val locationOption = AMapLocationClientOption() - locationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Hight_Accuracy - locationOption.isOnceLocation = isOnceLocation - locationOption.isNeedAddress = true - locationClient.setLocationOption(locationOption) - locationClient.setLocationListener { - if (it.errorCode == 0) { - listener.onAMapLocationGet(it) - } else { - listener.onAMapLocationGet(null) - Log.e(kTag, "errCode:${it.errorCode}, errInfo:${it.errorInfo}") - } - } - locationClient.startLocation() - } - - fun stopLocation() { - locationClient.stopLocation() - } - - /** - * 经纬度定位回调 - * */ - interface OnGetLocationListener { - fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt index 706858c..cd90fb1 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt @@ -12,7 +12,6 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope -import com.amap.api.location.AMapLocation import com.casic.br.app.R import com.casic.br.app.databinding.ActivityStartCheckByYoloBinding import com.casic.br.app.extensions.convert2YoloResult @@ -24,7 +23,6 @@ import com.casic.br.app.external.Yolov8ncnn import com.casic.br.app.model.HiddenTroubleResult import com.casic.br.app.utils.LocaleConstant -import com.casic.br.app.utils.LocationManager import com.casic.br.app.utils.RuntimeCache import com.casic.br.app.utils.YoloTargetDetectHelper import com.casic.br.app.vm.AlarmViewModel @@ -58,7 +56,6 @@ private val kTag = "StartCheckActivity" private val context = this - private val locationManager by lazy { LocationManager(this) } private val targetSet by lazy { HashSet() } private val targetTypeSet by lazy { HashSet() } private val detectedTargetSet by lazy { HashSet() } @@ -73,7 +70,6 @@ private lateinit var alarmViewModel: AlarmViewModel private lateinit var result: HiddenTroubleResult private lateinit var timer: Timer - private var inspectionAddress = "" private var isDetectTarget = false override fun initOnCreate(savedInstanceState: Bundle?) { @@ -93,14 +89,6 @@ binding.surfaceView.holder.setFormat(PixelFormat.RGBA_8888) binding.surfaceView.holder.addCallback(this) - locationManager.getCurrentLocation(false, object : LocationManager.OnGetLocationListener { - override fun onAMapLocationGet(location: AMapLocation?) { - location?.apply { - inspectionAddress = address - } - } - }) - inspectionViewModel = ViewModelProvider(this)[InspectionViewModel::class.java] val inspectionUser = SaveKeyValues.getValue( LocaleConstant.ACCOUNT, "" @@ -110,7 +98,7 @@ val inspectionDate = currentTimeMillis.timestampToDate() val startTime = currentTimeMillis.timestampToTime() inspectionViewModel.startInspection( - this, inspectionUser, inspectionAddress, inspectionDate, startTime + this, inspectionUser, "", inspectionDate, startTime ) inspectionViewModel.addResultModel.observe(this) { if (it.code == 200) { @@ -410,9 +398,4 @@ override fun surfaceCreated(holder: SurfaceHolder) {} override fun surfaceDestroyed(holder: SurfaceHolder) {} - - override fun onDestroy() { - super.onDestroy() - locationManager.stopLocation() - } } \ No newline at end of file