From 5dc06714ff69345ad5a761a6b8a286e204508fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= Date: Sat, 7 Mar 2020 15:49:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpush=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E8=BF=9E=E7=BB=ADfor=E5=BE=AA=E7=8E=AF=E4=B8=AD?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=97=B6=EF=BC=8Candroid=20,=20java=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=BC=9A=E6=94=B6=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cim-boot-server/cim-boot-server.iml | 60 +- cim-boot-server/cim-boot-server.ipr | 257 ++++---- cim-boot-server/cim-boot-server.iws | 82 +-- cim-boot-server/pom.xml | 2 +- .../com/farsunset/cim/ServerLauncher.java | 2 +- .../controller/NavigationController.java | 2 +- .../admin/controller/SessionController.java | 2 +- .../cim/api/controller/MessageController.java | 26 +- .../cim/api/controller/dto/BaseResult.java | 34 - .../cim/api/controller/dto/MessageResult.java | 27 - .../com/farsunset/cim/config/CIMConfig.java | 32 +- .../farsunset/cim/handler/BindHandler.java | 4 +- .../cim/handler/SessionClosedHandler.java | 14 +- .../farsunset/cim/push/CIMMessagePusher.java | 6 +- .../cim/push/DefaultMessagePusher.java | 11 +- .../cim/repository/SessionRepository.java | 2 +- .../farsunset/cim/service/ApnsService.java | 2 +- .../cim/service/CIMSessionService.java | 2 +- .../service/impl/CIMSessionServiceImpl.java | 4 +- .../cim/service/impl/JavaApnsServiceImpl.java | 2 +- .../farsunset/cim/util/ApnsPayloadCompat.java | 2 +- .../src/main/resources/application.properties | 8 +- .../main/resources/i18n/messages.properties | 126 ++-- .../cim-android-sdk/cim-android-sdk.iml | 24 +- cim-client-sdk/cim-android-sdk/jar.bat | 0 cim-client-sdk/cim-android-sdk/jar.sh | 0 cim-client-sdk/cim-android-sdk/pom.xml | 0 .../cim/sdk/android/CIMCacheManager.java | 104 ++-- .../cim/sdk/android/CIMCacheProvider.java | 64 +- .../cim/sdk/android/CIMConnectorManager.java | 586 ++++++++---------- .../android/CIMEventBroadcastReceiver.java | 321 +++++----- .../cim/sdk/android/CIMEventListener.java | 90 ++- .../cim/sdk/android/CIMListenerManager.java | 146 ++--- .../cim/sdk/android/CIMPushManager.java | 379 +++++------ .../cim/sdk/android/CIMPushService.java | 328 +++++----- .../cim/sdk/android/coder/CIMLogger.java | 138 ----- .../android/coder/ClientMessageDecoder.java | 140 ++--- .../android/coder/ClientMessageEncoder.java | 43 +- .../cim/sdk/android/constant/CIMConstant.java | 132 ++-- .../cim/sdk/android/logger/CIMLogger.java | 133 ++++ .../sdk/android/model/HeartbeatRequest.java | 43 +- .../sdk/android/model/HeartbeatResponse.java | 42 +- .../cim/sdk/android/model/Message.java | 222 +++---- .../cim/sdk/android/model/Protobufable.java | 4 +- .../cim/sdk/android/model/ReplyBody.java | 143 +++-- .../cim/sdk/android/model/SentBody.java | 123 ++-- .../cim/sdk/android/model/proto/Message.proto | 20 +- .../sdk/android/model/proto/ReplyBody.proto | 14 +- .../sdk/android/model/proto/SentBody.proto | 10 +- cim-client-sdk/cim-java-sdk/cim-java-sdk.iml | 15 +- cim-client-sdk/cim-java-sdk/jar.bat | 0 cim-client-sdk/cim-java-sdk/jar.sh | 0 cim-client-sdk/cim-java-sdk/pom.xml | 0 .../cim/sdk/client/CIMCacheManager.java | 2 +- .../cim/sdk/client/CIMConnectorManager.java | 116 ++-- .../sdk/client/CIMEventBroadcastReceiver.java | 2 +- .../cim/sdk/client/CIMListenerManager.java | 12 +- .../cim/sdk/client/CIMPushManager.java | 40 +- .../cim/sdk/client/CIMPushService.java | 2 +- .../cim/sdk/client/coder/CIMLogger.java | 2 +- .../client/coder/ClientMessageDecoder.java | 100 ++- .../client/coder/ClientMessageEncoder.java | 11 +- .../cim/sdk/client/constant/CIMConstant.java | 17 +- .../sdk/client/model/HeartbeatRequest.java | 2 +- .../sdk/client/model/HeartbeatResponse.java | 2 +- .../cim/sdk/client/model/Intent.java | 2 +- .../.idea/caches/build_file_checksums.ser | Bin 545 -> 536 bytes .../cim-client-android/.idea/gradle.xml | 11 +- .../cim-client-android/.idea/modules.xml | 2 + .../app/libs/cim-android-sdk-3.8.0.jar | Bin 75272 -> 74288 bytes .../adapter/SystemMsgListViewAdapter.java | 5 - .../farsunset/ichat/example/app/Constant.java | 2 +- .../ichat/example/ui/LoginActivity.java | 2 +- .../example/ui/SystemMessageActivity.java | 9 +- .../cim-client-android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 5 +- .../cim-client-java/cim-java-client.iml | 24 + .../libs/cim-java-sdk-3.8.0.jar | Bin 84534 -> 83466 bytes 78 files changed, 2092 insertions(+), 2253 deletions(-) delete mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java delete mode 100644 cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/MessageResult.java mode change 100644 => 100755 cim-client-sdk/cim-android-sdk/cim-android-sdk.iml mode change 100644 => 100755 cim-client-sdk/cim-android-sdk/jar.bat mode change 100644 => 100755 cim-client-sdk/cim-android-sdk/jar.sh mode change 100644 => 100755 cim-client-sdk/cim-android-sdk/pom.xml delete mode 100644 cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/CIMLogger.java create mode 100644 cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/logger/CIMLogger.java mode change 100644 => 100755 cim-client-sdk/cim-java-sdk/cim-java-sdk.iml mode change 100644 => 100755 cim-client-sdk/cim-java-sdk/jar.bat mode change 100644 => 100755 cim-client-sdk/cim-java-sdk/jar.sh mode change 100644 => 100755 cim-client-sdk/cim-java-sdk/pom.xml create mode 100644 cim-use-examples/cim-client-java/cim-java-client.iml diff --git a/cim-boot-server/cim-boot-server.iml b/cim-boot-server/cim-boot-server.iml index 7e7cb66..3112c78 100644 --- a/cim-boot-server/cim-boot-server.iml +++ b/cim-boot-server/cim-boot-server.iml @@ -25,45 +25,45 @@ - - - - - + + + + + - + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - + @@ -74,7 +74,7 @@ - + diff --git a/cim-boot-server/cim-boot-server.ipr b/cim-boot-server/cim-boot-server.ipr index dac790d..ade6802 100644 --- a/cim-boot-server/cim-boot-server.ipr +++ b/cim-boot-server/cim-boot-server.ipr @@ -77,6 +77,23 @@ + + + + + + + + @@ -111,70 +128,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -298,15 +315,15 @@ - + - + - + - + @@ -353,37 +370,37 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -419,224 +436,224 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws index ced7a89..444f09b 100644 --- a/cim-boot-server/cim-boot-server.iws +++ b/cim-boot-server/cim-boot-server.iws @@ -23,7 +23,6 @@ @@ -34,7 +33,7 @@ - + @@ -74,18 +73,6 @@ - -