diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f6344c..c394d71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,9 +18,6 @@
-
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f6344c..c394d71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,9 +18,6 @@
-
diff --git a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
index d919346..7985fa0 100644
--- a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
+++ b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
@@ -1,5 +1,6 @@
package com.casic.br.operationsite.service
+import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.Service
import android.content.Context
@@ -25,6 +26,12 @@
override fun onCreate() {
super.onCreate()
notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+ val name = "${resources.getString(R.string.app_name)}前台服务"
+ val channel = NotificationChannel(
+ "foreground_running_service_channel", name, NotificationManager.IMPORTANCE_HIGH
+ )
+ channel.description = "Channel for Foreground Running Service"
+ notificationManager?.createNotificationChannel(channel)
notificationBuilder = NotificationCompat.Builder(this, "foreground_running_service_channel")
.setSmallIcon(R.mipmap.ic_launcher)
.setContentTitle("通讯服务连接中...")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f6344c..c394d71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,9 +18,6 @@
-
diff --git a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
index d919346..7985fa0 100644
--- a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
+++ b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
@@ -1,5 +1,6 @@
package com.casic.br.operationsite.service
+import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.Service
import android.content.Context
@@ -25,6 +26,12 @@
override fun onCreate() {
super.onCreate()
notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+ val name = "${resources.getString(R.string.app_name)}前台服务"
+ val channel = NotificationChannel(
+ "foreground_running_service_channel", name, NotificationManager.IMPORTANCE_HIGH
+ )
+ channel.description = "Channel for Foreground Running Service"
+ notificationManager?.createNotificationChannel(channel)
notificationBuilder = NotificationCompat.Builder(this, "foreground_running_service_channel")
.setSmallIcon(R.mipmap.ic_launcher)
.setContentTitle("通讯服务连接中...")
diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt
index 7b1db19..261d21a 100644
--- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt
@@ -12,7 +12,6 @@
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.READ_PHONE_STATE,
Manifest.permission.CHANGE_NETWORK_STATE,
- Manifest.permission.WRITE_SETTINGS,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE,
@@ -27,7 +26,6 @@
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.READ_PHONE_STATE,
Manifest.permission.CHANGE_NETWORK_STATE,
- Manifest.permission.WRITE_SETTINGS,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE,
@@ -41,7 +39,6 @@
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.READ_PHONE_STATE,
Manifest.permission.CHANGE_NETWORK_STATE,
- Manifest.permission.WRITE_SETTINGS,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE,
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f6344c..c394d71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,9 +18,6 @@
-
diff --git a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
index d919346..7985fa0 100644
--- a/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
+++ b/app/src/main/java/com/casic/br/operationsite/service/ForegroundRunningService.kt
@@ -1,5 +1,6 @@
package com.casic.br.operationsite.service
+import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.Service
import android.content.Context
@@ -25,6 +26,12 @@
override fun onCreate() {
super.onCreate()
notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+ val name = "${resources.getString(R.string.app_name)}前台服务"
+ val channel = NotificationChannel(
+ "foreground_running_service_channel", name, NotificationManager.IMPORTANCE_HIGH
+ )
+ channel.description = "Channel for Foreground Running Service"
+ notificationManager?.createNotificationChannel(channel)
notificationBuilder = NotificationCompat.Builder(this, "foreground_running_service_channel")
.setSmallIcon(R.mipmap.ic_launcher)
.setContentTitle("通讯服务连接中...")
diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt
index 7b1db19..261d21a 100644
--- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt
@@ -12,7 +12,6 @@
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.READ_PHONE_STATE,
Manifest.permission.CHANGE_NETWORK_STATE,
- Manifest.permission.WRITE_SETTINGS,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE,
@@ -27,7 +26,6 @@
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.READ_PHONE_STATE,
Manifest.permission.CHANGE_NETWORK_STATE,
- Manifest.permission.WRITE_SETTINGS,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE,
@@ -41,7 +39,6 @@
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.READ_PHONE_STATE,
Manifest.permission.CHANGE_NETWORK_STATE,
- Manifest.permission.WRITE_SETTINGS,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE,
diff --git a/app/src/main/res/layout/activity_device_control.xml b/app/src/main/res/layout/activity_device_control.xml
index ee5f741..6a9b844 100644
--- a/app/src/main/res/layout/activity_device_control.xml
+++ b/app/src/main/res/layout/activity_device_control.xml
@@ -16,7 +16,7 @@
app:tbv_text="@string/app_name" />
-