diff --git a/app/src/main/java/com/casic/birmm/inspect/service/LocationService.kt b/app/src/main/java/com/casic/birmm/inspect/service/LocationService.kt index 89574ab..0971de5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/service/LocationService.kt +++ b/app/src/main/java/com/casic/birmm/inspect/service/LocationService.kt @@ -5,10 +5,10 @@ import android.app.NotificationManager import android.app.Service import android.content.Intent -import android.graphics.BitmapFactory import android.os.Binder import android.os.Build import android.os.IBinder +import androidx.core.app.NotificationCompat import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationListener import com.casic.birmm.inspect.R @@ -63,26 +63,20 @@ private fun createForegroundNotification() { val notificationManager = getSystemService() - val builder: Notification.Builder val name = resources.getString(R.string.app_name) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - //创建渠道 + val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val id = "${kTag}Channel" val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH) - channel.setShowBadge(true) - channel.enableVibration(false) - channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC //设置锁屏可见 notificationManager?.createNotificationChannel(channel) - builder = Notification.Builder(this, id) + NotificationCompat.Builder(this, id) } else { - builder = Notification.Builder(this).setPriority(Notification.PRIORITY_HIGH) + NotificationCompat.Builder(this) } - val bitmap = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher) builder.setContentTitle(name) - .setContentText("${name}巡检任务定位中") + .setContentText("巡检任务持续定位中") + .setPriority(NotificationCompat.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setSmallIcon(R.mipmap.ic_launcher) - .setLargeIcon(bitmap) val notification = builder.build() notification.flags = Notification.FLAG_NO_CLEAR startForeground(Int.MAX_VALUE, notification) diff --git a/app/src/main/java/com/casic/birmm/inspect/service/LocationService.kt b/app/src/main/java/com/casic/birmm/inspect/service/LocationService.kt index 89574ab..0971de5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/service/LocationService.kt +++ b/app/src/main/java/com/casic/birmm/inspect/service/LocationService.kt @@ -5,10 +5,10 @@ import android.app.NotificationManager import android.app.Service import android.content.Intent -import android.graphics.BitmapFactory import android.os.Binder import android.os.Build import android.os.IBinder +import androidx.core.app.NotificationCompat import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationListener import com.casic.birmm.inspect.R @@ -63,26 +63,20 @@ private fun createForegroundNotification() { val notificationManager = getSystemService() - val builder: Notification.Builder val name = resources.getString(R.string.app_name) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - //创建渠道 + val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val id = "${kTag}Channel" val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH) - channel.setShowBadge(true) - channel.enableVibration(false) - channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC //设置锁屏可见 notificationManager?.createNotificationChannel(channel) - builder = Notification.Builder(this, id) + NotificationCompat.Builder(this, id) } else { - builder = Notification.Builder(this).setPriority(Notification.PRIORITY_HIGH) + NotificationCompat.Builder(this) } - val bitmap = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher) builder.setContentTitle(name) - .setContentText("${name}巡检任务定位中") + .setContentText("巡检任务持续定位中") + .setPriority(NotificationCompat.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setSmallIcon(R.mipmap.ic_launcher) - .setLargeIcon(bitmap) val notification = builder.build() notification.flags = Notification.FLAG_NO_CLEAR startForeground(Int.MAX_VALUE, notification) diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 5b23f00..66cecd8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -25,7 +25,8 @@ Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE + Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.POST_NOTIFICATIONS ) } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { arrayOf(