diff --git a/cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java b/cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java index aea881b..1c1a05a 100644 --- a/cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java +++ b/cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java @@ -22,6 +22,8 @@ package com.farsunset.cim.sdk.android; import android.app.Notification; +import android.app.NotificationChannel; +import android.app.NotificationManager; import android.app.Service; import android.content.BroadcastReceiver; import android.content.Context; @@ -102,7 +104,13 @@ public class CIMPushService extends Service { public int onStartCommand(Intent intent, int flags, int startId) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - startForeground(this.hashCode(), new Notification.Builder(this, null).build()); + NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE); + NotificationChannel channel = new NotificationChannel(getClass().getSimpleName(),getClass().getSimpleName(), NotificationManager.IMPORTANCE_LOW); + channel.enableLights(false); + channel.enableVibration(false); + notificationManager.createNotificationChannel(channel); + Notification notification = new Notification.Builder(this, channel.getId()).build(); + startForeground(this.hashCode(),notification); } intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent); diff --git a/cim_for_mina/cim-client-android/.idea/caches/build_file_checksums.ser b/cim_for_mina/cim-client-android/.idea/caches/build_file_checksums.ser index faae9f8..a4cefff 100644 Binary files a/cim_for_mina/cim-client-android/.idea/caches/build_file_checksums.ser and b/cim_for_mina/cim-client-android/.idea/caches/build_file_checksums.ser differ diff --git a/cim_for_mina/cim-client-android/.idea/caches/gradle_models.ser b/cim_for_mina/cim-client-android/.idea/caches/gradle_models.ser index 85963de..f6ece0f 100644 Binary files a/cim_for_mina/cim-client-android/.idea/caches/gradle_models.ser and b/cim_for_mina/cim-client-android/.idea/caches/gradle_models.ser differ diff --git a/cim_for_mina/cim-client-android/.idea/misc.xml b/cim_for_mina/cim-client-android/.idea/misc.xml index 703e5d4..af0bbdd 100644 --- a/cim_for_mina/cim-client-android/.idea/misc.xml +++ b/cim_for_mina/cim-client-android/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/cim_for_mina/cim-client-android/app/build.gradle b/cim_for_mina/cim-client-android/app/build.gradle index 488dea3..33d6139 100644 --- a/cim_for_mina/cim-client-android/app/build.gradle +++ b/cim_for_mina/cim-client-android/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "com.farsunset.ichat.example" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 31 versionName "3.1.0" } diff --git a/cim_for_mina/cim-client-android/app/libs/cim-android-sdk-3.6.jar b/cim_for_mina/cim-client-android/app/libs/cim-android-sdk-3.6.jar index 623a860..6486d6d 100644 Binary files a/cim_for_mina/cim-client-android/app/libs/cim-android-sdk-3.6.jar and b/cim_for_mina/cim-client-android/app/libs/cim-android-sdk-3.6.jar differ diff --git a/cim_for_mina/cim-client-android/app/src/main/AndroidManifest.xml b/cim_for_mina/cim-client-android/app/src/main/AndroidManifest.xml index e6347cb..5d3e85e 100644 --- a/cim_for_mina/cim-client-android/app/src/main/AndroidManifest.xml +++ b/cim_for_mina/cim-client-android/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ - + = Build.VERSION_CODES.O) { - startForeground(this.hashCode(), new Notification.Builder(this,null).build()); + NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE); + NotificationChannel channel = new NotificationChannel(getClass().getSimpleName(),getClass().getSimpleName(), NotificationManager.IMPORTANCE_LOW); + channel.enableLights(false); + channel.enableVibration(false); + notificationManager.createNotificationChannel(channel); + Notification notification = new Notification.Builder(this, channel.getId()).build(); + startForeground(this.hashCode(),notification); } intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent); diff --git a/cim_for_netty/cim-client-android/.idea/caches/build_file_checksums.ser b/cim_for_netty/cim-client-android/.idea/caches/build_file_checksums.ser index b881f9f..0d4c701 100644 Binary files a/cim_for_netty/cim-client-android/.idea/caches/build_file_checksums.ser and b/cim_for_netty/cim-client-android/.idea/caches/build_file_checksums.ser differ diff --git a/cim_for_netty/cim-client-android/.idea/caches/gradle_models.ser b/cim_for_netty/cim-client-android/.idea/caches/gradle_models.ser index 8132672..2eff6b7 100644 Binary files a/cim_for_netty/cim-client-android/.idea/caches/gradle_models.ser and b/cim_for_netty/cim-client-android/.idea/caches/gradle_models.ser differ diff --git a/cim_for_netty/cim-client-android/.idea/misc.xml b/cim_for_netty/cim-client-android/.idea/misc.xml index 703e5d4..af0bbdd 100644 --- a/cim_for_netty/cim-client-android/.idea/misc.xml +++ b/cim_for_netty/cim-client-android/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/cim_for_netty/cim-client-android/app/build.gradle b/cim_for_netty/cim-client-android/app/build.gradle index 6c426ea..c8800f2 100644 --- a/cim_for_netty/cim-client-android/app/build.gradle +++ b/cim_for_netty/cim-client-android/app/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { applicationId "com.farsunset.ichat.example" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 31 versionName "3.1.0" } diff --git a/cim_for_netty/cim-client-android/app/libs/cim-android-sdk-3.6.jar b/cim_for_netty/cim-client-android/app/libs/cim-android-sdk-3.6.jar index 48b23e8..bd3329c 100644 Binary files a/cim_for_netty/cim-client-android/app/libs/cim-android-sdk-3.6.jar and b/cim_for_netty/cim-client-android/app/libs/cim-android-sdk-3.6.jar differ diff --git a/cim_for_netty/cim-client-android/app/src/main/AndroidManifest.xml b/cim_for_netty/cim-client-android/app/src/main/AndroidManifest.xml index e6347cb..5d3e85e 100644 --- a/cim_for_netty/cim-client-android/app/src/main/AndroidManifest.xml +++ b/cim_for_netty/cim-client-android/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ - +