diff --git a/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml b/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml index 3c4fafa..935519e 100755 --- a/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml +++ b/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml @@ -10,7 +10,6 @@ - diff --git a/cim-client-sdk/cim-android-sdk/pom.xml b/cim-client-sdk/cim-android-sdk/pom.xml index 4b9249e..92b5088 100755 --- a/cim-client-sdk/cim-android-sdk/pom.xml +++ b/cim-client-sdk/cim-android-sdk/pom.xml @@ -15,7 +15,6 @@ 1.8 3.0.1 4.1.44.Final - 1.7.30 @@ -28,12 +27,6 @@ ${protobuf.lite.version} - - org.slf4j - slf4j-api - ${slf4j.version} - - android android 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 2efc722..561033e 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 @@ -56,8 +56,6 @@ public class CIMPushManager { protected static final String ACTION_HIDE_PERSIST_NOTIFICATION = "ACTION_HIDE_PERSIST_NOTIFICATION"; - protected static final String KEY_SEND_BODY = "KEY_SEND_BODY"; - /** * 初始化,连接服务端,在程序启动页或者 在Application里调用 */ @@ -160,7 +158,7 @@ public class CIMPushManager { } Intent serviceIntent = new Intent(context, CIMPushService.class); - serviceIntent.putExtra(KEY_SEND_BODY, body); + serviceIntent.putExtra(CIMPushService.KEY_SEND_BODY, body); serviceIntent.setAction(ACTION_SEND_REQUEST_BODY); startService(context, serviceIntent); 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 0a71f36..d251579 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 @@ -45,11 +45,12 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class CIMPushService extends Service { - public final static String KEY_DELAYED_TIME = "KEY_DELAYED_TIME"; - public final static String KEY_LOGGER_ENABLE = "KEY_LOGGER_ENABLE"; - public final static String KEY_NOTIFICATION_MESSAGE = "KEY_NOTIFICATION_MESSAGE"; - public final static String KEY_NOTIFICATION_CHANNEL = "KEY_NOTIFICATION_CHANNEL"; - public final static String KEY_NOTIFICATION_ICON = "KEY_NOTIFICATION_ICON"; + static final String KEY_SEND_BODY = "KEY_SEND_BODY"; + static final String KEY_DELAYED_TIME = "KEY_DELAYED_TIME"; + static final String KEY_LOGGER_ENABLE = "KEY_LOGGER_ENABLE"; + static final String KEY_NOTIFICATION_MESSAGE = "KEY_NOTIFICATION_MESSAGE"; + static final String KEY_NOTIFICATION_CHANNEL = "KEY_NOTIFICATION_CHANNEL"; + static final String KEY_NOTIFICATION_ICON = "KEY_NOTIFICATION_ICON"; private final static String TRANSIENT_NTC_CHANNEL_ID = "CIM_PUSH_TRANSIENT_NTC_ID"; private final static String PERSIST_NTC_CHANNEL_ID = "CIM_PUSH_PERSIST_NTC_ID"; @@ -134,7 +135,7 @@ public class CIMPushService extends Service { } if (CIMPushManager.ACTION_SEND_REQUEST_BODY.equals(action)) { - connectorManager.send((SentBody) intent.getSerializableExtra(CIMPushManager.KEY_SEND_BODY)); + connectorManager.send((SentBody) intent.getSerializableExtra(KEY_SEND_BODY)); } if (CIMPushManager.ACTION_CLOSE_CIM_CONNECTION.equals(action)) {