diff --git a/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml b/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml deleted file mode 100644 index 935519e..0000000 --- a/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cim-client-sdk/cim-android-sdk/pom.xml b/cim-client-sdk/cim-android-sdk/pom.xml index 49b8bdf..ed38516 100755 --- a/cim-client-sdk/cim-android-sdk/pom.xml +++ b/cim-client-sdk/cim-android-sdk/pom.xml @@ -6,7 +6,7 @@ com.farsunset cim-android-sdk - 4.0.0 + 4.1.0 jar diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java index 82b9714..e4149a1 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java @@ -24,12 +24,10 @@ package com.farsunset.cim.sdk.android; import android.content.Context; import android.content.Intent; import android.os.Handler; -import android.os.HandlerThread; -import android.os.Process; -import com.farsunset.cim.sdk.android.logger.CIMLogger; import com.farsunset.cim.sdk.android.coder.ClientMessageDecoder; import com.farsunset.cim.sdk.android.coder.ClientMessageEncoder; import com.farsunset.cim.sdk.android.constant.CIMConstant; +import com.farsunset.cim.sdk.android.logger.CIMLogger; import com.farsunset.cim.sdk.android.model.*; import java.io.IOException; diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java index 98ad286..e83fcf4 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java @@ -30,8 +30,8 @@ import android.net.NetworkInfo; import android.os.Build; import android.os.LocaleList; import android.text.TextUtils; -import com.farsunset.cim.sdk.android.logger.CIMLogger; import com.farsunset.cim.sdk.android.constant.CIMConstant; +import com.farsunset.cim.sdk.android.logger.CIMLogger; import com.farsunset.cim.sdk.android.model.SentBody; import java.util.Locale; diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushService.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushService.java index 84bd801..8fea40a 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushService.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushService.java @@ -283,6 +283,7 @@ public class CIMPushService extends Service { Intent intent = new Intent(Intent.ACTION_MAIN); + intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); intent.setPackage(getPackageName()); Notification.Builder builder; @@ -296,7 +297,7 @@ public class CIMPushService extends Service { .setOngoing(false) .setSmallIcon(icon) .setWhen(System.currentTimeMillis()) - .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0)) + .setContentIntent(PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE)) .setContentTitle(channelName) .setContentText(message); diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java index ac9c0c7..feff18e 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java @@ -23,8 +23,8 @@ package com.farsunset.cim.sdk.android.coder; import com.farsunset.cim.sdk.android.constant.CIMConstant; -import com.farsunset.cim.sdk.android.model.Ping; import com.farsunset.cim.sdk.android.model.Message; +import com.farsunset.cim.sdk.android.model.Ping; import com.farsunset.cim.sdk.android.model.ReplyBody; import com.farsunset.cim.sdk.android.model.proto.MessageProto; import com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto; diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java index ba8d3d4..eec204d 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java @@ -21,8 +21,6 @@ */ package com.farsunset.cim.sdk.android.model; -import android.util.ArrayMap; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java index 7ee84ad..65d724c 100644 --- a/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java +++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java @@ -21,7 +21,6 @@ */ package com.farsunset.cim.sdk.android.model; -import android.util.ArrayMap; import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.model.proto.SentBodyProto; diff --git a/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-4.0.0.jar b/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-4.1.0.jar similarity index 70% rename from cim-use-examples/cim-client-android/app/libs/cim-android-sdk-4.0.0.jar rename to cim-use-examples/cim-client-android/app/libs/cim-android-sdk-4.1.0.jar index 1ef7e40..0a712b1 100644 Binary files a/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-4.0.0.jar and b/cim-use-examples/cim-client-android/app/libs/cim-android-sdk-4.1.0.jar differ