From 1a370567548e306a991614437562abacd744217f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= <xj753277@126.com>
Date: Sat, 1 Aug 2020 10:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0android=20sdk=20=E5=B8=B8?=
 =?UTF-8?q?=E9=A9=BB=E9=80=9A=E7=9F=A5=E6=A0=8F=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cim-client-sdk/cim-android-sdk/cim-android-sdk.iml  |  1 -
 cim-client-sdk/cim-android-sdk/pom.xml              |  7 -------
 .../farsunset/cim/sdk/android/CIMPushManager.java   |  4 +---
 .../farsunset/cim/sdk/android/CIMPushService.java   | 13 +++++++------
 4 files changed, 8 insertions(+), 17 deletions(-)

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 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-lite:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: android:android:8.0.0">
         <CLASSES>
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 @@
         <java.version>1.8</java.version>
         <protobuf.lite.version>3.0.1</protobuf.lite.version>
         <netty.version>4.1.44.Final</netty.version>
-        <slf4j.version>1.7.30</slf4j.version>
     </properties>
 
     <dependencies>
@@ -28,12 +27,6 @@
             <version>${protobuf.lite.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>android</groupId>
             <artifactId>android</artifactId>
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)) {