gitee/cim
1
0
Fork 0
mirror of https://gitee.com/farsunset/cim.git synced 2025-07-20 14:56:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.服务端springboot升级2.1.4,protobuf升级3.7.0

Browse Source 
2.android sdk升级，适配android8.0+，修复一些之前的兼容性问题

2.消息的id字段名由mid修改为id，类型由String修改为long;
This commit is contained in:
远方夕阳 2019-04-19 10:06:49 +08:00
parent 8e26600974
commit 351c6bc0ae
14 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java
View File

@ -22,6 +22,8 @@
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.Service; import android.app.Service;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@ -102,7 +104,13 @@ public class CIMPushService extends Service {
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { 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); intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent);

BIN
cim_for_mina/cim-client-android/.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

BIN
cim_for_mina/cim-client-android/.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

2
cim_for_mina/cim-client-android/.idea/misc.xml generated
View File

@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

2
cim_for_mina/cim-client-android/app/build.gradle
View File

@ -6,7 +6,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.farsunset.ichat.example" applicationId "com.farsunset.ichat.example"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 28
versionCode 31 versionCode 31
versionName "3.1.0" versionName "3.1.0"
} }

BIN
cim_for_mina/cim-client-android/app/libs/cim-android-sdk-3.6.jar
View File

Binary file not shown.

2
cim_for_mina/cim-client-android/app/src/main/AndroidManifest.xml
View File

@ -7,7 +7,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<application <application
android:allowBackup="true" android:allowBackup="true"

10
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java
View File

@ -22,6 +22,8 @@
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.Service; import android.app.Service;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@ -103,7 +105,13 @@ public class CIMPushService extends Service {
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { 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); intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent);

BIN
cim_for_netty/cim-client-android/.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

BIN
cim_for_netty/cim-client-android/.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

2
cim_for_netty/cim-client-android/.idea/misc.xml generated
View File

@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

2
cim_for_netty/cim-client-android/app/build.gradle
View File

@ -7,7 +7,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.farsunset.ichat.example" applicationId "com.farsunset.ichat.example"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 27
versionCode 31 versionCode 31
versionName "3.1.0" versionName "3.1.0"
} }

BIN
cim_for_netty/cim-client-android/app/libs/cim-android-sdk-3.6.jar
View File

Binary file not shown.

2
cim_for_netty/cim-client-android/app/src/main/AndroidManifest.xml
View File

@ -7,7 +7,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<application <application
android:allowBackup="true" android:allowBackup="true"