gitee/cim
1
0
Fork 0
mirror of https://gitee.com/farsunset/cim.git synced 2025-07-27 10:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

对websdk和javasdk增加了处理下线的逻辑

Browse Source
This commit is contained in:
远方夕阳 2018-02-05 17:58:41 +08:00
parent 13805095b5
commit 627e2bcd9a
163 changed files with 26222 additions and 27614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheManager.java
View File

@ -26,8 +26,8 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
class CIMCacheManager {
class CIMCacheManager {
public static final String CIM_CONFIG_INFO = "CIM_CONFIG_INFO"; public static final String CIM_CONFIG_INFO = "CIM_CONFIG_INFO";
@ -45,16 +45,12 @@ class CIMCacheManager {
public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE"; public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE";
public static void remove(Context context, String key) {
public static void remove(Context context ,String key)
{
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
resolver.delete(Uri.parse(CIMCacheProvider.CONTENT_URI), key, null); resolver.delete(Uri.parse(CIMCacheProvider.CONTENT_URI), key, null);
} }
public static void putString(Context context, String key, String value) {
public static void putString(Context context ,String key,String value)
{
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
@ -64,13 +60,11 @@ class CIMCacheManager {
} }
public static String getString(Context context ,String key) public static String getString(Context context, String key) {
{
String value = null; String value = null;
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
Cursor cursor = resolver.query(Uri.parse(CIMCacheProvider.CONTENT_URI), new String[]{key}, null,null,null); Cursor cursor = resolver.query(Uri.parse(CIMCacheProvider.CONTENT_URI), new String[] { key }, null, null, null);
if (cursor!=null && cursor.moveToFirst()) if (cursor != null && cursor.moveToFirst()) {
{
value = cursor.getString(0); value = cursor.getString(0);
cursor.close(); cursor.close();
} }
@ -78,34 +72,30 @@ class CIMCacheManager {
return value; return value;
} }
private static void closeQuietly(Cursor cursor){ private static void closeQuietly(Cursor cursor) {
try{ try {
if(cursor!=null) if (cursor != null)
cursor.close(); cursor.close();
}catch(Exception e){} } catch (Exception e) {
}
} }
public static void putBoolean(Context context,String key,boolean value) public static void putBoolean(Context context, String key, boolean value) {
{ putString(context, key, Boolean.toString(value));
putString(context,key,Boolean.toString(value));
} }
public static boolean getBoolean(Context context,String key) public static boolean getBoolean(Context context, String key) {
{ String value = getString(context, key);
String value = getString(context,key); return value == null ? false : Boolean.parseBoolean(value);
return value == null?false:Boolean.parseBoolean(value);
} }
public static void putInt(Context context, String key, int value) {
public static void putInt(Context context,String key,int value) putString(context, key, String.valueOf(value));
{
putString(context,key, String.valueOf(value));
} }
public static int getInt(Context context,String key) public static int getInt(Context context, String key) {
{ String value = getString(context, key);
String value = getString(context,key); return value == null ? 0 : Integer.parseInt(value);
return value == null?0:Integer.parseInt(value);
} }
} }

8
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheProvider.java
View File

@ -29,10 +29,9 @@ import android.database.MatrixCursor;
import android.net.Uri; import android.net.Uri;
public class CIMCacheProvider extends ContentProvider { public class CIMCacheProvider extends ContentProvider {
public static final String CONTENT_URI="content://com.farsunset.cim.provider"; public static final String CONTENT_URI = "content://com.farsunset.cim.provider";
static final String MODEL_KEY = "PRIVATE_CIM_CONFIG"; static final String MODEL_KEY = "PRIVATE_CIM_CONFIG";
@Override @Override
public int delete(Uri arg0, String key, String[] arg2) { public int delete(Uri arg0, String key, String[] arg2) {
getContext().getSharedPreferences(MODEL_KEY, Context.MODE_PRIVATE).edit().remove(key).apply(); getContext().getSharedPreferences(MODEL_KEY, Context.MODE_PRIVATE).edit().remove(key).apply();
@ -59,9 +58,9 @@ public class CIMCacheProvider extends ContentProvider {
@Override @Override
public Cursor query(Uri arg0, String[] arg1, String key, String[] arg3, String arg4) { public Cursor query(Uri arg0, String[] arg1, String key, String[] arg3, String arg4) {
MatrixCursor cursor = new MatrixCursor(new String[]{"value"}); MatrixCursor cursor = new MatrixCursor(new String[] { "value" });
String value = getContext().getSharedPreferences(MODEL_KEY, Context.MODE_PRIVATE).getString(arg1[0], null); String value = getContext().getSharedPreferences(MODEL_KEY, Context.MODE_PRIVATE).getString(arg1[0], null);
cursor.addRow(new Object[]{value}); cursor.addRow(new Object[] { value });
return cursor; return cursor;
} }
@ -70,5 +69,4 @@ public class CIMCacheProvider extends ContentProvider {
return 0; return 0;
} }
} }

105
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMConnectorManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
@ -60,13 +61,13 @@ import com.farsunset.cim.sdk.android.model.SentBody;
class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageFactory { class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageFactory {
private final String TAG = CIMConnectorManager.class.getSimpleName(); private final String TAG = CIMConnectorManager.class.getSimpleName();
private final int READ_BUFFER_SIZE = 2048;//bit private final int READ_BUFFER_SIZE = 2048;// bit
private final int CONNECT_TIMEOUT = 10 * 1000;//秒 private final int CONNECT_TIMEOUT = 10 * 1000;// 秒
private final int WRITE_TIMEOUT = 10 * 1000;//秒 private final int WRITE_TIMEOUT = 10 * 1000;// 秒
private final int READ_IDLE_TIME = 120;//秒 private final int READ_IDLE_TIME = 120;// 秒
private final int HEARBEAT_TIME_OUT = (READ_IDLE_TIME + 10) * 1000;// 收到服务端心跳请求超时时间 毫秒 private final int HEARBEAT_TIME_OUT = (READ_IDLE_TIME + 10) * 1000;// 收到服务端心跳请求超时时间 毫秒
private final String KEY_LAST_HEART_TIME = "KEY_LAST_HEART_TIME" ; private final String KEY_LAST_HEART_TIME = "KEY_LAST_HEART_TIME";
private NioSocketConnector connector; private NioSocketConnector connector;
private ConnectFuture connectFuture; private ConnectFuture connectFuture;
@ -75,8 +76,6 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
private static CIMConnectorManager manager; private static CIMConnectorManager manager;
private CIMConnectorManager(Context ctx) { private CIMConnectorManager(Context ctx) {
context = ctx; context = ctx;
@ -106,24 +105,24 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
} }
private synchronized void syncConnection(final String host,final int port) { private synchronized void syncConnection(final String host, final int port) {
if(isConnected()){ if (isConnected()) {
return ; return;
} }
try { try {
Log.i(TAG, "****************CIM正在连接服务器 "+host+":"+port+"......"); Log.i(TAG, "****************CIM正在连接服务器 " + host + ":" + port + "......");
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_CONNECTION_STATE, false); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
InetSocketAddress remoteSocketAddress = new InetSocketAddress(host, port); InetSocketAddress remoteSocketAddress = new InetSocketAddress(host, port);
connectFuture = connector.connect(remoteSocketAddress); connectFuture = connector.connect(remoteSocketAddress);
connectFuture.awaitUninterruptibly(); connectFuture.awaitUninterruptibly();
connectFuture.getSession(); connectFuture.getSession();
} catch (Exception e) { } catch (Exception e) {
long interval = CIMConstant.RECONN_INTERVAL_TIME - (5*1000 - new Random().nextInt(15*1000)); long interval = CIMConstant.RECONN_INTERVAL_TIME - (5 * 1000 - new Random().nextInt(15 * 1000));
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED); intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED);
@ -131,7 +130,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
intent.putExtra("interval", interval); intent.putExtra("interval", interval);
context.sendBroadcast(intent); context.sendBroadcast(intent);
Log.e(TAG, "****************CIM连接服务器失败 "+host+":"+port+"......将在"+interval/1000+"秒后重新尝试连接"); Log.e(TAG, "****************CIM连接服务器失败 " + host + ":" + port + "......将在" + interval / 1000 + "秒后重新尝试连接");
} }
@ -143,15 +142,14 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED); intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED);
intent.putExtra(Exception.class.getName(),NetworkDisabledException.class.getSimpleName()); intent.putExtra(Exception.class.getName(), NetworkDisabledException.class.getSimpleName());
context.sendBroadcast(intent); context.sendBroadcast(intent);
return; return;
} }
executor.execute(new Runnable() { executor.execute(new Runnable() {
public void run() public void run() {
{
syncConnection(host, port); syncConnection(host, port);
} }
}); });
@ -162,25 +160,23 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
boolean isSuccessed = false; boolean isSuccessed = false;
String exceptionName =SessionClosedException.class.getSimpleName(); String exceptionName = SessionClosedException.class.getSimpleName();
IoSession session = getCurrentSession(); IoSession session = getCurrentSession();
if(session!=null && session.isConnected()) if (session != null && session.isConnected()) {
{
WriteFuture wf = session.write(body); WriteFuture wf = session.write(body);
// 消息发送超时 5秒 // 消息发送超时 5秒
wf.awaitUninterruptibly(WRITE_TIMEOUT); wf.awaitUninterruptibly(WRITE_TIMEOUT);
isSuccessed = wf.isWritten(); isSuccessed = wf.isWritten();
if(wf.getException() != null) if (wf.getException() != null) {
{ exceptionName = wf.getException().getClass().getSimpleName();
exceptionName =wf.getException().getClass().getSimpleName();
} }
} }
if(!isSuccessed){ if (!isSuccessed) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_SENT_FAILED); intent.setAction(CIMConstant.IntentAction.ACTION_SENT_FAILED);
intent.putExtra(Exception.class.getName(),exceptionName); intent.putExtra(Exception.class.getName(), exceptionName);
intent.putExtra(SentBody.class.getName(), body); intent.putExtra(SentBody.class.getName(), body);
context.sendBroadcast(intent); context.sendBroadcast(intent);
} }
@ -202,39 +198,31 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
public boolean isConnected() { public boolean isConnected() {
IoSession session = getCurrentSession(); IoSession session = getCurrentSession();
return session != null ; return session != null;
} }
public void closeSession() {
public void closeSession()
{
IoSession session = getCurrentSession(); IoSession session = getCurrentSession();
if(session!=null) if (session != null) {
{
session.closeNow(); session.closeNow();
} }
} }
public IoSession getCurrentSession() public IoSession getCurrentSession() {
{ Map<Long, IoSession> sessions = connector.getManagedSessions();
Map<Long,IoSession> sessions = connector.getManagedSessions(); for (Long key : sessions.keySet()) {
for(Long key:sessions.keySet())
{
IoSession session = sessions.get(key); IoSession session = sessions.get(key);
if(session.isConnected()){ if (session.isConnected()) {
return session; return session;
} }
} }
return null; return null;
} }
@Override @Override
public void sessionCreated(IoSession session) throws Exception { public void sessionCreated(IoSession session) throws Exception {
Log.i(TAG, "****************CIM连接服务器成功:" + session.getLocalAddress() + " NID:" + session.getId());
Log.i(TAG, "****************CIM连接服务器成功:"+session.getLocalAddress()+" NID:"+session.getId());
setLastHeartbeatTime(session); setLastHeartbeatTime(session);
@ -247,7 +235,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
@Override @Override
public void sessionClosed(IoSession session) { public void sessionClosed(IoSession session) {
Log.e(TAG, "****************CIM与服务器断开连接:"+session.getLocalAddress()+" NID:"+session.getId()); Log.e(TAG, "****************CIM与服务器断开连接:" + session.getLocalAddress() + " NID:" + session.getId());
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED); intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED);
@ -257,33 +245,32 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
@Override @Override
public void sessionIdle(IoSession session, IdleStatus status) { public void sessionIdle(IoSession session, IdleStatus status) {
Log.d(TAG, "****************CIM "+status.toString().toUpperCase()+":"+session.getLocalAddress() +" NID:"+session.getId()+ " isConnected:" + session.isConnected()); Log.d(TAG, "****************CIM " + status.toString().toUpperCase() + ":" + session.getLocalAddress() + " NID:"
+ session.getId() + " isConnected:" + session.isConnected());
/** /**
* 用于解决，wifi情况下。偶而路由器与服务器断开连接时，客户端并没及时收到关闭事件 * 用于解决，wifi情况下。偶而路由器与服务器断开连接时，客户端并没及时收到关闭事件 导致这样的情况下当前连接无效也不会重连的问题
* 导致这样的情况下当前连接无效也不会重连的问题
* *
*/ */
long lastHeartbeatTime = getLastHeartbeatTime(session); long lastHeartbeatTime = getLastHeartbeatTime(session);
if(System.currentTimeMillis() - lastHeartbeatTime >= HEARBEAT_TIME_OUT) if (System.currentTimeMillis() - lastHeartbeatTime >= HEARBEAT_TIME_OUT) {
{
session.closeNow(); session.closeNow();
Log.e(TAG, "****************CIM心跳超时 ,即将重新连接......"+" NID:"+session.getId()); Log.e(TAG, "****************CIM心跳超时 ,即将重新连接......" + " NID:" + session.getId());
} }
} }
@Override @Override
public void exceptionCaught(IoSession session, Throwable cause) { public void exceptionCaught(IoSession session, Throwable cause) {
Log.e(TAG, "****************CIM连接出现未知异常:"+session.getLocalAddress()+" NID:"+session.getId()); Log.e(TAG, "****************CIM连接出现未知异常:" + session.getLocalAddress() + " NID:" + session.getId());
if(cause!=null && cause.getMessage()!=null){ if (cause != null && cause.getMessage() != null) {
Log.e(TAG, cause.getMessage()); Log.e(TAG, cause.getMessage());
} }
} }
@Override @Override
public void messageReceived(IoSession session, Object obj){ public void messageReceived(IoSession session, Object obj) {
if (obj instanceof Message) { if (obj instanceof Message) {
@ -304,8 +291,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
@Override @Override
public void messageSent(IoSession session, Object message) { public void messageSent(IoSession session, Object message) {
if(message instanceof SentBody) if (message instanceof SentBody) {
{
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED); intent.setAction(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED);
intent.putExtra(SentBody.class.getName(), (SentBody) message); intent.putExtra(SentBody.class.getName(), (SentBody) message);
@ -313,17 +299,14 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
} }
} }
private void setLastHeartbeatTime(IoSession session) {
private void setLastHeartbeatTime(IoSession session)
{
session.setAttribute(KEY_LAST_HEART_TIME, System.currentTimeMillis()); session.setAttribute(KEY_LAST_HEART_TIME, System.currentTimeMillis());
} }
private long getLastHeartbeatTime(IoSession session) private long getLastHeartbeatTime(IoSession session) {
{
long time = 0; long time = 0;
Object value = session.getAttribute(KEY_LAST_HEART_TIME); Object value = session.getAttribute(KEY_LAST_HEART_TIME);
if(value !=null){ if (value != null) {
time = Long.parseLong(value.toString()); time = Long.parseLong(value.toString());
} }
return time; return time;
@ -334,12 +317,12 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
ConnectivityManager nw = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager nw = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = nw.getActiveNetworkInfo(); NetworkInfo networkInfo = nw.getActiveNetworkInfo();
return networkInfo != null; return networkInfo != null;
} catch (Exception e) {} } catch (Exception e) {
}
return false; return false;
} }
@Override @Override
public Object getRequest(IoSession arg0) { public Object getRequest(IoSession arg0) {
return null; return null;

117
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.constant.CIMConstant;
import com.farsunset.cim.sdk.android.exception.SessionClosedException; import com.farsunset.cim.sdk.android.exception.SessionClosedException;
import com.farsunset.cim.sdk.android.model.Message; import com.farsunset.cim.sdk.android.model.Message;
@ -33,10 +32,11 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
/** /**
* 消息入口，所有消息都会经过这里 * 消息入口，所有消息都会经过这里
*/ */
public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver{ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver {
protected Context context; protected Context context;
@ -48,123 +48,108 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver{
/* /*
* 操作事件广播，用于提高service存活率 * 操作事件广播，用于提高service存活率
*/ */
if(intent.getAction().equals(Intent.ACTION_USER_PRESENT) if (intent.getAction().equals(Intent.ACTION_USER_PRESENT)
||intent.getAction().equals(Intent.ACTION_POWER_CONNECTED) || intent.getAction().equals(Intent.ACTION_POWER_CONNECTED)
||intent.getAction().equals(Intent.ACTION_POWER_DISCONNECTED)) || intent.getAction().equals(Intent.ACTION_POWER_DISCONNECTED)) {
{
startPushService(); startPushService();
} }
/* /*
* 设备网络状态变化事件 * 设备网络状态变化事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_NETWORK_CHANGED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_NETWORK_CHANGED)) {
{ ConnectivityManager connectivityManager = (ConnectivityManager) context
ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE); .getSystemService(Context.CONNECTIVITY_SERVICE);
onDevicesNetworkChanged(connectivityManager.getActiveNetworkInfo()); onDevicesNetworkChanged(connectivityManager.getActiveNetworkInfo());
} }
/* /*
* cim断开服务器事件 * cim断开服务器事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED)) {
{
onInnerConnectionClosed(); onInnerConnectionClosed();
} }
/* /*
* cim连接服务器失败事件 * cim连接服务器失败事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED)) {
{
long interval = intent.getLongExtra("interval", CIMConstant.RECONN_INTERVAL_TIME); long interval = intent.getLongExtra("interval", CIMConstant.RECONN_INTERVAL_TIME);
String exceptionName = intent.getStringExtra(Exception.class.getName()); String exceptionName = intent.getStringExtra(Exception.class.getName());
onConnectionFailed(exceptionName,interval); onConnectionFailed(exceptionName, interval);
} }
/* /*
* cim连接服务器成功事件 * cim连接服务器成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED)) {
{
onInnerConnectionSuccessed(); onInnerConnectionSuccessed();
} }
/* /*
* 收到推送消息事件 * 收到推送消息事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED)) {
{ onInnerMessageReceived((Message) intent.getSerializableExtra(Message.class.getName()), intent);
onInnerMessageReceived((Message)intent.getSerializableExtra(Message.class.getName()),intent);
} }
/* /*
* 获取收到replybody成功事件 * 获取收到replybody成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED)) {
{ onReplyReceived((ReplyBody) intent.getSerializableExtra(ReplyBody.class.getName()));
onReplyReceived((ReplyBody)intent.getSerializableExtra(ReplyBody.class.getName()));
} }
/* /*
* 获取sendbody发送失败事件 * 获取sendbody发送失败事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_FAILED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_FAILED)) {
{
String exceptionName = intent.getStringExtra(Exception.class.getName()); String exceptionName = intent.getStringExtra(Exception.class.getName());
SentBody sentBody = (SentBody)intent.getSerializableExtra(SentBody.class.getName()); SentBody sentBody = (SentBody) intent.getSerializableExtra(SentBody.class.getName());
onSentFailed(exceptionName,sentBody); onSentFailed(exceptionName, sentBody);
} }
/* /*
* 获取sendbody发送成功事件 * 获取sendbody发送成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED)) {
{ onSentSucceed((SentBody) intent.getSerializableExtra(SentBody.class.getName()));
onSentSucceed((SentBody)intent.getSerializableExtra(SentBody.class.getName()));
} }
/* /*
* 重新连接，如果断开的话 * 重新连接，如果断开的话
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_RECOVERY)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_RECOVERY)) {
{ CIMPushManager.connect(context, 0);
CIMPushManager.connect(context,0);
} }
} }
private void startPushService(){ private void startPushService() {
Intent intent = new Intent(context, CIMPushService.class); Intent intent = new Intent(context, CIMPushService.class);
intent.setAction(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE); intent.setAction(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE);
context.startService(intent); context.startService(intent);
} }
private void onInnerConnectionClosed(){ private void onInnerConnectionClosed() {
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_CONNECTION_STATE, false); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
if(CIMConnectorManager.isNetworkConnected(context)) if (CIMConnectorManager.isNetworkConnected(context)) {
{ CIMPushManager.connect(context, 0);
CIMPushManager.connect(context,0);
} }
onConnectionClosed(); onConnectionClosed();
} }
private void onConnectionFailed(String exceptionName,long reinterval){ private void onConnectionFailed(String exceptionName, long reinterval) {
if(CIMConnectorManager.isNetworkConnected(context)) if (CIMConnectorManager.isNetworkConnected(context)) {
{
onConnectionFailed(); onConnectionFailed();
CIMPushManager.connect(context,reinterval); CIMPushManager.connect(context, reinterval);
} }
} }
private void onInnerConnectionSuccessed(){ private void onInnerConnectionSuccessed() {
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_CONNECTION_STATE, true); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE, true);
boolean autoBind = CIMPushManager.autoBindAccount(context); boolean autoBind = CIMPushManager.autoBindAccount(context);
onConnectionSuccessed(autoBind); onConnectionSuccessed(autoBind);
@ -172,51 +157,43 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver{
private void onDevicesNetworkChanged(NetworkInfo info) { private void onDevicesNetworkChanged(NetworkInfo info) {
if(info !=null) if (info != null) {
{ CIMPushManager.connect(context, 0);
CIMPushManager.connect(context,0);
} }
onNetworkChanged(info); onNetworkChanged(info);
} }
private void onInnerMessageReceived(com.farsunset.cim.sdk.android.model.Message message, Intent intent){ private void onInnerMessageReceived(com.farsunset.cim.sdk.android.model.Message message, Intent intent) {
if(isForceOfflineMessage(message.getAction())) if (isForceOfflineMessage(message.getAction())) {
{
CIMPushManager.stop(context); CIMPushManager.stop(context);
} }
onMessageReceived(message,intent); onMessageReceived(message, intent);
} }
private boolean isForceOfflineMessage(String action) private boolean isForceOfflineMessage(String action) {
{
return CIMConstant.MessageAction.ACTION_999.equals(action); return CIMConstant.MessageAction.ACTION_999.equals(action);
} }
private void onSentFailed(String exceptionName, SentBody body){ private void onSentFailed(String exceptionName, SentBody body) {
//与服务端端开链接，重新连接 // 与服务端端开链接，重新连接
if(SessionClosedException.class.getSimpleName().equals(exceptionName)) if (SessionClosedException.class.getSimpleName().equals(exceptionName)) {
{ CIMPushManager.connect(context, 0);
CIMPushManager.connect(context,0); } else {
}else // 发送失败 重新发送
{
//发送失败 重新发送
CIMPushManager.sendRequest(context, body); CIMPushManager.sendRequest(context, body);
} }
} }
public abstract void onMessageReceived(com.farsunset.cim.sdk.android.model.Message message, Intent intent);
public abstract void onMessageReceived(com.farsunset.cim.sdk.android.model.Message message,Intent intent);
public void onNetworkChanged(NetworkInfo info) { public void onNetworkChanged(NetworkInfo info) {
CIMListenerManager.notifyOnNetworkChanged(info); CIMListenerManager.notifyOnNetworkChanged(info);
} }
public void onConnectionSuccessed(boolean hasAutoBind) { public void onConnectionSuccessed(boolean hasAutoBind) {
CIMListenerManager.notifyOnConnectionSuccessed(hasAutoBind); CIMListenerManager.notifyOnConnectionSuccessed(hasAutoBind);
} }
@ -233,7 +210,7 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver{
CIMListenerManager.notifyOnReplyReceived(body); CIMListenerManager.notifyOnReplyReceived(body);
} }
public void onSentSucceed(SentBody body){ public void onSentSucceed(SentBody body) {
CIMListenerManager.notifyOnSentSucceed(body); CIMListenerManager.notifyOnSentSucceed(body);
} }
} }

17
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventListener.java
View File

@ -28,41 +28,43 @@ import com.farsunset.cim.sdk.android.model.ReplyBody;
import com.farsunset.cim.sdk.android.model.SentBody; import com.farsunset.cim.sdk.android.model.SentBody;
/** /**
*CIM 主要事件接口 * CIM 主要事件接口
*/ */
public interface CIMEventListener public interface CIMEventListener {
{
/** /**
* 当收到服务端推送过来的消息时调用 * 当收到服务端推送过来的消息时调用
*
* @param message * @param message
*/ */
void onMessageReceived(Message message); void onMessageReceived(Message message);
/** /**
* 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用 * 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用
*
* @param replybody * @param replybody
*/ */
void onReplyReceived(ReplyBody replybody); void onReplyReceived(ReplyBody replybody);
/** /**
* 当调用CIMPushManager.sendRequest()向服务端发送请求成功时 * 当调用CIMPushManager.sendRequest()向服务端发送请求成功时
*
* @param body * @param body
*/ */
void onSentSuccessed(SentBody body); void onSentSuccessed(SentBody body);
/** /**
* 当手机网络发生变化时调用 * 当手机网络发生变化时调用
*
* @param networkinfo * @param networkinfo
*/ */
void onNetworkChanged(NetworkInfo networkinfo); void onNetworkChanged(NetworkInfo networkinfo);
/** /**
* 当连接服务器成功时回调 * 当连接服务器成功时回调
* @param hasAutoBind : true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount *
* @param hasAutoBind
* : true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount
*/ */
void onConnectionSuccessed(boolean hasAutoBind); void onConnectionSuccessed(boolean hasAutoBind);
@ -83,4 +85,3 @@ public interface CIMEventListener
*/ */
int getEventDispatchOrder(); int getEventDispatchOrder();
} }

17
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMListenerManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -31,7 +32,6 @@ import com.farsunset.cim.sdk.android.model.SentBody;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.util.Log; import android.util.Log;
/** /**
* CIM 消息监听器管理 * CIM 消息监听器管理
*/ */
@ -44,11 +44,10 @@ public class CIMListenerManager {
if (!cimListeners.contains(listener)) { if (!cimListeners.contains(listener)) {
cimListeners.add(listener); cimListeners.add(listener);
Collections.sort(cimListeners,comparator); Collections.sort(cimListeners, comparator);
} }
} }
public static void removeMessageListener(CIMEventListener listener) { public static void removeMessageListener(CIMEventListener listener) {
for (int i = 0; i < cimListeners.size(); i++) { for (int i = 0; i < cimListeners.size(); i++) {
if (listener.getClass() == cimListeners.get(i).getClass()) { if (listener.getClass() == cimListeners.get(i).getClass()) {
@ -57,19 +56,18 @@ public class CIMListenerManager {
} }
} }
public static void notifyOnNetworkChanged(NetworkInfo info) { public static void notifyOnNetworkChanged(NetworkInfo info) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onNetworkChanged(info); listener.onNetworkChanged(info);
} }
} }
public static void notifyOnConnectionSuccessed(boolean hasAutoBind) { public static void notifyOnConnectionSuccessed(boolean hasAutoBind) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onConnectionSuccessed(hasAutoBind); listener.onConnectionSuccessed(hasAutoBind);
} }
} }
public static void notifyOnMessageReceived(Message message) { public static void notifyOnMessageReceived(Message message) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onMessageReceived(message); listener.onMessageReceived(message);
@ -88,7 +86,6 @@ public class CIMListenerManager {
} }
} }
public static void notifyOnReplyReceived(ReplyBody body) { public static void notifyOnReplyReceived(ReplyBody body) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onReplyReceived(body); listener.onReplyReceived(body);
@ -101,31 +98,29 @@ public class CIMListenerManager {
} }
} }
public static void destory() { public static void destory() {
cimListeners.clear(); cimListeners.clear();
} }
public static void logListenersName() { public static void logListenersName() {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
Log.i(CIMEventListener.class.getSimpleName(),"#######" + listener.getClass().getName() + "#######" ); Log.i(CIMEventListener.class.getSimpleName(), "#######" + listener.getClass().getName() + "#######");
} }
} }
/** /**
* 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序 * 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序
*/ */
private static class CIMMessageReceiveComparator implements Comparator<CIMEventListener>{ private static class CIMMessageReceiveComparator implements Comparator<CIMEventListener> {
@Override @Override
public int compare(CIMEventListener arg1, CIMEventListener arg2) { public int compare(CIMEventListener arg1, CIMEventListener arg2) {
int order1 = arg1.getEventDispatchOrder(); int order1 = arg1.getEventDispatchOrder();
int order2 = arg2.getEventDispatchOrder(); int order2 = arg2.getEventDispatchOrder();
return order2 - order1 ; return order2 - order1;
} }
} }
} }

149
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import java.util.UUID; import java.util.UUID;
import android.content.Context; import android.content.Context;
@ -36,43 +37,43 @@ import com.farsunset.cim.sdk.android.model.SentBody;
*/ */
public class CIMPushManager { public class CIMPushManager {
static String ACTION_ACTIVATE_PUSH_SERVICE ="ACTION_ACTIVATE_PUSH_SERVICE"; static String ACTION_ACTIVATE_PUSH_SERVICE = "ACTION_ACTIVATE_PUSH_SERVICE";
static String ACTION_CREATE_CIM_CONNECTION ="ACTION_CREATE_CIM_CONNECTION"; static String ACTION_CREATE_CIM_CONNECTION = "ACTION_CREATE_CIM_CONNECTION";
static String ACTION_SEND_REQUEST_BODY ="ACTION_SEND_REQUEST_BODY"; static String ACTION_SEND_REQUEST_BODY = "ACTION_SEND_REQUEST_BODY";
static String ACTION_CLOSE_CIM_CONNECTION ="ACTION_CLOSE_CIM_CONNECTION"; static String ACTION_CLOSE_CIM_CONNECTION = "ACTION_CLOSE_CIM_CONNECTION";
static String ACTION_DESTORY ="ACTION_DESTORY"; static String ACTION_DESTORY = "ACTION_DESTORY";
static String KEY_SEND_BODY ="KEY_SEND_BODY"; static String KEY_SEND_BODY = "KEY_SEND_BODY";
static String KEY_CIM_CONNECTION_STATUS ="KEY_CIM_CONNECTION_STATUS"; static String KEY_CIM_CONNECTION_STATUS = "KEY_CIM_CONNECTION_STATUS";
/** /**
* 初始化,连接服务端，在程序启动页或者 在Application里调用 * 初始化,连接服务端，在程序启动页或者 在Application里调用
*
* @param context * @param context
* @param ip * @param ip
* @param port * @param port
*/ */
public static void connect(Context context,String host,int port){ public static void connect(Context context, String host, int port) {
connect(context,host,port,false,0); connect(context, host, port, false, 0);
} }
private static void connect(Context context,String ip,int port,boolean autoBind,long delayedTime){ private static void connect(Context context, String ip, int port, boolean autoBind, long delayedTime) {
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED, false); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED, false);
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_MANUAL_STOP, false); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, false);
CIMCacheManager.putString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST, ip); CIMCacheManager.putString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST, ip);
CIMCacheManager.putInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT, port); CIMCacheManager.putInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT, port);
if(!autoBind) if (!autoBind) {
{ CIMCacheManager.remove(context, CIMCacheManager.KEY_ACCOUNT);
CIMCacheManager.remove(context,CIMCacheManager.KEY_ACCOUNT);
} }
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
@ -84,94 +85,88 @@ public class CIMPushManager {
} }
protected static void connect(Context context,long delayedTime){ protected static void connect(Context context, long delayedTime) {
boolean isManualStop = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_MANUAL_STOP);
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualStop || isManualDestory) if (isManualStop || isManualDestory) {
{ return;
return ;
} }
String host = CIMCacheManager.getString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST); String host = CIMCacheManager.getString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST);
int port =CIMCacheManager.getInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT); int port = CIMCacheManager.getInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT);
connect(context,host,port,true,delayedTime); connect(context, host, port, true, delayedTime);
} }
/** /**
* 设置一个账号登录到服务端 * 设置一个账号登录到服务端
* @param account 用户唯一ID *
* @param account
* 用户唯一ID
*/ */
public static void bindAccount(Context context,String account){ public static void bindAccount(Context context, String account) {
boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); if (isManualDestory || account == null || account.trim().length() == 0) {
if(isManualDestory || account==null || account.trim().length()==0) return;
{
return ;
} }
sendBindRequest(context,account); sendBindRequest(context, account);
} }
private static void sendBindRequest(Context context, String account) {
private static void sendBindRequest(Context context, String account){ CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, false);
CIMCacheManager.putString(context, CIMCacheManager.KEY_ACCOUNT, account);
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_MANUAL_STOP, false); String deviceId = CIMCacheManager.getString(context, CIMCacheManager.KEY_DEVICE_ID);
CIMCacheManager.putString(context,CIMCacheManager.KEY_ACCOUNT, account); if (TextUtils.isEmpty(deviceId)) {
String deviceId = CIMCacheManager.getString(context,CIMCacheManager.KEY_DEVICE_ID);
if(TextUtils.isEmpty(deviceId)) {
deviceId = UUID.randomUUID().toString().replaceAll("-", ""); deviceId = UUID.randomUUID().toString().replaceAll("-", "");
CIMCacheManager.putString(context,CIMCacheManager.KEY_DEVICE_ID, deviceId); CIMCacheManager.putString(context, CIMCacheManager.KEY_DEVICE_ID, deviceId);
} }
SentBody sent = new SentBody(); SentBody sent = new SentBody();
sent.setKey(CIMConstant.RequestKey.CLIENT_BIND); sent.setKey(CIMConstant.RequestKey.CLIENT_BIND);
sent.put("account", account); sent.put("account", account);
sent.put("deviceId",deviceId); sent.put("deviceId", deviceId);
sent.put("channel", "android"); sent.put("channel", "android");
sent.put("device",android.os.Build.MODEL); sent.put("device", android.os.Build.MODEL);
sent.put("version",getVersionName(context)); sent.put("version", getVersionName(context));
sent.put("osVersion",android.os.Build.VERSION.RELEASE); sent.put("osVersion", android.os.Build.VERSION.RELEASE);
sent.put("packageName",context.getPackageName()); sent.put("packageName", context.getPackageName());
sendRequest(context,sent); sendRequest(context, sent);
} }
protected static boolean autoBindAccount(Context context){ protected static boolean autoBindAccount(Context context) {
String account = CIMCacheManager.getString(context,CIMCacheManager.KEY_ACCOUNT); String account = CIMCacheManager.getString(context, CIMCacheManager.KEY_ACCOUNT);
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if( account==null || account.trim().length()==0 || isManualDestory ) if (account == null || account.trim().length() == 0 || isManualDestory) {
{
return false; return false;
} }
sendBindRequest(context,account); sendBindRequest(context, account);
return true; return true;
} }
/** /**
* 发送一个CIM请求 * 发送一个CIM请求
*
* @param context * @param context
* @body * @body
*/ */
public static void sendRequest(Context context, SentBody body){ public static void sendRequest(Context context, SentBody body) {
boolean isManualStop = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_MANUAL_STOP);
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualStop || isManualDestory) if (isManualStop || isManualDestory) {
{ return;
return ;
} }
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
@ -183,16 +178,17 @@ public class CIMPushManager {
/** /**
* 停止接受推送，将会退出当前账号登录，端口与服务端的连接 * 停止接受推送，将会退出当前账号登录，端口与服务端的连接
*
* @param context * @param context
*/ */
public static void stop(Context context){ public static void stop(Context context) {
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualDestory){ if (isManualDestory) {
return ; return;
} }
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_MANUAL_STOP, true); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, true);
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.setAction(ACTION_CLOSE_CIM_CONNECTION); serviceIntent.setAction(ACTION_CLOSE_CIM_CONNECTION);
@ -200,16 +196,15 @@ public class CIMPushManager {
} }
/** /**
* 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复 * 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复
*
* @param context * @param context
*/ */
public static void destroy(Context context){ public static void destroy(Context context) {
CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED, true);
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED, true); CIMCacheManager.putString(context, CIMCacheManager.KEY_ACCOUNT, null);
CIMCacheManager.putString(context,CIMCacheManager.KEY_ACCOUNT, null);
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.setAction(ACTION_DESTORY); serviceIntent.setAction(ACTION_DESTORY);
@ -217,27 +212,25 @@ public class CIMPushManager {
} }
/** /**
* 重新恢复接收推送，重新连接服务端，并登录当前账号 * 重新恢复接收推送，重新连接服务端，并登录当前账号
*
* @param context * @param context
*/ */
public static void resume(Context context){ public static void resume(Context context) {
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualDestory){ if (isManualDestory) {
return ; return;
} }
autoBindAccount(context); autoBindAccount(context);
} }
public static boolean isConnected(Context context){ public static boolean isConnected(Context context) {
return CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_CONNECTION_STATE); return CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE);
} }
private static String getVersionName(Context context) { private static String getVersionName(Context context) {
String versionName = null; String versionName = null;
try { try {

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

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.Handler; import android.os.Handler;
@ -28,95 +29,85 @@ import android.os.Message;
import android.util.Log; import android.util.Log;
import com.farsunset.cim.sdk.android.model.SentBody; import com.farsunset.cim.sdk.android.model.SentBody;
/** /**
* 与服务端连接服务 * 与服务端连接服务
*
* @author 3979434 * @author 3979434
* *
*/ */
public class CIMPushService extends Service { public class CIMPushService extends Service {
private final String TAG = CIMPushService.class.getSimpleName(); private final String TAG = CIMPushService.class.getSimpleName();
public final static String KEY_DELAYED_TIME ="KEY_DELAYED_TIME"; public final static String KEY_DELAYED_TIME = "KEY_DELAYED_TIME";
private CIMConnectorManager manager; private CIMConnectorManager manager;
@Override @Override
public void onCreate() public void onCreate() {
{
manager = CIMConnectorManager.getManager(this.getApplicationContext()); manager = CIMConnectorManager.getManager(this.getApplicationContext());
} }
Handler connectionHandler = new Handler() {
Handler connectionHandler = new Handler(){
@Override @Override
public void handleMessage(android.os.Message message){ public void handleMessage(android.os.Message message) {
connectionHandler.removeMessages(0); connectionHandler.removeMessages(0);
String host = message.getData().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST); String host = message.getData().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST);
int port = message.getData().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT,0); int port = message.getData().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT, 0);
manager.connect(host, port); manager.connect(host, port);
} }
}; };
@Override @Override
public int onStartCommand(Intent intent,int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent); intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent);
String action = intent.getAction(); String action = intent.getAction();
if(CIMPushManager.ACTION_CREATE_CIM_CONNECTION.equals(action)) if (CIMPushManager.ACTION_CREATE_CIM_CONNECTION.equals(action)) {
{
long delayMillis = intent.getLongExtra(KEY_DELAYED_TIME,0); long delayMillis = intent.getLongExtra(KEY_DELAYED_TIME, 0);
if( delayMillis > 0){ if (delayMillis > 0) {
Message msg = connectionHandler.obtainMessage(); Message msg = connectionHandler.obtainMessage();
msg.what = 0; msg.what = 0;
msg.setData(intent.getExtras()); msg.setData(intent.getExtras());
connectionHandler.sendMessageDelayed(msg, delayMillis); connectionHandler.sendMessageDelayed(msg, delayMillis);
}else } else {
{
String host = intent.getStringExtra(CIMCacheManager.KEY_CIM_SERVIER_HOST); String host = intent.getStringExtra(CIMCacheManager.KEY_CIM_SERVIER_HOST);
int port = intent.getIntExtra(CIMCacheManager.KEY_CIM_SERVIER_PORT,0); int port = intent.getIntExtra(CIMCacheManager.KEY_CIM_SERVIER_PORT, 0);
manager.connect(host,port); manager.connect(host, port);
} }
} }
if(CIMPushManager.ACTION_SEND_REQUEST_BODY.equals(action)) if (CIMPushManager.ACTION_SEND_REQUEST_BODY.equals(action)) {
{
manager.send((SentBody) intent.getSerializableExtra(CIMPushManager.KEY_SEND_BODY)); manager.send((SentBody) intent.getSerializableExtra(CIMPushManager.KEY_SEND_BODY));
} }
if(CIMPushManager.ACTION_CLOSE_CIM_CONNECTION.equals(action)) if (CIMPushManager.ACTION_CLOSE_CIM_CONNECTION.equals(action)) {
{
manager.closeSession(); manager.closeSession();
} }
if(CIMPushManager.ACTION_DESTORY.equals(action)) if (CIMPushManager.ACTION_DESTORY.equals(action)) {
{
manager.destroy(); manager.destroy();
this.stopSelf(); this.stopSelf();
} }
if(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE.equals(action) ) if (CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE.equals(action)) {
{ if (!manager.isConnected()) {
if(!manager.isConnected()){
boolean isManualStop = CIMCacheManager.getBoolean(getApplicationContext(),CIMCacheManager.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getBoolean(getApplicationContext(),
CIMCacheManager.KEY_MANUAL_STOP);
Log.w(TAG, "manager.isConnected() == false, isManualStop == " + isManualStop); Log.w(TAG, "manager.isConnected() == false, isManualStop == " + isManualStop);
CIMPushManager.connect(this,0); CIMPushManager.connect(this, 0);
}else } else {
{
Log.i(TAG, "manager.isConnected() == true"); Log.i(TAG, "manager.isConnected() == true");
} }
} }
return START_STICKY; return START_STICKY;
} }

43
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/constant/CIMConstant.java
View File

@ -26,30 +26,28 @@ package com.farsunset.cim.sdk.android.constant;
*/ */
public interface CIMConstant { public interface CIMConstant {
long RECONN_INTERVAL_TIME= 30 * 1000; long RECONN_INTERVAL_TIME = 30 * 1000;
//消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度 // 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
int DATA_HEADER_LENGTH = 3; int DATA_HEADER_LENGTH = 3;
public static interface ReturnCode{
String CODE_404 ="404"; public static interface ReturnCode {
String CODE_403 ="403"; String CODE_404 = "404";
String CODE_405 ="405"; String CODE_403 = "403";
String CODE_200 ="200"; String CODE_405 = "405";
String CODE_206 ="206"; String CODE_200 = "200";
String CODE_500 ="500"; String CODE_206 = "206";
String CODE_500 = "500";
} }
public static interface ProtobufType {
public static interface ProtobufType{
byte C_H_RS = 0; byte C_H_RS = 0;
byte S_H_RQ = 1; byte S_H_RQ = 1;
byte MESSAGE = 2; byte MESSAGE = 2;
@ -57,27 +55,24 @@ public interface CIMConstant {
byte REPLYBODY = 4; byte REPLYBODY = 4;
} }
public static interface RequestKey{ public static interface RequestKey {
String CLIENT_BIND = "client_bind";
String CLIENT_BIND ="client_bind"; String CLIENT_LOGOUT = "client_logout";
String CLIENT_LOGOUT ="client_logout";
@Deprecated @Deprecated
String CLIENT_PULL_MESSAGE ="client_pull_message"; String CLIENT_PULL_MESSAGE = "client_pull_message";
} }
public static interface MessageAction {
public static interface MessageAction{ // 被其他设备登录挤下线消息
String ACTION_999 = "999";
//被其他设备登录挤下线消息
String ACTION_999 ="999";
} }
public static interface IntentAction {
public static interface IntentAction{
// 消息广播action // 消息广播action
String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED"; String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED";
@ -103,7 +98,7 @@ public interface CIMConstant {
// 网络变化广播 // 网络变化广播
String ACTION_NETWORK_CHANGED = "android.net.conn.CONNECTIVITY_CHANGE"; String ACTION_NETWORK_CHANGED = "android.net.conn.CONNECTIVITY_CHANGE";
//重试连接 // 重试连接
String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY"; String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY";
} }

2
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/filter/ClientMessageCodecFactory.java
View File

@ -40,7 +40,6 @@ public class ClientMessageCodecFactory implements ProtocolCodecFactory {
*/ */
private final ClientMessageDecoder decoder; private final ClientMessageDecoder decoder;
public ClientMessageCodecFactory() { public ClientMessageCodecFactory() {
encoder = new ClientMessageEncoder(); encoder = new ClientMessageEncoder();
decoder = new ClientMessageDecoder(); decoder = new ClientMessageDecoder();
@ -49,6 +48,7 @@ public class ClientMessageCodecFactory implements ProtocolCodecFactory {
public ProtocolEncoder getEncoder(IoSession session) throws Exception { public ProtocolEncoder getEncoder(IoSession session) throws Exception {
return encoder; return encoder;
} }
public ProtocolDecoder getDecoder(IoSession session) throws Exception { public ProtocolDecoder getDecoder(IoSession session) throws Exception {
return decoder; return decoder;
} }

46
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/filter/ClientMessageDecoder.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.sdk.android.filter; package com.farsunset.cim.sdk.android.filter;
import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder; import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
@ -35,6 +34,7 @@ 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.MessageProto;
import com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto; import com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
/** /**
* 客户端消息解码 * 客户端消息解码
*/ */
@ -42,15 +42,13 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
final static String TAG = ClientMessageDecoder.class.getSimpleName(); final static String TAG = ClientMessageDecoder.class.getSimpleName();
@Override @Override
public boolean doDecode(IoSession iosession, IoBuffer iobuffer, public boolean doDecode(IoSession iosession, IoBuffer iobuffer, ProtocolDecoderOutput out) throws Exception {
ProtocolDecoderOutput out) throws Exception {
/** /**
* 消息头3位 * 消息头3位
*/ */
if(iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH){ if (iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH) {
return false; return false;
} }
@ -58,13 +56,13 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
byte conetnType = iobuffer.get(); byte conetnType = iobuffer.get();
byte lv =iobuffer.get();//int 低位 byte lv = iobuffer.get();// int 低位
byte hv =iobuffer.get();//int 高位 byte hv = iobuffer.get();// int 高位
int conetnLength = getContentLength(lv,hv); int conetnLength = getContentLength(lv, hv);
//如果消息体没有接收完整，则重置读取，等待下一次重新读取 // 如果消息体没有接收完整，则重置读取，等待下一次重新读取
if(conetnLength > iobuffer.remaining()){ if (conetnLength > iobuffer.remaining()) {
iobuffer.reset(); iobuffer.reset();
return false; return false;
} }
@ -72,27 +70,23 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
byte[] dataBytes = new byte[conetnLength]; byte[] dataBytes = new byte[conetnLength];
iobuffer.get(dataBytes, 0, conetnLength); iobuffer.get(dataBytes, 0, conetnLength);
Object message = mappingMessageObject(dataBytes,conetnType); Object message = mappingMessageObject(dataBytes, conetnType);
if(message!=null){ if (message != null) {
out.write(message); out.write(message);
} }
return true; return true;
} }
private Object mappingMessageObject(byte[] bytes,byte type) throws InvalidProtocolBufferException { private Object mappingMessageObject(byte[] bytes, byte type) throws InvalidProtocolBufferException {
if (CIMConstant.ProtobufType.S_H_RQ == type) {
if(CIMConstant.ProtobufType.S_H_RQ == type)
{
HeartbeatRequest request = HeartbeatRequest.getInstance(); HeartbeatRequest request = HeartbeatRequest.getInstance();
Log.i(TAG,request.toString()); Log.i(TAG, request.toString());
return request; return request;
} }
if(CIMConstant.ProtobufType.REPLYBODY == type) if (CIMConstant.ProtobufType.REPLYBODY == type) {
{
ReplyBodyProto.Model bodyProto = ReplyBodyProto.Model.parseFrom(bytes); ReplyBodyProto.Model bodyProto = ReplyBodyProto.Model.parseFrom(bytes);
ReplyBody body = new ReplyBody(); ReplyBody body = new ReplyBody();
body.setKey(bodyProto.getKey()); body.setKey(bodyProto.getKey());
@ -101,13 +95,12 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
body.setCode(bodyProto.getCode()); body.setCode(bodyProto.getCode());
body.setMessage(bodyProto.getMessage()); body.setMessage(bodyProto.getMessage());
Log.i(TAG,body.toString()); Log.i(TAG, body.toString());
return body; return body;
} }
if(CIMConstant.ProtobufType.MESSAGE == type) if (CIMConstant.ProtobufType.MESSAGE == type) {
{
MessageProto.Model bodyProto = MessageProto.Model.parseFrom(bytes); MessageProto.Model bodyProto = MessageProto.Model.parseFrom(bytes);
Message message = new Message(); Message message = new Message();
message.setMid(bodyProto.getMid()); message.setMid(bodyProto.getMid());
@ -120,7 +113,7 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
message.setTimestamp(bodyProto.getTimestamp()); message.setTimestamp(bodyProto.getTimestamp());
message.setFormat(bodyProto.getFormat()); message.setFormat(bodyProto.getFormat());
Log.i(TAG,message.toString()); Log.i(TAG, message.toString());
return message; return message;
} }
@ -130,14 +123,15 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
/** /**
* 解析消息体长度 * 解析消息体长度
*
* @param type * @param type
* @param length * @param length
* @return * @return
*/ */
private int getContentLength(byte lv,byte hv){ private int getContentLength(byte lv, byte hv) {
int l = (lv & 0xff); int l = (lv & 0xff);
int h = (hv & 0xff); int h = (hv & 0xff);
return (l| (h <<= 8)); return (l | (h <<= 8));
} }
} }

13
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/filter/ClientMessageEncoder.java
View File

@ -29,40 +29,43 @@ import android.util.Log;
import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.constant.CIMConstant;
import com.farsunset.cim.sdk.android.model.Protobufable; import com.farsunset.cim.sdk.android.model.Protobufable;
/** /**
* 客户端消息发送前进行编码 * 客户端消息发送前进行编码
*/ */
public class ClientMessageEncoder extends ProtocolEncoderAdapter { public class ClientMessageEncoder extends ProtocolEncoderAdapter {
final static String TAG = ClientMessageEncoder.class.getSimpleName(); final static String TAG = ClientMessageEncoder.class.getSimpleName();
@Override @Override
public void encode(IoSession iosession, Object object, ProtocolEncoderOutput out) throws Exception { public void encode(IoSession iosession, Object object, ProtocolEncoderOutput out) throws Exception {
if(object instanceof Protobufable){ if (object instanceof Protobufable) {
Protobufable data = (Protobufable) object; Protobufable data = (Protobufable) object;
byte[] byteArray = data.getByteArray(); byte[] byteArray = data.getByteArray();
IoBuffer buff = IoBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH).setAutoExpand(true); IoBuffer buff = IoBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH).setAutoExpand(true);
buff.put(createHeader(data.getType(),byteArray.length)); buff.put(createHeader(data.getType(), byteArray.length));
buff.put(byteArray); buff.put(byteArray);
buff.flip(); buff.flip();
out.write(buff); out.write(buff);
//打印出收到的消息 // 打印出收到的消息
Log.i(TAG,data.toString()); Log.i(TAG, data.toString());
} }
} }
/** /**
* 消息体最大为65535 * 消息体最大为65535
*
* @param type * @param type
* @param length * @param length
* @return * @return
*/ */
private byte[] createHeader(byte type,int length){ private byte[] createHeader(byte type, int length) {
byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH]; byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH];
header[0] = type; header[0] = type;
header[1] = (byte) (length & 0xff); header[1] = (byte) (length & 0xff);

8
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatRequest.java
View File

@ -24,11 +24,12 @@ package com.farsunset.cim.sdk.android.model;
import java.io.Serializable; import java.io.Serializable;
import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.constant.CIMConstant;
/** /**
* 服务端心跳请求 * 服务端心跳请求
* *
*/ */
public class HeartbeatRequest implements Serializable,Protobufable { public class HeartbeatRequest implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String TAG = "SERVER_HEARTBEAT_REQUEST"; private static final String TAG = "SERVER_HEARTBEAT_REQUEST";
@ -36,7 +37,7 @@ public class HeartbeatRequest implements Serializable,Protobufable {
private static HeartbeatRequest object = new HeartbeatRequest(); private static HeartbeatRequest object = new HeartbeatRequest();
private HeartbeatRequest(){ private HeartbeatRequest() {
} }
@ -49,11 +50,10 @@ public class HeartbeatRequest implements Serializable,Protobufable {
return CMD_HEARTBEAT_REQUEST.getBytes(); return CMD_HEARTBEAT_REQUEST.getBytes();
} }
public String toString(){ public String toString() {
return TAG; return TAG;
} }
@Override @Override
public byte getType() { public byte getType() {
return CIMConstant.ProtobufType.S_H_RQ; return CIMConstant.ProtobufType.S_H_RQ;

8
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatResponse.java
View File

@ -24,10 +24,11 @@ package com.farsunset.cim.sdk.android.model;
import java.io.Serializable; import java.io.Serializable;
import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.constant.CIMConstant;
/** /**
* 客户端心跳响应 * 客户端心跳响应
*/ */
public class HeartbeatResponse implements Serializable,Protobufable { public class HeartbeatResponse implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String TAG = "CLIENT_HEARTBEAT_RESPONSE"; private static final String TAG = "CLIENT_HEARTBEAT_RESPONSE";
@ -35,19 +36,20 @@ public class HeartbeatResponse implements Serializable,Protobufable {
private static HeartbeatResponse object = new HeartbeatResponse(); private static HeartbeatResponse object = new HeartbeatResponse();
private HeartbeatResponse(){ private HeartbeatResponse() {
} }
public static HeartbeatResponse getInstance() { public static HeartbeatResponse getInstance() {
return object; return object;
} }
@Override @Override
public byte[] getByteArray() { public byte[] getByteArray() {
return CMD_HEARTBEAT_RESPONSE.getBytes(); return CMD_HEARTBEAT_RESPONSE.getBytes();
} }
public String toString(){ public String toString() {
return TAG; return TAG;
} }

22
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Message.java
View File

@ -30,13 +30,11 @@ public class Message implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 消息类型，用户自定义消息类别 * 消息类型，用户自定义消息类别
*/ */
private String mid; private String mid;
/** /**
* 消息类型，用户自定义消息类别 * 消息类型，用户自定义消息类别
*/ */
@ -59,8 +57,6 @@ public class Message implements Serializable {
*/ */
private String receiver; private String receiver;
/** /**
* content 内容格式 * content 内容格式
*/ */
@ -73,11 +69,10 @@ public class Message implements Serializable {
private long timestamp; private long timestamp;
public Message() {
public Message()
{
timestamp = System.currentTimeMillis(); timestamp = System.currentTimeMillis();
} }
public long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }
@ -86,14 +81,14 @@ public class Message implements Serializable {
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getAction() { public String getAction() {
return action; return action;
} }
public void setAction(String action) { public void setAction(String action) {
this.action = action; this.action = action;
} }
public String getTitle() { public String getTitle() {
return title; return title;
} }
@ -126,7 +121,6 @@ public class Message implements Serializable {
this.receiver = receiver; this.receiver = receiver;
} }
public String getFormat() { public String getFormat() {
return format; return format;
} }
@ -135,14 +129,14 @@ public class Message implements Serializable {
this.format = format; this.format = format;
} }
public String getExtra() { public String getExtra() {
return extra; return extra;
} }
public void setExtra(String extra) { public void setExtra(String extra) {
this.extra = extra; this.extra = extra;
} }
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
@ -159,7 +153,6 @@ public class Message implements Serializable {
return buffer.toString(); return buffer.toString();
} }
public String getMid() { public String getMid() {
return mid; return mid;
} }
@ -169,8 +162,7 @@ public class Message implements Serializable {
} }
public boolean isNotEmpty(String txt) { public boolean isNotEmpty(String txt) {
return txt != null && txt.trim().length()!=0; return txt != null && txt.trim().length() != 0;
} }
} }

1
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Protobufable.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android.model; package com.farsunset.cim.sdk.android.model;
/** /**
* 需要向另一端发送的结构体 * 需要向另一端发送的结构体
*/ */

15
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/ReplyBody.java
View File

@ -39,7 +39,6 @@ public class ReplyBody implements Serializable {
*/ */
private String key; private String key;
/** /**
* 返回码 * 返回码
*/ */
@ -50,16 +49,13 @@ public class ReplyBody implements Serializable {
*/ */
private String message; private String message;
private long timestamp; private long timestamp;
/** /**
* 返回数据集合 * 返回数据集合
*/ */
private Hashtable<String, String> data = new Hashtable<String, String>(); private Hashtable<String, String> data = new Hashtable<String, String>();
public long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }
@ -68,8 +64,6 @@ public class ReplyBody implements Serializable {
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getKey() { public String getKey() {
return key; return key;
} }
@ -114,19 +108,16 @@ public class ReplyBody implements Serializable {
this.code = code; this.code = code;
} }
public String toString() {
public String toString()
{
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#ReplyBody#").append("\n"); buffer.append("#ReplyBody#").append("\n");
buffer.append("key:").append(this.getKey()).append("\n"); buffer.append("key:").append(this.getKey()).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n"); buffer.append("timestamp:").append(timestamp).append("\n");
buffer.append("code:").append(code).append("\n"); buffer.append("code:").append(code).append("\n");
if(!data.isEmpty()){ if (!data.isEmpty()) {
buffer.append("data{").append("\n"); buffer.append("data{").append("\n");
for(String key:getKeySet()) for (String key : getKeySet()) {
{
buffer.append(key).append(":").append(this.get(key)).append("\n"); buffer.append(key).append(":").append(this.get(key)).append("\n");
} }
buffer.append("}"); buffer.append("}");

16
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/SentBody.java
View File

@ -32,7 +32,7 @@ import com.farsunset.cim.sdk.android.model.proto.SentBodyProto;
* java |android 客户端请求结构 * java |android 客户端请求结构
* *
*/ */
public class SentBody implements Serializable,Protobufable { public class SentBody implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -67,18 +67,16 @@ public class SentBody implements Serializable,Protobufable {
} }
public void put(String k, String v) { public void put(String k, String v) {
if(k == null || v == null){ if (k == null || v == null) {
return; return;
} }
data.put(k, v); data.put(k, v);
} }
public Set<String> getKeySet() { public Set<String> getKeySet() {
return data.keySet(); return data.keySet();
} }
public void remove(String k) { public void remove(String k) {
data.remove(k); data.remove(k);
} }
@ -86,13 +84,13 @@ public class SentBody implements Serializable,Protobufable {
@Override @Override
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#SentBody#").append("\n");; buffer.append("#SentBody#").append("\n");
;
buffer.append("key:").append(key).append("\n"); buffer.append("key:").append(key).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n"); buffer.append("timestamp:").append(timestamp).append("\n");
if(!data.isEmpty()){ if (!data.isEmpty()) {
buffer.append("data{").append("\n"); buffer.append("data{").append("\n");
for(String key:getKeySet()) for (String key : getKeySet()) {
{
buffer.append(key).append(":").append(this.get(key)).append("\n"); buffer.append(key).append(":").append(this.get(key)).append("\n");
} }
buffer.append("}"); buffer.append("}");
@ -105,7 +103,7 @@ public class SentBody implements Serializable,Protobufable {
SentBodyProto.Model.Builder builder = SentBodyProto.Model.newBuilder(); SentBodyProto.Model.Builder builder = SentBodyProto.Model.newBuilder();
builder.setKey(key); builder.setKey(key);
builder.setTimestamp(timestamp); builder.setTimestamp(timestamp);
if(!data.isEmpty()){ if (!data.isEmpty()) {
builder.putAllData(data); builder.putAllData(data);
} }
return builder.build().toByteArray(); return builder.build().toByteArray();

617
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java
View File

File diff suppressed because it is too large Load Diff

672
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java
View File

File diff suppressed because it is too large Load Diff

586
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java
View File

File diff suppressed because it is too large Load Diff

47
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMCacheToolkit.java → cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMCacheManager.java
View File

@ -23,9 +23,9 @@ package com.farsunset.cim.sdk.client;
import java.util.HashMap; import java.util.HashMap;
class CIMCacheToolkit { class CIMCacheManager {
private static HashMap<String,String> CIM_CONFIG_INFO = new HashMap<String,String>(); private static HashMap<String, String> CIM_CONFIG_INFO = new HashMap<String, String>();
public static final String KEY_MANUAL_STOP = "KEY_MANUAL_STOP"; public static final String KEY_MANUAL_STOP = "KEY_MANUAL_STOP";
@ -37,55 +37,44 @@ class CIMCacheToolkit {
public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE"; public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE";
static CIMCacheToolkit toolkit; static CIMCacheManager toolkit;
public static CIMCacheToolkit getInstance(){
if (toolkit==null){ public static CIMCacheManager getInstance() {
toolkit = new CIMCacheToolkit(); if (toolkit == null) {
toolkit = new CIMCacheManager();
} }
return toolkit; return toolkit;
} }
public void remove(String key) {
public void remove(String key)
{
CIM_CONFIG_INFO.remove(key); CIM_CONFIG_INFO.remove(key);
} }
public void putString(String key, String value) {
public void putString(String key,String value) CIM_CONFIG_INFO.put(key, value);
{
CIM_CONFIG_INFO.put(key,value);
} }
public String getString(String key) public String getString(String key) {
{
return CIM_CONFIG_INFO.get(key); return CIM_CONFIG_INFO.get(key);
} }
public void putBoolean(String key,boolean value) public void putBoolean(String key, boolean value) {
{ putString(key, Boolean.toString(value));
putString(key,Boolean.toString(value));
} }
public boolean getBoolean(String key) public boolean getBoolean(String key) {
{
String value = getString(key); String value = getString(key);
return value == null?false:Boolean.parseBoolean(value); return value == null ? false : Boolean.parseBoolean(value);
} }
public void putInt(String key, int value) {
public void putInt(String key,int value)
{
putString(key, String.valueOf(value)); putString(key, String.valueOf(value));
} }
public int getInt(String key) public int getInt(String key) {
{
String value = getString(key); String value = getString(key);
return value == null?0:Integer.parseInt(value); return value == null ? 0 : Integer.parseInt(value);
} }
} }

97
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMConnectorManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.client; package com.farsunset.cim.sdk.client;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
@ -47,7 +48,6 @@ import com.farsunset.cim.sdk.client.model.Message;
import com.farsunset.cim.sdk.client.model.ReplyBody; import com.farsunset.cim.sdk.client.model.ReplyBody;
import com.farsunset.cim.sdk.client.model.SentBody; import com.farsunset.cim.sdk.client.model.SentBody;
/** /**
* 连接服务端管理，cim核心处理类，管理连接，以及消息处理 * 连接服务端管理，cim核心处理类，管理连接，以及消息处理
* *
@ -56,13 +56,13 @@ import com.farsunset.cim.sdk.client.model.SentBody;
class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageFactory { class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageFactory {
protected final Logger logger = Logger.getLogger(CIMConnectorManager.class); protected final Logger logger = Logger.getLogger(CIMConnectorManager.class);
private final int READ_BUFFER_SIZE = 2048;//bit private final int READ_BUFFER_SIZE = 2048;// bit
private final int CONNECT_TIMEOUT = 10 * 1000;//秒 private final int CONNECT_TIMEOUT = 10 * 1000;// 秒
private final int WRITE_TIMEOUT = 10 * 1000;//秒 private final int WRITE_TIMEOUT = 10 * 1000;// 秒
private final int READ_IDLE_TIME = 120;//秒 private final int READ_IDLE_TIME = 120;// 秒
private final int HEARBEAT_TIME_OUT = (READ_IDLE_TIME + 20) * 1000;// 收到服务端心跳请求超时时间 毫秒 private final int HEARBEAT_TIME_OUT = (READ_IDLE_TIME + 20) * 1000;// 收到服务端心跳请求超时时间 毫秒
private final String KEY_LAST_HEART_TIME = "KEY_LAST_HEART_TIME" ; private final String KEY_LAST_HEART_TIME = "KEY_LAST_HEART_TIME";
private NioSocketConnector connector; private NioSocketConnector connector;
private ConnectFuture connectFuture; private ConnectFuture connectFuture;
@ -70,8 +70,6 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
private static CIMConnectorManager manager; private static CIMConnectorManager manager;
private CIMConnectorManager() { private CIMConnectorManager() {
connector = new NioSocketConnector(); connector = new NioSocketConnector();
connector.setConnectTimeoutMillis(CONNECT_TIMEOUT); connector.setConnectTimeoutMillis(CONNECT_TIMEOUT);
@ -99,24 +97,24 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
} }
private synchronized void syncConnection(final String host,final int port) { private synchronized void syncConnection(final String host, final int port) {
if(isConnected()){ if (isConnected()) {
return ; return;
} }
try { try {
logger.info("****************CIM正在连接服务器 "+host+":"+port+"......"); logger.info("****************CIM正在连接服务器 " + host + ":" + port + "......");
CIMCacheToolkit.getInstance().putBoolean(CIMCacheToolkit.KEY_CIM_CONNECTION_STATE, false); CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
InetSocketAddress remoteSocketAddress = new InetSocketAddress(host, port); InetSocketAddress remoteSocketAddress = new InetSocketAddress(host, port);
connectFuture = connector.connect(remoteSocketAddress); connectFuture = connector.connect(remoteSocketAddress);
connectFuture.awaitUninterruptibly(); connectFuture.awaitUninterruptibly();
connectFuture.getSession(); connectFuture.getSession();
} catch (Exception e) { } catch (Exception e) {
long interval = CIMConstant.RECONN_INTERVAL_TIME - (5*1000 - new Random().nextInt(15*1000)); long interval = CIMConstant.RECONN_INTERVAL_TIME - (5 * 1000 - new Random().nextInt(15 * 1000));
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED); intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED);
@ -124,7 +122,8 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
intent.putExtra("interval", interval); intent.putExtra("interval", interval);
sendBroadcast(intent); sendBroadcast(intent);
logger.error("****************CIM连接服务器失败 "+host+":"+port+"......将在"+interval/1000+"秒后重新尝试连接"); logger.error(
"****************CIM连接服务器失败 " + host + ":" + port + "......将在" + interval / 1000 + "秒后重新尝试连接");
} }
@ -133,8 +132,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
public void connect(final String host, final int port) { public void connect(final String host, final int port) {
executor.execute(new Runnable() { executor.execute(new Runnable() {
public void run() public void run() {
{
syncConnection(host, port); syncConnection(host, port);
} }
}); });
@ -148,8 +146,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
Throwable exception = new SessionDisconnectedException(); Throwable exception = new SessionDisconnectedException();
IoSession session = getCurrentSession(); IoSession session = getCurrentSession();
if(session!=null && session.isConnected()) if (session != null && session.isConnected()) {
{
WriteFuture wf = session.write(body); WriteFuture wf = session.write(body);
// 消息发送超时 5秒 // 消息发送超时 5秒
wf.awaitUninterruptibly(WRITE_TIMEOUT); wf.awaitUninterruptibly(WRITE_TIMEOUT);
@ -157,10 +154,10 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
exception = wf.getException(); exception = wf.getException();
} }
if(!isSuccessed){ if (!isSuccessed) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_SENT_FAILED); intent.setAction(CIMConstant.IntentAction.ACTION_SENT_FAILED);
intent.putExtra(Exception.class.getName(),exception); intent.putExtra(Exception.class.getName(), exception);
intent.putExtra(SentBody.class.getName(), body); intent.putExtra(SentBody.class.getName(), body);
sendBroadcast(intent); sendBroadcast(intent);
} }
@ -182,39 +179,31 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
public boolean isConnected() { public boolean isConnected() {
IoSession session = getCurrentSession(); IoSession session = getCurrentSession();
return session != null ; return session != null;
} }
public void closeSession() {
public void closeSession()
{
IoSession session = getCurrentSession(); IoSession session = getCurrentSession();
if(session!=null) if (session != null) {
{
session.closeNow(); session.closeNow();
} }
} }
public IoSession getCurrentSession() public IoSession getCurrentSession() {
{ Map<Long, IoSession> sessions = connector.getManagedSessions();
Map<Long,IoSession> sessions = connector.getManagedSessions(); for (Long key : sessions.keySet()) {
for(Long key:sessions.keySet())
{
IoSession session = sessions.get(key); IoSession session = sessions.get(key);
if(session.isConnected()){ if (session.isConnected()) {
return session; return session;
} }
} }
return null; return null;
} }
@Override @Override
public void sessionCreated(IoSession session) throws Exception { public void sessionCreated(IoSession session) throws Exception {
logger.info("****************CIM连接服务器成功:" + session.getLocalAddress() + " NID:" + session.getId());
logger.info("****************CIM连接服务器成功:"+session.getLocalAddress()+" NID:"+session.getId());
setLastHeartbeatTime(session); setLastHeartbeatTime(session);
@ -227,7 +216,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
@Override @Override
public void sessionClosed(IoSession session) { public void sessionClosed(IoSession session) {
logger.error("****************CIM与服务器断开连接:"+session.getLocalAddress()+" NID:"+session.getId()); logger.error("****************CIM与服务器断开连接:" + session.getLocalAddress() + " NID:" + session.getId());
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED); intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED);
@ -237,27 +226,26 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
@Override @Override
public void sessionIdle(IoSession session, IdleStatus status) { public void sessionIdle(IoSession session, IdleStatus status) {
logger.debug("****************CIM "+status.toString().toUpperCase()+":"+session.getLocalAddress() +" NID:"+session.getId()+ " isConnected:" + session.isConnected()); logger.debug("****************CIM " + status.toString().toUpperCase() + ":" + session.getLocalAddress()
+ " NID:" + session.getId() + " isConnected:" + session.isConnected());
/** /**
* 用于解决，wifi情况下。偶而路由器与服务器断开连接时，客户端并没及时收到关闭事件 * 用于解决，wifi情况下。偶而路由器与服务器断开连接时，客户端并没及时收到关闭事件 导致这样的情况下当前连接无效也不会重连的问题
* 导致这样的情况下当前连接无效也不会重连的问题
* *
*/ */
long lastHeartbeatTime = getLastHeartbeatTime(session); long lastHeartbeatTime = getLastHeartbeatTime(session);
if(System.currentTimeMillis() - lastHeartbeatTime >= HEARBEAT_TIME_OUT) if (System.currentTimeMillis() - lastHeartbeatTime >= HEARBEAT_TIME_OUT) {
{
session.closeNow(); session.closeNow();
logger.error("****************CIM心跳超时 ,即将重新连接......"+" NID:"+session.getId()); logger.error("****************CIM心跳超时 ,即将重新连接......" + " NID:" + session.getId());
} }
} }
@Override @Override
public void exceptionCaught(IoSession session, Throwable cause) { public void exceptionCaught(IoSession session, Throwable cause) {
logger.error("****************CIM连接出现未知异常:"+session.getLocalAddress()+" NID:"+session.getId()); logger.error("****************CIM连接出现未知异常:" + session.getLocalAddress() + " NID:" + session.getId());
if(cause!=null && cause.getMessage()!=null){ if (cause != null && cause.getMessage() != null) {
logger.error(cause.getMessage()); logger.error(cause.getMessage());
} }
@ -268,7 +256,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
} }
@Override @Override
public void messageReceived(IoSession session, Object obj){ public void messageReceived(IoSession session, Object obj) {
if (obj instanceof Message) { if (obj instanceof Message) {
@ -289,8 +277,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
@Override @Override
public void messageSent(IoSession session, Object message) { public void messageSent(IoSession session, Object message) {
if(message instanceof SentBody) if (message instanceof SentBody) {
{
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED); intent.setAction(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED);
intent.putExtra(SentBody.class.getName(), (SentBody) message); intent.putExtra(SentBody.class.getName(), (SentBody) message);
@ -298,23 +285,19 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
} }
} }
private void setLastHeartbeatTime(IoSession session) {
private void setLastHeartbeatTime(IoSession session)
{
session.setAttribute(KEY_LAST_HEART_TIME, System.currentTimeMillis()); session.setAttribute(KEY_LAST_HEART_TIME, System.currentTimeMillis());
} }
private long getLastHeartbeatTime(IoSession session) private long getLastHeartbeatTime(IoSession session) {
{
long time = 0; long time = 0;
Object value = session.getAttribute(KEY_LAST_HEART_TIME); Object value = session.getAttribute(KEY_LAST_HEART_TIME);
if(value !=null){ if (value != null) {
time = Long.parseLong(value.toString()); time = Long.parseLong(value.toString());
} }
return time; return time;
} }
@Override @Override
public Object getRequest(IoSession arg0) { public Object getRequest(IoSession arg0) {
return null; return null;
@ -339,7 +322,7 @@ class CIMConnectorManager extends IoHandlerAdapter implements KeepAliveMessageF
} }
private void sendBroadcast(final Intent intent) { private void sendBroadcast(final Intent intent) {
executor.execute(new Runnable(){ executor.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
CIMEventBroadcastReceiver.getInstance().onReceive(intent); CIMEventBroadcastReceiver.getInstance().onReceive(intent);

109
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMEventBroadcastReceiver.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.sdk.client; package com.farsunset.cim.sdk.client;
import java.util.Random; import java.util.Random;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
@ -41,160 +40,144 @@ public class CIMEventBroadcastReceiver {
private static CIMEventBroadcastReceiver recerver; private static CIMEventBroadcastReceiver recerver;
private CIMEventListener listener; private CIMEventListener listener;
private Timer connectionHandler = new Timer();; private Timer connectionHandler = new Timer();;
public static CIMEventBroadcastReceiver getInstance(){
if (recerver==null){ public static CIMEventBroadcastReceiver getInstance() {
if (recerver == null) {
recerver = new CIMEventBroadcastReceiver(); recerver = new CIMEventBroadcastReceiver();
} }
return recerver; return recerver;
} }
public void setGlobalCIMEventListener(CIMEventListener ls){ public void setGlobalCIMEventListener(CIMEventListener ls) {
listener = ls; listener = ls;
} }
public void onReceive(Intent intent) { public void onReceive(Intent intent) {
/* /*
* cim断开服务器事件 * cim断开服务器事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED)) {
{
onInnerConnectionClosed(); onInnerConnectionClosed();
} }
/* /*
* cim连接服务器失败事件 * cim连接服务器失败事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED)) {
{
long interval = intent.getLongExtra("interval", CIMConstant.RECONN_INTERVAL_TIME); long interval = intent.getLongExtra("interval", CIMConstant.RECONN_INTERVAL_TIME);
onInnerConnectionFailed((Exception) intent.getExtra(Exception.class.getName()),interval); onInnerConnectionFailed((Exception) intent.getExtra(Exception.class.getName()), interval);
} }
/* /*
* cim连接服务器成功事件 * cim连接服务器成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED)) {
{
onInnerConnectionSuccessed(); onInnerConnectionSuccessed();
} }
/* /*
* 收到推送消息事件 * 收到推送消息事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED)) {
{ onInnerMessageReceived((Message) intent.getExtra(Message.class.getName()));
onInnerMessageReceived((Message)intent.getExtra(Message.class.getName()));
} }
/* /*
* 获取收到replybody成功事件 * 获取收到replybody成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED)) {
{ listener.onReplyReceived((ReplyBody) intent.getExtra(ReplyBody.class.getName()));
listener.onReplyReceived((ReplyBody)intent.getExtra(ReplyBody.class.getName()));
} }
/* /*
* 获取sendbody发送失败事件 * 获取sendbody发送失败事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_FAILED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_FAILED)) {
{ onSentFailed((Exception) intent.getExtra(Exception.class.getName()),
onSentFailed((Exception) intent.getExtra(Exception.class.getName()),(SentBody)intent.getExtra(SentBody.class.getName())); (SentBody) intent.getExtra(SentBody.class.getName()));
} }
/* /*
* 获取sendbody发送成功事件 * 获取sendbody发送成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED)) {
{ onSentSucceed((SentBody) intent.getExtra(SentBody.class.getName()));
onSentSucceed((SentBody)intent.getExtra(SentBody.class.getName()));
} }
/* /*
* 获取cim数据传输异常事件 * 获取cim数据传输异常事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_UNCAUGHT_EXCEPTION)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_UNCAUGHT_EXCEPTION)) {
{ onUncaughtException((Exception) intent.getExtra(Exception.class.getName()));
onUncaughtException((Exception)intent.getExtra(Exception.class.getName()));
} }
/* /*
* 重新连接，如果断开的话 * 重新连接，如果断开的话
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_RECOVERY)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_RECOVERY)) {
{
CIMPushManager.connect(); CIMPushManager.connect();
} }
} }
private void onInnerConnectionClosed() {
private void onInnerConnectionClosed(){
listener.onConnectionClosed(); listener.onConnectionClosed();
CIMCacheToolkit.getInstance().putBoolean(CIMCacheToolkit.KEY_CIM_CONNECTION_STATE, false); CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
CIMPushManager.connect(); CIMPushManager.connect();
} }
private void onInnerConnectionFailed(Exception e, long interval) {
connectionHandler.schedule(new ConnectionTask(), interval);
private void onInnerConnectionFailed(Exception e,long interval){
connectionHandler.schedule(new ConnectionTask(),interval);
listener.onConnectionFailed(e); listener.onConnectionFailed(e);
} }
private void onInnerConnectionSuccessed(){ private void onInnerConnectionSuccessed() {
CIMCacheToolkit.getInstance().putBoolean(CIMCacheToolkit.KEY_CIM_CONNECTION_STATE, true); CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_CONNECTION_STATE, true);
boolean autoBind = CIMPushManager.autoBindDeviceId(); boolean autoBind = CIMPushManager.autoBindDeviceId();
listener.onConnectionSuccessed(autoBind); listener.onConnectionSuccessed(autoBind);
} }
private void onUncaughtException(Throwable arg0) {} private void onUncaughtException(Throwable arg0) {
}
private void onInnerMessageReceived(com.farsunset.cim.sdk.client.model.Message message) {
if (isForceOfflineMessage(message.getAction())) {
CIMPushManager.stop();
}
private void onInnerMessageReceived(com.farsunset.cim.sdk.client.model.Message message)
{
listener.onMessageReceived(message); listener.onMessageReceived(message);
} }
private void onSentFailed(Exception e, SentBody body){ private boolean isForceOfflineMessage(String action) {
return CIMConstant.MessageAction.ACTION_999.equals(action);
}
private void onSentFailed(Exception e, SentBody body) {
e.printStackTrace(); e.printStackTrace();
//与服务端端开链接，重新连接 // 与服务端端开链接，重新连接
if(e instanceof SessionDisconnectedException) if (e instanceof SessionDisconnectedException) {
{
CIMPushManager.connect(); CIMPushManager.connect();
}else } else {
{ // 发送失败 重新发送
//发送失败 重新发送 CIMPushManager.sendRequest(body);
//CIMPushManager.sendRequest( body);
} }
} }
private void onSentSucceed(SentBody body){} private void onSentSucceed(SentBody body) {
}
class ConnectionTask extends TimerTask {
public void run() {
class ConnectionTask extends TimerTask{
public void run(){
CIMPushManager.connect(); CIMPushManager.connect();
} }
} }

15
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMEventListener.java
View File

@ -21,33 +21,33 @@
*/ */
package com.farsunset.cim.sdk.client; package com.farsunset.cim.sdk.client;
import com.farsunset.cim.sdk.client.model.Message; import com.farsunset.cim.sdk.client.model.Message;
import com.farsunset.cim.sdk.client.model.ReplyBody; import com.farsunset.cim.sdk.client.model.ReplyBody;
/** /**
*CIM 主要事件接口 * CIM 主要事件接口
*/ */
public interface CIMEventListener public interface CIMEventListener {
{
/** /**
* 当收到服务端推送过来的消息时调用 * 当收到服务端推送过来的消息时调用
*
* @param message * @param message
*/ */
void onMessageReceived(Message message); void onMessageReceived(Message message);
/** /**
* 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用 * 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用
*
* @param replybody * @param replybody
*/ */
void onReplyReceived(ReplyBody replybody); void onReplyReceived(ReplyBody replybody);
/** /**
* 当连接服务器成功时回调 * 当连接服务器成功时回调
* @param hasAutoBind : true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount *
* @param hasAutoBind
* : true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount
*/ */
void onConnectionSuccessed(boolean hasAutoBind); void onConnectionSuccessed(boolean hasAutoBind);
@ -67,4 +67,3 @@ public interface CIMEventListener
*/ */
int getEventDispatchOrder(); int getEventDispatchOrder();
} }

15
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMListenerManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.client; package com.farsunset.cim.sdk.client;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -29,7 +30,6 @@ import org.apache.log4j.Logger;
import com.farsunset.cim.sdk.client.model.Message; import com.farsunset.cim.sdk.client.model.Message;
import com.farsunset.cim.sdk.client.model.ReplyBody; import com.farsunset.cim.sdk.client.model.ReplyBody;
/** /**
* CIM 消息监听器管理 * CIM 消息监听器管理
*/ */
@ -39,16 +39,14 @@ public class CIMListenerManager {
private static CIMMessageReceiveComparator comparator = new CIMMessageReceiveComparator(); private static CIMMessageReceiveComparator comparator = new CIMMessageReceiveComparator();
protected static final Logger logger = Logger.getLogger(CIMListenerManager.class); protected static final Logger logger = Logger.getLogger(CIMListenerManager.class);
public static void registerMessageListener(CIMEventListener listener) { public static void registerMessageListener(CIMEventListener listener) {
if (!cimListeners.contains(listener)) { if (!cimListeners.contains(listener)) {
cimListeners.add(listener); cimListeners.add(listener);
Collections.sort(cimListeners,comparator); Collections.sort(cimListeners, comparator);
} }
} }
public static void removeMessageListener(CIMEventListener listener) { public static void removeMessageListener(CIMEventListener listener) {
for (int i = 0; i < cimListeners.size(); i++) { for (int i = 0; i < cimListeners.size(); i++) {
if (listener.getClass() == cimListeners.get(i).getClass()) { if (listener.getClass() == cimListeners.get(i).getClass()) {
@ -62,6 +60,7 @@ public class CIMListenerManager {
listener.onConnectionSuccessed(antoBind); listener.onConnectionSuccessed(antoBind);
} }
} }
public static void notifyOnMessageReceived(Message message) { public static void notifyOnMessageReceived(Message message) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onMessageReceived(message); listener.onMessageReceived(message);
@ -74,7 +73,6 @@ public class CIMListenerManager {
} }
} }
public static void notifyOnReplyReceived(ReplyBody body) { public static void notifyOnReplyReceived(ReplyBody body) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onReplyReceived(body); listener.onReplyReceived(body);
@ -93,24 +91,23 @@ public class CIMListenerManager {
public static void logListenersName() { public static void logListenersName() {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
logger.debug("#######" + listener.getClass().getName() + "#######" ); logger.debug("#######" + listener.getClass().getName() + "#######");
} }
} }
/** /**
* 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序 * 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序
*/ */
private static class CIMMessageReceiveComparator implements Comparator<CIMEventListener>{ private static class CIMMessageReceiveComparator implements Comparator<CIMEventListener> {
@Override @Override
public int compare(CIMEventListener arg1, CIMEventListener arg2) { public int compare(CIMEventListener arg1, CIMEventListener arg2) {
int order1 = arg1.getEventDispatchOrder(); int order1 = arg1.getEventDispatchOrder();
int order2 = arg2.getEventDispatchOrder(); int order2 = arg2.getEventDispatchOrder();
return order2 - order1 ; return order2 - order1;
} }
} }
} }

189
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMPushManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.client; package com.farsunset.cim.sdk.client;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.util.Properties; import java.util.Properties;
@ -35,43 +36,44 @@ import com.farsunset.cim.sdk.client.model.SentBody;
*/ */
public class CIMPushManager { public class CIMPushManager {
protected static final Logger logger = Logger.getLogger(CIMPushManager.class); protected static final Logger logger = Logger.getLogger(CIMPushManager.class);
static String ACTION_ACTIVATE_PUSH_SERVICE ="ACTION_ACTIVATE_PUSH_SERVICE"; static String ACTION_ACTIVATE_PUSH_SERVICE = "ACTION_ACTIVATE_PUSH_SERVICE";
static String ACTION_CREATE_CIM_CONNECTION ="ACTION_CREATE_CIM_CONNECTION"; static String ACTION_CREATE_CIM_CONNECTION = "ACTION_CREATE_CIM_CONNECTION";
static String ACTION_SEND_REQUEST_BODY ="ACTION_SEND_REQUEST_BODY"; static String ACTION_SEND_REQUEST_BODY = "ACTION_SEND_REQUEST_BODY";
static String ACTION_CLOSE_CIM_CONNECTION ="ACTION_CLOSE_CIM_CONNECTION"; static String ACTION_CLOSE_CIM_CONNECTION = "ACTION_CLOSE_CIM_CONNECTION";
static String ACTION_DESTORY ="ACTION_DESTORY"; static String ACTION_DESTORY = "ACTION_DESTORY";
static String KEY_CIM_CONNECTION_STATUS = "KEY_CIM_CONNECTION_STATUS";
static String KEY_CIM_CONNECTION_STATUS ="KEY_CIM_CONNECTION_STATUS"; // 被销毁的destroy()
//被销毁的destroy()
public static final int STATE_DESTROYED = 0x0000DE; public static final int STATE_DESTROYED = 0x0000DE;
//被销停止的 stop() // 被销停止的 stop()
public static final int STATE_STOPED = 0x0000EE; public static final int STATE_STOPED = 0x0000EE;
public static final int STATE_NORMAL = 0x000000; public static final int STATE_NORMAL = 0x000000;
/** /**
* 初始化,连接服务端，在程序启动页或者 在Application里调用 * 初始化,连接服务端，在程序启动页或者 在Application里调用
*
* @param context * @param context
* @param ip * @param ip
* @param port * @param port
*/ */
public static void connect(String ip,int port){ public static void connect(String ip, int port) {
CIMCacheToolkit.getInstance().putBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED, false); CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_DESTROYED, false);
CIMCacheToolkit.getInstance().putBoolean(CIMCacheToolkit.KEY_MANUAL_STOP, false); CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_MANUAL_STOP, false);
CIMCacheToolkit.getInstance().putString( CIMCacheToolkit.KEY_CIM_SERVIER_HOST, ip); CIMCacheManager.getInstance().putString(CIMCacheManager.KEY_CIM_SERVIER_HOST, ip);
CIMCacheToolkit.getInstance().putInt( CIMCacheToolkit.KEY_CIM_SERVIER_PORT, port); CIMCacheManager.getInstance().putInt(CIMCacheManager.KEY_CIM_SERVIER_PORT, port);
Intent serviceIntent = new Intent(); Intent serviceIntent = new Intent();
serviceIntent.putExtra(CIMCacheToolkit.KEY_CIM_SERVIER_HOST, ip); serviceIntent.putExtra(CIMCacheManager.KEY_CIM_SERVIER_HOST, ip);
serviceIntent.putExtra(CIMCacheToolkit.KEY_CIM_SERVIER_PORT, port); serviceIntent.putExtra(CIMCacheManager.KEY_CIM_SERVIER_PORT, port);
serviceIntent.setAction(ACTION_CREATE_CIM_CONNECTION); serviceIntent.setAction(ACTION_CREATE_CIM_CONNECTION);
startService(serviceIntent); startService(serviceIntent);
@ -81,67 +83,60 @@ public class CIMPushManager {
CIMPushService.getInstance().onStartCommand(intent); CIMPushService.getInstance().onStartCommand(intent);
} }
protected static void connect(){ protected static void connect() {
boolean isManualStop = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_MANUAL_STOP);
boolean isManualDestory = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualStop || isManualDestory) if (isManualStop || isManualDestory) {
{ return;
return ;
} }
String host = CIMCacheToolkit.getInstance().getString( CIMCacheToolkit.KEY_CIM_SERVIER_HOST); String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST);
int port =CIMCacheToolkit.getInstance().getInt( CIMCacheToolkit.KEY_CIM_SERVIER_PORT); int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT);
connect(host,port); connect(host, port);
} }
private static void sendBindRequest(String account) {
private static void sendBindRequest(String account){ CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_MANUAL_STOP, false);
CIMCacheToolkit.getInstance().putBoolean(CIMCacheToolkit.KEY_MANUAL_STOP, false);
SentBody sent = new SentBody(); SentBody sent = new SentBody();
Properties sysPro=System.getProperties(); Properties sysPro = System.getProperties();
sent.setKey(CIMConstant.RequestKey.CLIENT_BIND); sent.setKey(CIMConstant.RequestKey.CLIENT_BIND);
sent.put("account", account); sent.put("account", account);
sent.put("deviceId", getLocalMac()); sent.put("deviceId", getLocalMac());
sent.put("channel", sysPro.getProperty("os.name")); sent.put("channel", sysPro.getProperty("os.name"));
sent.put("device",getDeviceModel()); sent.put("device", getDeviceModel());
sent.put("version",getClientVersion()); sent.put("version", getClientVersion());
sent.put("osVersion",sysPro.getProperty("os.version")); sent.put("osVersion", sysPro.getProperty("os.version"));
sendRequest(sent); sendRequest(sent);
} }
/** /**
* 设置一个账号登录到服务端 * 设置一个账号登录到服务端
* @param account 用户唯一ID *
* @param account
* 用户唯一ID
*/ */
public static void bindAccount(String account){ public static void bindAccount(String account) {
boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
boolean isManualDestory = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED); if (isManualDestory || account == null || account.trim().length() == 0) {
if(isManualDestory || account==null || account.trim().length()==0) return;
{
return ;
} }
sendBindRequest(account); sendBindRequest(account);
} }
protected static boolean autoBindDeviceId(){ protected static boolean autoBindDeviceId() {
String account = getAccount(); String account = getAccount();
boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
boolean isManualStoped = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_MANUAL_STOP);
if (isManualStoped || account == null || account.trim().length() == 0 || isManualDestory) {
boolean isManualDestory = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED);
boolean isManualStoped = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_MANUAL_STOP);
if( isManualStoped || account==null || account.trim().length()==0 || isManualDestory )
{
return false; return false;
} }
@ -150,21 +145,19 @@ public class CIMPushManager {
return true; return true;
} }
/** /**
* 发送一个CIM请求 * 发送一个CIM请求
*
* @param context * @param context
* @body * @body
*/ */
public static void sendRequest(SentBody body){ public static void sendRequest(SentBody body) {
boolean isManualStop = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_MANUAL_STOP);
boolean isManualDestory = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualStop || isManualDestory) if (isManualStop || isManualDestory) {
{ return;
return ;
} }
Intent serviceIntent = new Intent(); Intent serviceIntent = new Intent();
@ -176,32 +169,30 @@ public class CIMPushManager {
/** /**
* 停止接受推送，将会退出当前账号登录，端口与服务端的连接 * 停止接受推送，将会退出当前账号登录，端口与服务端的连接
*
* @param context * @param context
*/ */
public static void stop(){ public static void stop() {
boolean isManualDestory = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualDestory){ if (isManualDestory) {
return ; return;
} }
CIMCacheToolkit.getInstance().putBoolean(CIMCacheToolkit.KEY_MANUAL_STOP, true); CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_MANUAL_STOP, true);
Intent serviceIntent = new Intent(); startService(new Intent(ACTION_CLOSE_CIM_CONNECTION));
serviceIntent.setAction(ACTION_CLOSE_CIM_CONNECTION);
startService(serviceIntent);
} }
/** /**
* 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复 * 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复
*
* @param context * @param context
*/ */
public static void destroy(){ public static void destroy() {
CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_DESTROYED, true);
CIMCacheToolkit.getInstance().putBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED, true);
Intent serviceIntent = new Intent(); Intent serviceIntent = new Intent();
serviceIntent.setAction(ACTION_DESTORY); serviceIntent.setAction(ACTION_DESTORY);
@ -209,60 +200,62 @@ public class CIMPushManager {
} }
/** /**
* 重新恢复接收推送，重新连接服务端，并登录当前账号如果aotuBind == true * 重新恢复接收推送，重新连接服务端，并登录当前账号如果aotuBind == true
*
* @param context * @param context
* @param aotuBind * @param aotuBind
*/ */
public static void resume(){ public static void resume() {
boolean isManualDestory = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualDestory){ if (isManualDestory) {
return ; return;
} }
autoBindDeviceId(); autoBindDeviceId();
} }
public static boolean isConnected(){ public static boolean isConnected() {
return CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_CIM_CONNECTION_STATE); return CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_CONNECTION_STATE);
} }
public static int getState(){ public static int getState() {
boolean isManualDestory = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualDestory){ if (isManualDestory) {
return STATE_DESTROYED; return STATE_DESTROYED;
} }
boolean isManualStop = CIMCacheToolkit.getInstance().getBoolean(CIMCacheToolkit.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_MANUAL_STOP);
if(isManualStop){ if (isManualStop) {
return STATE_STOPED; return STATE_STOPED;
} }
return STATE_NORMAL; return STATE_NORMAL;
} }
public static String getDeviceModel() {
public static String getDeviceModel(){
return System.getProperties().getProperty(CIMConstant.ConfigKey.DEVICE_MODEL); return System.getProperties().getProperty(CIMConstant.ConfigKey.DEVICE_MODEL);
} }
public static String getClientVersion(){ public static String getClientVersion() {
return System.getProperties().getProperty(CIMConstant.ConfigKey.CLIENT_VERSION); return System.getProperties().getProperty(CIMConstant.ConfigKey.CLIENT_VERSION);
} }
public static String getAccount(){
public static String getAccount() {
return System.getProperties().getProperty(CIMConstant.ConfigKey.CLIENT_ACCOUNT); return System.getProperties().getProperty(CIMConstant.ConfigKey.CLIENT_ACCOUNT);
} }
public static void setAccount(String account){
System.getProperties().put(CIMConstant.ConfigKey.CLIENT_ACCOUNT,account); public static void setAccount(String account) {
} System.getProperties().put(CIMConstant.ConfigKey.CLIENT_ACCOUNT, account);
public static void setClientVersion(String version){
System.getProperties().put(CIMConstant.ConfigKey.CLIENT_VERSION,version);
} }
public static void setDeviceModel(String model){ public static void setClientVersion(String version) {
System.getProperties().put(CIMConstant.ConfigKey.DEVICE_MODEL,model); System.getProperties().put(CIMConstant.ConfigKey.CLIENT_VERSION, version);
}
public static void setDeviceModel(String model) {
System.getProperties().put(CIMConstant.ConfigKey.DEVICE_MODEL, model);
} }
private static String getLocalMac() { private static String getLocalMac() {
@ -271,16 +264,16 @@ public class CIMPushManager {
ia = InetAddress.getLocalHost(); ia = InetAddress.getLocalHost();
byte[] mac = NetworkInterface.getByInetAddress(ia).getHardwareAddress(); byte[] mac = NetworkInterface.getByInetAddress(ia).getHardwareAddress();
StringBuffer sb = new StringBuffer(""); StringBuffer sb = new StringBuffer("");
for(int i=0; i<mac.length; i++) { for (int i = 0; i < mac.length; i++) {
if(i!=0) { if (i != 0) {
sb.append("-"); sb.append("-");
} }
//字节转换为整数 // 字节转换为整数
int temp = mac[i]&0xff; int temp = mac[i] & 0xff;
String str = Integer.toHexString(temp); String str = Integer.toHexString(temp);
if(str.length()==1) { if (str.length() == 1) {
sb.append("0"+str); sb.append("0" + str);
}else { } else {
sb.append(str); sb.append(str);
} }
} }

43
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMPushService.java
View File

@ -21,72 +21,61 @@
*/ */
package com.farsunset.cim.sdk.client; package com.farsunset.cim.sdk.client;
import com.farsunset.cim.sdk.client.model.Intent; import com.farsunset.cim.sdk.client.model.Intent;
import com.farsunset.cim.sdk.client.model.SentBody; import com.farsunset.cim.sdk.client.model.SentBody;
/** /**
* 与服务端连接服务 * 与服务端连接服务
* *
*/ */
public class CIMPushService { public class CIMPushService {
protected final static int DEF_CIM_PORT = 23456; protected final static int DEF_CIM_PORT = 23456;
private CIMConnectorManager manager; private CIMConnectorManager manager;
private static CIMPushService service; private static CIMPushService service;
public static CIMPushService getInstance(){
if (service==null){ public static CIMPushService getInstance() {
if (service == null) {
service = new CIMPushService(); service = new CIMPushService();
} }
return service; return service;
} }
public CIMPushService() {
public CIMPushService()
{
manager = CIMConnectorManager.getManager(); manager = CIMConnectorManager.getManager();
} }
public void onStartCommand(Intent intent) { public void onStartCommand(Intent intent) {
intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent); intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent);
String action = intent.getAction(); String action = intent.getAction();
if(CIMPushManager.ACTION_CREATE_CIM_CONNECTION.equals(action)) if (CIMPushManager.ACTION_CREATE_CIM_CONNECTION.equals(action)) {
{ String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST);
String host = CIMCacheToolkit.getInstance().getString(CIMCacheToolkit.KEY_CIM_SERVIER_HOST); int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT);
int port =CIMCacheToolkit.getInstance().getInt(CIMCacheToolkit.KEY_CIM_SERVIER_PORT); manager.connect(host, port);
manager.connect(host,port);
} }
if(CIMPushManager.ACTION_SEND_REQUEST_BODY.equals(action)) if (CIMPushManager.ACTION_SEND_REQUEST_BODY.equals(action)) {
{
manager.send((SentBody) intent.getExtra(SentBody.class.getName())); manager.send((SentBody) intent.getExtra(SentBody.class.getName()));
} }
if(CIMPushManager.ACTION_CLOSE_CIM_CONNECTION.equals(action)) if (CIMPushManager.ACTION_CLOSE_CIM_CONNECTION.equals(action)) {
{
manager.closeSession(); manager.closeSession();
} }
if(CIMPushManager.ACTION_DESTORY.equals(action)) if (CIMPushManager.ACTION_DESTORY.equals(action)) {
{
manager.destroy(); manager.destroy();
} }
if(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE.equals(action) && !manager.isConnected()) if (CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE.equals(action) && !manager.isConnected()) {
{
String host = CIMCacheToolkit.getInstance().getString(CIMCacheToolkit.KEY_CIM_SERVIER_HOST); String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST);
int port =CIMCacheToolkit.getInstance().getInt( CIMCacheToolkit.KEY_CIM_SERVIER_PORT); int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT);
manager.connect(host,port); manager.connect(host, port);
} }
} }
} }

53
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/constant/CIMConstant.java
View File

@ -26,35 +26,35 @@ package com.farsunset.cim.sdk.client.constant;
*/ */
public interface CIMConstant { public interface CIMConstant {
long RECONN_INTERVAL_TIME= 30 * 1000; long RECONN_INTERVAL_TIME = 30 * 1000;
//消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度 // 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
int DATA_HEADER_LENGTH = 3; int DATA_HEADER_LENGTH = 3;
public static interface ReturnCode{
String CODE_404 ="404"; public static interface ReturnCode {
String CODE_403 ="403"; String CODE_404 = "404";
String CODE_405 ="405"; String CODE_403 = "403";
String CODE_200 ="200"; String CODE_405 = "405";
String CODE_206 ="206"; String CODE_200 = "200";
String CODE_500 ="500"; String CODE_206 = "206";
String CODE_500 = "500";
} }
public static interface ConfigKey{ public static interface ConfigKey {
public static String DEVICE_MODEL ="client.model"; public static String DEVICE_MODEL = "client.model";
public static String CLIENT_VERSION ="client.version"; public static String CLIENT_VERSION = "client.version";
public static String CLIENT_ACCOUNT ="client.account"; public static String CLIENT_ACCOUNT = "client.account";
} }
public static interface ProtobufType{ public static interface ProtobufType {
byte C_H_RS = 0; byte C_H_RS = 0;
byte S_H_RQ = 1; byte S_H_RQ = 1;
byte MESSAGE = 2; byte MESSAGE = 2;
@ -62,29 +62,26 @@ public interface CIMConstant {
byte REPLYBODY = 4; byte REPLYBODY = 4;
} }
public static interface RequestKey{ public static interface RequestKey {
String CLIENT_BIND = "client_bind";
String CLIENT_BIND ="client_bind"; String CLIENT_LOGOUT = "client_logout";
String CLIENT_LOGOUT ="client_logout";
@Deprecated @Deprecated
String CLIENT_PULL_MESSAGE ="client_pull_message"; String CLIENT_PULL_MESSAGE = "client_pull_message";
} }
public static interface MessageAction {
public static interface MessageAction{ // 被其他设备登录挤下线消息
String ACTION_999 = "999";
//被其他设备登录挤下线消息 // 被系统禁用消息
String ACTION_999 ="999"; String ACTION_444 = "444";
//被系统禁用消息
String ACTION_444 ="444";
} }
public static interface IntentAction {
public static interface IntentAction{
// 消息广播action // 消息广播action
String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED"; String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED";
@ -113,7 +110,7 @@ public interface CIMConstant {
// 未知异常 // 未知异常
String ACTION_UNCAUGHT_EXCEPTION = "com.farsunset.cim.UNCAUGHT_EXCEPTION"; String ACTION_UNCAUGHT_EXCEPTION = "com.farsunset.cim.UNCAUGHT_EXCEPTION";
//重试连接 // 重试连接
String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY"; String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY";
} }

1
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/exception/NetworkDisconnectedException.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.sdk.client.exception; package com.farsunset.cim.sdk.client.exception;
public class NetworkDisconnectedException extends Exception { public class NetworkDisconnectedException extends Exception {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

1
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/exception/SessionDisconnectedException.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.sdk.client.exception; package com.farsunset.cim.sdk.client.exception;
public class SessionDisconnectedException extends Exception { public class SessionDisconnectedException extends Exception {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

2
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/filter/ClientMessageCodecFactory.java
View File

@ -40,7 +40,6 @@ public class ClientMessageCodecFactory implements ProtocolCodecFactory {
*/ */
private final ClientMessageDecoder decoder; private final ClientMessageDecoder decoder;
public ClientMessageCodecFactory() { public ClientMessageCodecFactory() {
encoder = new ClientMessageEncoder(); encoder = new ClientMessageEncoder();
decoder = new ClientMessageDecoder(); decoder = new ClientMessageDecoder();
@ -49,6 +48,7 @@ public class ClientMessageCodecFactory implements ProtocolCodecFactory {
public ProtocolEncoder getEncoder(IoSession session) throws Exception { public ProtocolEncoder getEncoder(IoSession session) throws Exception {
return encoder; return encoder;
} }
public ProtocolDecoder getDecoder(IoSession session) throws Exception { public ProtocolDecoder getDecoder(IoSession session) throws Exception {
return decoder; return decoder;
} }

40
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/filter/ClientMessageDecoder.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.sdk.client.filter; package com.farsunset.cim.sdk.client.filter;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
@ -35,21 +34,20 @@ import com.farsunset.cim.sdk.client.model.ReplyBody;
import com.farsunset.cim.sdk.model.proto.MessageProto; import com.farsunset.cim.sdk.model.proto.MessageProto;
import com.farsunset.cim.sdk.model.proto.ReplyBodyProto; import com.farsunset.cim.sdk.model.proto.ReplyBodyProto;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
/** /**
* 客户端消息解码 * 客户端消息解码
*/ */
public class ClientMessageDecoder extends CumulativeProtocolDecoder { public class ClientMessageDecoder extends CumulativeProtocolDecoder {
protected final Logger logger = Logger.getLogger(ClientMessageDecoder.class); protected final Logger logger = Logger.getLogger(ClientMessageDecoder.class);
@Override @Override
public boolean doDecode(IoSession iosession, IoBuffer iobuffer, public boolean doDecode(IoSession iosession, IoBuffer iobuffer, ProtocolDecoderOutput out) throws Exception {
ProtocolDecoderOutput out) throws Exception {
/** /**
* 消息头3位 * 消息头3位
*/ */
if(iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH){ if (iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH) {
return false; return false;
} }
@ -57,13 +55,13 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
byte conetnType = iobuffer.get(); byte conetnType = iobuffer.get();
byte lv =iobuffer.get();//int 低位 byte lv = iobuffer.get();// int 低位
byte hv =iobuffer.get();//int 高位 byte hv = iobuffer.get();// int 高位
int conetnLength = getContentLength(lv,hv); int conetnLength = getContentLength(lv, hv);
//如果消息体没有接收完整，则重置读取，等待下一次重新读取 // 如果消息体没有接收完整，则重置读取，等待下一次重新读取
if(conetnLength > iobuffer.remaining()){ if (conetnLength > iobuffer.remaining()) {
iobuffer.reset(); iobuffer.reset();
return false; return false;
} }
@ -71,27 +69,23 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
byte[] dataBytes = new byte[conetnLength]; byte[] dataBytes = new byte[conetnLength];
iobuffer.get(dataBytes, 0, conetnLength); iobuffer.get(dataBytes, 0, conetnLength);
Object message = mappingMessageObject(dataBytes,conetnType); Object message = mappingMessageObject(dataBytes, conetnType);
if(message!=null){ if (message != null) {
out.write(message); out.write(message);
} }
return true; return true;
} }
private Object mappingMessageObject(byte[] bytes,byte type) throws InvalidProtocolBufferException { private Object mappingMessageObject(byte[] bytes, byte type) throws InvalidProtocolBufferException {
if (CIMConstant.ProtobufType.S_H_RQ == type) {
if(CIMConstant.ProtobufType.S_H_RQ == type)
{
HeartbeatRequest request = HeartbeatRequest.getInstance(); HeartbeatRequest request = HeartbeatRequest.getInstance();
logger.info(request.toString()); logger.info(request.toString());
return request; return request;
} }
if(CIMConstant.ProtobufType.REPLYBODY == type) if (CIMConstant.ProtobufType.REPLYBODY == type) {
{
ReplyBodyProto.Model bodyProto = ReplyBodyProto.Model.parseFrom(bytes); ReplyBodyProto.Model bodyProto = ReplyBodyProto.Model.parseFrom(bytes);
ReplyBody body = new ReplyBody(); ReplyBody body = new ReplyBody();
body.setKey(bodyProto.getKey()); body.setKey(bodyProto.getKey());
@ -105,8 +99,7 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
return body; return body;
} }
if(CIMConstant.ProtobufType.MESSAGE == type) if (CIMConstant.ProtobufType.MESSAGE == type) {
{
MessageProto.Model bodyProto = MessageProto.Model.parseFrom(bytes); MessageProto.Model bodyProto = MessageProto.Model.parseFrom(bytes);
Message message = new Message(); Message message = new Message();
message.setMid(bodyProto.getMid()); message.setMid(bodyProto.getMid());
@ -129,14 +122,15 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
/** /**
* 解析消息体长度 * 解析消息体长度
*
* @param type * @param type
* @param length * @param length
* @return * @return
*/ */
private int getContentLength(byte lv,byte hv){ private int getContentLength(byte lv, byte hv) {
int l = (lv & 0xff); int l = (lv & 0xff);
int h = (hv & 0xff); int h = (hv & 0xff);
return (l| (h <<= 8)); return (l | (h <<= 8));
} }
} }

11
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/filter/ClientMessageEncoder.java
View File

@ -29,28 +29,30 @@ import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import com.farsunset.cim.sdk.client.constant.CIMConstant; import com.farsunset.cim.sdk.client.constant.CIMConstant;
import com.farsunset.cim.sdk.client.model.Protobufable; import com.farsunset.cim.sdk.client.model.Protobufable;
/** /**
* 客户端消息发送前进行编码 * 客户端消息发送前进行编码
*/ */
public class ClientMessageEncoder extends ProtocolEncoderAdapter { public class ClientMessageEncoder extends ProtocolEncoderAdapter {
protected final Logger logger = Logger.getLogger(ClientMessageEncoder.class); protected final Logger logger = Logger.getLogger(ClientMessageEncoder.class);
@Override @Override
public void encode(IoSession iosession, Object object, ProtocolEncoderOutput out) throws Exception { public void encode(IoSession iosession, Object object, ProtocolEncoderOutput out) throws Exception {
if(object instanceof Protobufable){ if (object instanceof Protobufable) {
Protobufable data = (Protobufable) object; Protobufable data = (Protobufable) object;
byte[] byteArray = data.getByteArray(); byte[] byteArray = data.getByteArray();
IoBuffer buff = IoBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH).setAutoExpand(true); IoBuffer buff = IoBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH).setAutoExpand(true);
buff.put(createHeader(data.getType(),byteArray.length)); buff.put(createHeader(data.getType(), byteArray.length));
buff.put(byteArray); buff.put(byteArray);
buff.flip(); buff.flip();
out.write(buff); out.write(buff);
//打印出收到的消息 // 打印出收到的消息
logger.info(data.toString()); logger.info(data.toString());
} }
@ -58,11 +60,12 @@ public class ClientMessageEncoder extends ProtocolEncoderAdapter {
/** /**
* 消息体最大为65535 * 消息体最大为65535
*
* @param type * @param type
* @param length * @param length
* @return * @return
*/ */
private byte[] createHeader(byte type,int length){ private byte[] createHeader(byte type, int length) {
byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH]; byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH];
header[0] = type; header[0] = type;
header[1] = (byte) (length & 0xff); header[1] = (byte) (length & 0xff);

7
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/HeartbeatRequest.java
View File

@ -29,7 +29,7 @@ import com.farsunset.cim.sdk.client.constant.CIMConstant;
* 服务端心跳请求 * 服务端心跳请求
* *
*/ */
public class HeartbeatRequest implements Serializable,Protobufable { public class HeartbeatRequest implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String TAG = "SERVER_HEARTBEAT_REQUEST"; private static final String TAG = "SERVER_HEARTBEAT_REQUEST";
@ -37,7 +37,7 @@ public class HeartbeatRequest implements Serializable,Protobufable {
private static HeartbeatRequest object = new HeartbeatRequest(); private static HeartbeatRequest object = new HeartbeatRequest();
private HeartbeatRequest(){ private HeartbeatRequest() {
} }
@ -50,11 +50,10 @@ public class HeartbeatRequest implements Serializable,Protobufable {
return CMD_HEARTBEAT_RESPONSE.getBytes(); return CMD_HEARTBEAT_RESPONSE.getBytes();
} }
public String toString(){ public String toString() {
return TAG; return TAG;
} }
@Override @Override
public byte getType() { public byte getType() {
return CIMConstant.ProtobufType.S_H_RQ; return CIMConstant.ProtobufType.S_H_RQ;

7
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/HeartbeatResponse.java
View File

@ -28,7 +28,7 @@ import com.farsunset.cim.sdk.client.constant.CIMConstant;
/** /**
* 客户端心跳响应 * 客户端心跳响应
*/ */
public class HeartbeatResponse implements Serializable,Protobufable { public class HeartbeatResponse implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String TAG = "CLIENT_HEARTBEAT_RESPONSE"; private static final String TAG = "CLIENT_HEARTBEAT_RESPONSE";
@ -36,19 +36,20 @@ public class HeartbeatResponse implements Serializable,Protobufable {
private static HeartbeatResponse object = new HeartbeatResponse(); private static HeartbeatResponse object = new HeartbeatResponse();
private HeartbeatResponse(){ private HeartbeatResponse() {
} }
public static HeartbeatResponse getInstance() { public static HeartbeatResponse getInstance() {
return object; return object;
} }
@Override @Override
public byte[] getByteArray() { public byte[] getByteArray() {
return CMD_HEARTBEAT_RESPONSE.getBytes(); return CMD_HEARTBEAT_RESPONSE.getBytes();
} }
public String toString(){ public String toString() {
return TAG; return TAG;
} }

11
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Intent.java
View File

@ -23,6 +23,7 @@ package com.farsunset.cim.sdk.client.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
/** /**
* java |android 客户端请求结构 * java |android 客户端请求结构
* *
@ -35,7 +36,6 @@ public class Intent implements Serializable {
private HashMap<String, Object> data = new HashMap<String, Object>(); private HashMap<String, Object> data = new HashMap<String, Object>();
public Intent() { public Intent() {
} }
@ -51,18 +51,19 @@ public class Intent implements Serializable {
this.action = action; this.action = action;
} }
public void putExtra(String key , Object value){ public void putExtra(String key, Object value) {
data.put(key, value); data.put(key, value);
} }
public Object getExtra(String key){
public Object getExtra(String key) {
return data.get(key); return data.get(key);
} }
public long getLongExtra(String key, long defValue) { public long getLongExtra(String key, long defValue) {
Object v = getExtra(key); Object v = getExtra(key);
try{ try {
return Long.parseLong(v.toString()); return Long.parseLong(v.toString());
}catch(Exception e){ } catch (Exception e) {
return defValue; return defValue;
} }
} }

22
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Message.java
View File

@ -30,13 +30,11 @@ public class Message implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 消息类型，用户自定义消息类别 * 消息类型，用户自定义消息类别
*/ */
private String mid; private String mid;
/** /**
* 消息类型，用户自定义消息类别 * 消息类型，用户自定义消息类别
*/ */
@ -59,8 +57,6 @@ public class Message implements Serializable {
*/ */
private String receiver; private String receiver;
/** /**
* content 内容格式 * content 内容格式
*/ */
@ -73,11 +69,10 @@ public class Message implements Serializable {
private long timestamp; private long timestamp;
public Message() {
public Message()
{
timestamp = System.currentTimeMillis(); timestamp = System.currentTimeMillis();
} }
public long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }
@ -86,14 +81,14 @@ public class Message implements Serializable {
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getAction() { public String getAction() {
return action; return action;
} }
public void setAction(String action) { public void setAction(String action) {
this.action = action; this.action = action;
} }
public String getTitle() { public String getTitle() {
return title; return title;
} }
@ -126,7 +121,6 @@ public class Message implements Serializable {
this.receiver = receiver; this.receiver = receiver;
} }
public String getFormat() { public String getFormat() {
return format; return format;
} }
@ -135,14 +129,14 @@ public class Message implements Serializable {
this.format = format; this.format = format;
} }
public String getExtra() { public String getExtra() {
return extra; return extra;
} }
public void setExtra(String extra) { public void setExtra(String extra) {
this.extra = extra; this.extra = extra;
} }
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
@ -159,7 +153,6 @@ public class Message implements Serializable {
return buffer.toString(); return buffer.toString();
} }
public String getMid() { public String getMid() {
return mid; return mid;
} }
@ -169,8 +162,7 @@ public class Message implements Serializable {
} }
public boolean isNotEmpty(String txt) { public boolean isNotEmpty(String txt) {
return txt != null && txt.trim().length()!=0; return txt != null && txt.trim().length() != 0;
} }
} }

1
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Protobufable.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.client.model; package com.farsunset.cim.sdk.client.model;
/** /**
* 需要向另一端发送的结构体 * 需要向另一端发送的结构体
*/ */

20
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/ReplyBody.java
View File

@ -25,6 +25,7 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
/** /**
* 请求应答对象 * 请求应答对象
* *
@ -38,7 +39,6 @@ public class ReplyBody implements Serializable {
*/ */
private String key; private String key;
/** /**
* 返回码 * 返回码
*/ */
@ -54,14 +54,13 @@ public class ReplyBody implements Serializable {
*/ */
private HashMap<String, String> data; private HashMap<String, String> data;
private long timestamp; private long timestamp;
public ReplyBody() public ReplyBody() {
{
data = new HashMap<String, String>(); data = new HashMap<String, String>();
timestamp = System.currentTimeMillis(); timestamp = System.currentTimeMillis();
} }
public long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }
@ -70,8 +69,6 @@ public class ReplyBody implements Serializable {
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getKey() { public String getKey() {
return key; return key;
} }
@ -81,7 +78,7 @@ public class ReplyBody implements Serializable {
} }
public void put(String k, String v) { public void put(String k, String v) {
if(v!=null && k!=null){ if (v != null && k != null) {
data.put(k, v); data.put(k, v);
} }
} }
@ -118,19 +115,16 @@ public class ReplyBody implements Serializable {
this.code = code; this.code = code;
} }
public String toString() {
public String toString()
{
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#ReplyBody#").append("\n"); buffer.append("#ReplyBody#").append("\n");
buffer.append("key:").append(this.getKey()).append("\n"); buffer.append("key:").append(this.getKey()).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n"); buffer.append("timestamp:").append(timestamp).append("\n");
buffer.append("code:").append(code).append("\n"); buffer.append("code:").append(code).append("\n");
if(!data.isEmpty()){ if (!data.isEmpty()) {
buffer.append("data{").append("\n"); buffer.append("data{").append("\n");
for(String key:getKeySet()) for (String key : getKeySet()) {
{
buffer.append(key).append(":").append(this.get(key)).append("\n"); buffer.append(key).append(":").append(this.get(key)).append("\n");
} }
buffer.append("}"); buffer.append("}");

17
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/SentBody.java
View File

@ -28,11 +28,12 @@ import java.util.Set;
import com.farsunset.cim.sdk.client.constant.CIMConstant; import com.farsunset.cim.sdk.client.constant.CIMConstant;
import com.farsunset.cim.sdk.model.proto.SentBodyProto; import com.farsunset.cim.sdk.model.proto.SentBodyProto;
/** /**
* java |android 客户端请求结构 * java |android 客户端请求结构
* *
*/ */
public class SentBody implements Serializable,Protobufable { public class SentBody implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -67,10 +68,11 @@ public class SentBody implements Serializable,Protobufable {
} }
public void put(String k, String v) { public void put(String k, String v) {
if(v!=null && k!=null){ if (v != null && k != null) {
data.put(k, v); data.put(k, v);
} }
} }
public void putAll(Map<String, String> map) { public void putAll(Map<String, String> map) {
data.putAll(map); data.putAll(map);
} }
@ -79,7 +81,6 @@ public class SentBody implements Serializable,Protobufable {
return data.keySet(); return data.keySet();
} }
public void remove(String k) { public void remove(String k) {
data.remove(k); data.remove(k);
} }
@ -87,13 +88,13 @@ public class SentBody implements Serializable,Protobufable {
@Override @Override
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#SentBody#").append("\n");; buffer.append("#SentBody#").append("\n");
;
buffer.append("key:").append(key).append("\n"); buffer.append("key:").append(key).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n"); buffer.append("timestamp:").append(timestamp).append("\n");
if(!data.isEmpty()){ if (!data.isEmpty()) {
buffer.append("data{").append("\n"); buffer.append("data{").append("\n");
for(String key:getKeySet()) for (String key : getKeySet()) {
{
buffer.append(key).append(":").append(this.get(key)).append("\n"); buffer.append(key).append(":").append(this.get(key)).append("\n");
} }
buffer.append("}"); buffer.append("}");
@ -106,7 +107,7 @@ public class SentBody implements Serializable,Protobufable {
SentBodyProto.Model.Builder builder = SentBodyProto.Model.newBuilder(); SentBodyProto.Model.Builder builder = SentBodyProto.Model.newBuilder();
builder.setKey(key); builder.setKey(key);
builder.setTimestamp(timestamp); builder.setTimestamp(timestamp);
if(!data.isEmpty()){ if (!data.isEmpty()) {
builder.putAllData(data); builder.putAllData(data);
} }
return builder.build().toByteArray(); return builder.build().toByteArray();

613
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/MessageProto.java
View File

File diff suppressed because it is too large Load Diff

665
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/ReplyBodyProto.java
View File

File diff suppressed because it is too large Load Diff

581
cim_for_mina/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/SentBodyProto.java
View File

File diff suppressed because it is too large Load Diff

28
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/constant/CIMConstant.java
View File

@ -25,27 +25,25 @@ package com.farsunset.cim.sdk.server.constant;
* 常量 * 常量
*/ */
public interface CIMConstant { public interface CIMConstant {
//消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度 // 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
int DATA_HEADER_LENGTH = 3; int DATA_HEADER_LENGTH = 3;
public static interface ReturnCode{
String CODE_200 ="200"; public static interface ReturnCode {
String CODE_404 ="404"; String CODE_200 = "200";
String CODE_403 ="403"; String CODE_404 = "404";
String CODE_500 ="500"; String CODE_403 = "403";
String CODE_500 = "500";
} }
String SESSION_KEY = "account";
String HEARTBEAT_KEY = "heartbeat";
public static interface ProtobufType {
String SESSION_KEY ="account";
String HEARTBEAT_KEY ="heartbeat";
public static interface ProtobufType{
byte S_H_RQ = 1; byte S_H_RQ = 1;
byte C_H_RS = 0; byte C_H_RS = 0;
byte MESSAGE = 2; byte MESSAGE = 2;
@ -53,9 +51,9 @@ public interface CIMConstant {
byte REPLYBODY = 4; byte REPLYBODY = 4;
} }
public static interface MessageAction{ public static interface MessageAction {
//被其他设备登录挤下线消息 // 被其他设备登录挤下线消息
String ACTION_999 ="999"; String ACTION_999 = "999";
} }
} }

2
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/filter/ServerMessageDecoder.java
View File

@ -25,12 +25,12 @@ import org.apache.mina.filter.codec.demux.DemuxingProtocolDecoder;
import com.farsunset.cim.sdk.server.filter.decoder.AppMessageDecoder; import com.farsunset.cim.sdk.server.filter.decoder.AppMessageDecoder;
import com.farsunset.cim.sdk.server.filter.decoder.WebMessageDecoder; import com.farsunset.cim.sdk.server.filter.decoder.WebMessageDecoder;
/** /**
* 服务端接收消息解码 * 服务端接收消息解码
*/ */
public class ServerMessageDecoder extends DemuxingProtocolDecoder { public class ServerMessageDecoder extends DemuxingProtocolDecoder {
public ServerMessageDecoder() { public ServerMessageDecoder() {
addMessageDecoder(new AppMessageDecoder()); addMessageDecoder(new AppMessageDecoder());
addMessageDecoder(new WebMessageDecoder()); addMessageDecoder(new WebMessageDecoder());

4
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/filter/ServerMessageEncoder.java
View File

@ -105,8 +105,8 @@ public class ServerMessageEncoder extends ProtocolEncoderAdapter {
} }
/** /**
* 发送到websocket的数据需要进行相关格式转换 * 发送到websocket的数据需要进行相关格式转换 对传入数据进行无掩码转换
* 对传入数据进行无掩码转换 *
* @param data * @param data
* @return * @return
*/ */

42
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/filter/decoder/AppMessageDecoder.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.server.filter.decoder; package com.farsunset.cim.sdk.server.filter.decoder;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
@ -31,6 +32,7 @@ import com.farsunset.cim.sdk.server.constant.CIMConstant;
import com.farsunset.cim.sdk.server.model.HeartbeatResponse; import com.farsunset.cim.sdk.server.model.HeartbeatResponse;
import com.farsunset.cim.sdk.server.model.SentBody; import com.farsunset.cim.sdk.server.model.SentBody;
import com.farsunset.cim.sdk.server.model.proto.SentBodyProto; import com.farsunset.cim.sdk.server.model.proto.SentBodyProto;
/** /**
* 服务端接收消息解码 * 服务端接收消息解码
*/ */
@ -38,11 +40,10 @@ public class AppMessageDecoder extends MessageDecoderAdapter {
protected final Logger logger = Logger.getLogger(AppMessageDecoder.class); protected final Logger logger = Logger.getLogger(AppMessageDecoder.class);
@Override @Override
public MessageDecoderResult decodable(IoSession arg0, IoBuffer iobuffer) { public MessageDecoderResult decodable(IoSession arg0, IoBuffer iobuffer) {
if(iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH){ if (iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH) {
return NEED_DATA; return NEED_DATA;
} }
@ -50,27 +51,26 @@ public class AppMessageDecoder extends MessageDecoderAdapter {
* 原生SDK只会发送2种类型消息 1个心跳类型 另一个是sendbody，报文的第一个字节为消息类型 * 原生SDK只会发送2种类型消息 1个心跳类型 另一个是sendbody，报文的第一个字节为消息类型
*/ */
byte conetnType = iobuffer.get(); byte conetnType = iobuffer.get();
if(conetnType == CIMConstant.ProtobufType.C_H_RS || conetnType == CIMConstant.ProtobufType.SENTBODY) { if (conetnType == CIMConstant.ProtobufType.C_H_RS || conetnType == CIMConstant.ProtobufType.SENTBODY) {
return OK; return OK;
} }
return NOT_OK; return NOT_OK;
} }
@Override @Override
public MessageDecoderResult decode(IoSession iosession, IoBuffer iobuffer, ProtocolDecoderOutput out) throws Exception { public MessageDecoderResult decode(IoSession iosession, IoBuffer iobuffer, ProtocolDecoderOutput out)
throws Exception {
iobuffer.mark(); iobuffer.mark();
byte conetnType = iobuffer.get(); byte conetnType = iobuffer.get();
byte lv =iobuffer.get();//int 低位 byte lv = iobuffer.get();// int 低位
byte hv =iobuffer.get();//int 高位 byte hv = iobuffer.get();// int 高位
int conetnLength = getContentLength(lv,hv); int conetnLength = getContentLength(lv, hv);
//如果消息体没有接收完整，则重置读取，等待下一次重新读取 // 如果消息体没有接收完整，则重置读取，等待下一次重新读取
if(conetnLength > iobuffer.remaining()){ if (conetnLength > iobuffer.remaining()) {
iobuffer.reset(); iobuffer.reset();
return NEED_DATA; return NEED_DATA;
} }
@ -78,25 +78,22 @@ public class AppMessageDecoder extends MessageDecoderAdapter {
byte[] dataBytes = new byte[conetnLength]; byte[] dataBytes = new byte[conetnLength];
iobuffer.get(dataBytes, 0, conetnLength); iobuffer.get(dataBytes, 0, conetnLength);
Object message = mappingMessageObject(dataBytes,conetnType); Object message = mappingMessageObject(dataBytes, conetnType);
if(message != null){ if (message != null) {
out.write(message); out.write(message);
} }
return OK; return OK;
} }
public Object mappingMessageObject(byte[] data,byte type) throws Exception public Object mappingMessageObject(byte[] data, byte type) throws Exception {
{
if(CIMConstant.ProtobufType.C_H_RS == type) if (CIMConstant.ProtobufType.C_H_RS == type) {
{
HeartbeatResponse response = HeartbeatResponse.getInstance(); HeartbeatResponse response = HeartbeatResponse.getInstance();
logger.info(response.toString()); logger.info(response.toString());
return response; return response;
} }
if(CIMConstant.ProtobufType.SENTBODY == type) if (CIMConstant.ProtobufType.SENTBODY == type) {
{
SentBodyProto.Model bodyProto = SentBodyProto.Model.parseFrom(data); SentBodyProto.Model bodyProto = SentBodyProto.Model.parseFrom(data);
SentBody body = new SentBody(); SentBody body = new SentBody();
body.setKey(bodyProto.getKey()); body.setKey(bodyProto.getKey());
@ -111,16 +108,15 @@ public class AppMessageDecoder extends MessageDecoderAdapter {
/** /**
* 解析消息体长度 * 解析消息体长度
*
* @param type * @param type
* @param length * @param length
* @return * @return
*/ */
private int getContentLength(byte lv,byte hv){ private int getContentLength(byte lv, byte hv) {
int l = (lv & 0xff); int l = (lv & 0xff);
int h = (hv & 0xff); int h = (hv & 0xff);
return (l| (h <<= 8)); return (l | (h <<= 8));
} }
} }

20
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/filter/decoder/WebMessageDecoder.java
View File

@ -45,7 +45,8 @@ public class WebMessageDecoder extends MessageDecoderAdapter {
public static final byte HAS_EXTEND_DATA = 126; public static final byte HAS_EXTEND_DATA = 126;
public static final byte HAS_EXTEND_DATA_CONTINUE = 127; public static final byte HAS_EXTEND_DATA_CONTINUE = 127;
public static final byte PAYLOADLEN = 0x7F;// 0111 1111 public static final byte PAYLOADLEN = 0x7F;// 0111 1111
public static final Pattern SEC_KEY_PATTERN = Pattern.compile("^(Sec-WebSocket-Key:).+",Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); public static final Pattern SEC_KEY_PATTERN = Pattern.compile("^(Sec-WebSocket-Key:).+",
Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
protected final Logger logger = Logger.getLogger(WebMessageDecoder.class); protected final Logger logger = Logger.getLogger(WebMessageDecoder.class);
@ -57,8 +58,7 @@ public class WebMessageDecoder extends MessageDecoderAdapter {
/** /**
* 原生SDK只会发送2种类型消息 1个心跳类型 另一个是sendbody，报文的第一个字节为消息类型 * 原生SDK只会发送2种类型消息 1个心跳类型 另一个是sendbody，报文的第一个字节为消息类型
* 如果非原生sdk发出的消息，则认为是websocket发送的消息 * 如果非原生sdk发出的消息，则认为是websocket发送的消息 websocket发送的消息 第一个字节不可能等于C_H_RS或者SENTBODY
* websocket发送的消息 第一个字节不可能等于C_H_RS或者SENTBODY
*/ */
byte conetnType = iobuffer.get(); byte conetnType = iobuffer.get();
if (conetnType == CIMConstant.ProtobufType.C_H_RS || conetnType == CIMConstant.ProtobufType.SENTBODY) { if (conetnType == CIMConstant.ProtobufType.C_H_RS || conetnType == CIMConstant.ProtobufType.SENTBODY) {
@ -104,7 +104,7 @@ public class WebMessageDecoder extends MessageDecoderAdapter {
} }
@Override @Override
public MessageDecoderResult decode(IoSession iosession, IoBuffer in, ProtocolDecoderOutput out)throws Exception { public MessageDecoderResult decode(IoSession iosession, IoBuffer in, ProtocolDecoderOutput out) throws Exception {
in.get(); in.get();
byte head = in.get(); byte head = in.get();
byte datalength = (byte) (head & PAYLOADLEN); byte datalength = (byte) (head & PAYLOADLEN);
@ -128,16 +128,16 @@ public class WebMessageDecoder extends MessageDecoderAdapter {
// 数据进行异或运算 // 数据进行异或运算
data[i] = (byte) (data[i] ^ mask[i % 4]); data[i] = (byte) (data[i] ^ mask[i % 4]);
} }
handleSentBodyAndHeartPing(data,out); handleSentBodyAndHeartPing(data, out);
} else { } else {
data = new byte[in.remaining()]; data = new byte[in.remaining()];
in.get(data); in.get(data);
handleWebsocketHandshake(new String(data, "UTF-8"),out); handleWebsocketHandshake(new String(data, "UTF-8"), out);
} }
return OK; return OK;
} }
private void handleWebsocketHandshake(String message,ProtocolDecoderOutput out) { private void handleWebsocketHandshake(String message, ProtocolDecoderOutput out) {
SentBody body = new SentBody(); SentBody body = new SentBody();
body.setKey(CIMNioSocketAcceptor.WEBSOCKET_HANDLER_KEY); body.setKey(CIMNioSocketAcceptor.WEBSOCKET_HANDLER_KEY);
@ -149,8 +149,7 @@ public class WebMessageDecoder extends MessageDecoderAdapter {
out.write(body); out.write(body);
} }
public void handleSentBodyAndHeartPing(byte[] data, ProtocolDecoderOutput out) throws UnsupportedEncodingException {
public void handleSentBodyAndHeartPing(byte[] data,ProtocolDecoderOutput out) throws UnsupportedEncodingException {
String message = new String(data, "UTF-8"); String message = new String(data, "UTF-8");
/** /**
@ -160,8 +159,7 @@ public class WebMessageDecoder extends MessageDecoderAdapter {
HeartbeatResponse response = HeartbeatResponse.getInstance(); HeartbeatResponse response = HeartbeatResponse.getInstance();
logger.info(response.toString()); logger.info(response.toString());
out.write(response); out.write(response);
}else if(data.length > 2) } else if (data.length > 2) {
{
SentBody body = JSON.parseObject(message, SentBody.class); SentBody body = JSON.parseObject(message, SentBody.class);
logger.info(body.toString()); logger.info(body.toString());
out.write(body); out.write(body);

67
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java
View File

@ -47,7 +47,7 @@ import com.farsunset.cim.sdk.server.model.ReplyBody;
import com.farsunset.cim.sdk.server.model.SentBody; import com.farsunset.cim.sdk.server.model.SentBody;
import com.farsunset.cim.sdk.server.session.CIMSession; import com.farsunset.cim.sdk.server.session.CIMSession;
public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveMessageFactory{ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveMessageFactory {
public final static String WEBSOCKET_HANDLER_KEY = "client_websocket_handshake"; public final static String WEBSOCKET_HANDLER_KEY = "client_websocket_handshake";
public final static String CIMSESSION_CLOSED_HANDLER_KEY = "client_cimsession_closed"; public final static String CIMSESSION_CLOSED_HANDLER_KEY = "client_cimsession_closed";
@ -55,12 +55,11 @@ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveM
private HashMap<String, CIMRequestHandler> handlers = new HashMap<String, CIMRequestHandler>(); private HashMap<String, CIMRequestHandler> handlers = new HashMap<String, CIMRequestHandler>();
private IoAcceptor acceptor; private IoAcceptor acceptor;
private int port; private int port;
private final int IDLE_TIME = 120;//秒 private final int IDLE_TIME = 120;// 秒
private final int TIME_OUT = 10;//秒 private final int TIME_OUT = 10;// 秒
private final int READ_BUFFER_SIZE = 1024;//byte private final int READ_BUFFER_SIZE = 1024;// byte
public void bind() throws IOException public void bind() throws IOException {
{
/** /**
* 预制websocket握手请求的处理 * 预制websocket握手请求的处理
@ -69,71 +68,65 @@ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveM
acceptor = new NioSocketAcceptor(); acceptor = new NioSocketAcceptor();
acceptor.getSessionConfig().setReadBufferSize(READ_BUFFER_SIZE); acceptor.getSessionConfig().setReadBufferSize(READ_BUFFER_SIZE);
((DefaultSocketSessionConfig)acceptor.getSessionConfig()).setKeepAlive(true); ((DefaultSocketSessionConfig) acceptor.getSessionConfig()).setKeepAlive(true);
((DefaultSocketSessionConfig)acceptor.getSessionConfig()).setTcpNoDelay(true); ((DefaultSocketSessionConfig) acceptor.getSessionConfig()).setTcpNoDelay(true);
KeepAliveFilter keepAliveFilter = new KeepAliveFilter(this, IdleStatus.WRITER_IDLE);
KeepAliveFilter keepAliveFilter = new KeepAliveFilter(this,IdleStatus.WRITER_IDLE);
keepAliveFilter.setRequestInterval(IDLE_TIME); keepAliveFilter.setRequestInterval(IDLE_TIME);
keepAliveFilter.setRequestTimeout(TIME_OUT); keepAliveFilter.setRequestTimeout(TIME_OUT);
keepAliveFilter.setForwardEvent(true); keepAliveFilter.setForwardEvent(true);
acceptor.getFilterChain().addLast("executor",new ExecutorFilter()); acceptor.getFilterChain().addLast("executor", new ExecutorFilter());
acceptor.getFilterChain().addLast("logger",new LoggingFilter()); acceptor.getFilterChain().addLast("logger", new LoggingFilter());
acceptor.getFilterChain().addLast("codec",new ProtocolCodecFilter(new ServerMessageCodecFactory())); acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new ServerMessageCodecFactory()));
acceptor.getFilterChain().addLast("heartbeat",keepAliveFilter); acceptor.getFilterChain().addLast("heartbeat", keepAliveFilter);
acceptor.setHandler(this); acceptor.setHandler(this);
acceptor.bind(new InetSocketAddress(port)); acceptor.bind(new InetSocketAddress(port));
} }
public void unbind() public void unbind() {
{
acceptor.unbind(); acceptor.unbind();
} }
public void sessionCreated(IoSession session) { public void sessionCreated(IoSession session) {
logger.warn("sessionCreated()... from "+session.getRemoteAddress()+" nid:" + session.getId()); logger.warn("sessionCreated()... from " + session.getRemoteAddress() + " nid:" + session.getId());
} }
public void messageReceived(IoSession ios, Object message){ public void messageReceived(IoSession ios, Object message) {
SentBody body = (SentBody) message; SentBody body = (SentBody) message;
CIMRequestHandler handler = handlers.get(body.getKey()); CIMRequestHandler handler = handlers.get(body.getKey());
if (handler == null) { if (handler == null) {
ReplyBody reply = new ReplyBody(); ReplyBody reply = new ReplyBody();
reply.setKey(body.getKey()); reply.setKey(body.getKey());
reply.setCode(CIMConstant.ReturnCode.CODE_404); reply.setCode(CIMConstant.ReturnCode.CODE_404);
reply.setMessage("KEY:"+body.getKey()+" not defined on server"); reply.setMessage("KEY:" + body.getKey() + " not defined on server");
ios.write(reply); ios.write(reply);
} else { } else {
ReplyBody reply = handler.process(new CIMSession(ios), body); ReplyBody reply = handler.process(new CIMSession(ios), body);
if(reply!=null) if (reply != null) {
{
reply.setKey(body.getKey()); reply.setKey(body.getKey());
ios.write(reply); ios.write(reply);
} }
} }
} }
/** /**
*/ */
public void sessionClosed(IoSession session) { public void sessionClosed(IoSession session) {
CIMSession cimSession =new CIMSession(session); CIMSession cimSession = new CIMSession(session);
logger.warn("sessionClosed()... from "+session.getRemoteAddress()+" nid:"+cimSession.getNid() +",isConnected:"+session.isConnected()); logger.warn("sessionClosed()... from " + session.getRemoteAddress() + " nid:" + cimSession.getNid()
+ ",isConnected:" + session.isConnected());
CIMRequestHandler handler = handlers.get(CIMSESSION_CLOSED_HANDLER_KEY); CIMRequestHandler handler = handlers.get(CIMSESSION_CLOSED_HANDLER_KEY);
if(handler!=null) if (handler != null) {
{
handler.process(cimSession, null); handler.process(cimSession, null);
} }
} }
@ -141,14 +134,15 @@ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveM
/** /**
*/ */
public void sessionIdle(IoSession session, IdleStatus status) { public void sessionIdle(IoSession session, IdleStatus status) {
logger.warn("sessionIdle()... from "+session.getRemoteAddress()+" nid:" + session.getId()); logger.warn("sessionIdle()... from " + session.getRemoteAddress() + " nid:" + session.getId());
} }
/** /**
*/ */
public void exceptionCaught(IoSession session, Throwable cause){ public void exceptionCaught(IoSession session, Throwable cause) {
logger.error("exceptionCaught()... from "+session.getRemoteAddress()+" isConnected:"+session.isConnected()+" nid:" + session.getId(),cause); logger.error("exceptionCaught()... from " + session.getRemoteAddress() + " isConnected:" + session.isConnected()
+ " nid:" + session.getId(), cause);
session.closeNow(); session.closeNow();
} }
@ -157,8 +151,6 @@ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveM
public void messageSent(IoSession session, Object message) throws Exception { public void messageSent(IoSession session, Object message) throws Exception {
} }
@Override @Override
public Object getRequest(IoSession session) { public Object getRequest(IoSession session) {
return HeartbeatRequest.getInstance(); return HeartbeatRequest.getInstance();
@ -179,15 +171,12 @@ public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveM
return arg1 instanceof HeartbeatResponse; return arg1 instanceof HeartbeatResponse;
} }
public Map<Long,IoSession> getManagedSessions() public Map<Long, IoSession> getManagedSessions() {
{
return acceptor.getManagedSessions(); return acceptor.getManagedSessions();
} }
public IoSession getManagedSession(Long nid) public IoSession getManagedSession(Long nid) {
{ if (nid == null) {
if(nid == null)
{
return null; return null;
} }

2
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java
View File

@ -31,5 +31,5 @@ import com.farsunset.cim.sdk.server.session.CIMSession;
public interface CIMRequestHandler { public interface CIMRequestHandler {
ReplyBody process(CIMSession session,SentBody message); ReplyBody process(CIMSession session, SentBody message);
} }

2
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/handler/WebsocketHandler.java
View File

@ -27,8 +27,10 @@ import com.farsunset.cim.sdk.server.model.ReplyBody;
import com.farsunset.cim.sdk.server.model.SentBody; import com.farsunset.cim.sdk.server.model.SentBody;
import com.farsunset.cim.sdk.server.model.WebsocketResponse; import com.farsunset.cim.sdk.server.model.WebsocketResponse;
import com.farsunset.cim.sdk.server.session.CIMSession; import com.farsunset.cim.sdk.server.session.CIMSession;
/** /**
* 处理websocket握手请求，返回响应的报文给浏览器 * 处理websocket握手请求，返回响应的报文给浏览器
*
* @author Iraid * @author Iraid
* *
*/ */

8
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java
View File

@ -26,11 +26,12 @@ import java.io.UnsupportedEncodingException;
import com.farsunset.cim.sdk.server.constant.CIMConstant; import com.farsunset.cim.sdk.server.constant.CIMConstant;
import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable; import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable;
/** /**
* 服务端心跳请求 * 服务端心跳请求
* *
*/ */
public class HeartbeatRequest implements Serializable,EncodeFormatable { public class HeartbeatRequest implements Serializable, EncodeFormatable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String TAG = "SERVER_HEARTBEAT_REQUEST"; private static final String TAG = "SERVER_HEARTBEAT_REQUEST";
@ -38,7 +39,7 @@ public class HeartbeatRequest implements Serializable,EncodeFormatable {
private static HeartbeatRequest object = new HeartbeatRequest(); private static HeartbeatRequest object = new HeartbeatRequest();
private HeartbeatRequest(){ private HeartbeatRequest() {
} }
@ -51,7 +52,7 @@ public class HeartbeatRequest implements Serializable,EncodeFormatable {
return CMD_HEARTBEAT_RESPONSE.getBytes(); return CMD_HEARTBEAT_RESPONSE.getBytes();
} }
public String toString(){ public String toString() {
return TAG; return TAG;
} }
@ -65,7 +66,6 @@ public class HeartbeatRequest implements Serializable,EncodeFormatable {
return null; return null;
} }
@Override @Override
public byte getDataType() { public byte getDataType() {
return CIMConstant.ProtobufType.S_H_RQ; return CIMConstant.ProtobufType.S_H_RQ;

3
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java
View File

@ -23,7 +23,6 @@ package com.farsunset.cim.sdk.server.model;
import java.io.Serializable; import java.io.Serializable;
/** /**
* 客户端心跳响应 * 客户端心跳响应
*/ */
@ -42,10 +41,8 @@ public class HeartbeatResponse implements Serializable {
return object; return object;
} }
public String toString() { public String toString() {
return TAG; return TAG;
} }
} }

33
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/Message.java
View File

@ -27,20 +27,19 @@ import com.alibaba.fastjson.JSONObject;
import com.farsunset.cim.sdk.server.constant.CIMConstant; import com.farsunset.cim.sdk.server.constant.CIMConstant;
import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable; import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable;
import com.farsunset.cim.sdk.server.model.proto.MessageProto; import com.farsunset.cim.sdk.server.model.proto.MessageProto;
/** /**
* 消息对象 * 消息对象
*/ */
public class Message implements Serializable,EncodeFormatable { public class Message implements Serializable, EncodeFormatable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 消息类型，用户自定义消息类别 * 消息类型，用户自定义消息类别
*/ */
private String mid; private String mid;
/** /**
* 消息类型，用户自定义消息类别 * 消息类型，用户自定义消息类别
*/ */
@ -75,12 +74,10 @@ public class Message implements Serializable,EncodeFormatable {
private long timestamp; private long timestamp;
public Message() {
public Message()
{
timestamp = System.currentTimeMillis(); timestamp = System.currentTimeMillis();
} }
public long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }
@ -89,14 +86,14 @@ public class Message implements Serializable,EncodeFormatable {
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getAction() { public String getAction() {
return action; return action;
} }
public void setAction(String action) { public void setAction(String action) {
this.action = action; this.action = action;
} }
public String getTitle() { public String getTitle() {
return title; return title;
} }
@ -129,7 +126,6 @@ public class Message implements Serializable,EncodeFormatable {
this.receiver = receiver; this.receiver = receiver;
} }
public String getFormat() { public String getFormat() {
return format; return format;
} }
@ -138,17 +134,14 @@ public class Message implements Serializable,EncodeFormatable {
this.format = format; this.format = format;
} }
public String getExtra() { public String getExtra() {
return extra; return extra;
} }
public void setExtra(String extra) { public void setExtra(String extra) {
this.extra = extra; this.extra = extra;
} }
public String getMid() { public String getMid() {
return mid; return mid;
} }
@ -174,8 +167,9 @@ public class Message implements Serializable,EncodeFormatable {
} }
public boolean isNotEmpty(String txt) { public boolean isNotEmpty(String txt) {
return txt != null && txt.trim().length()!=0; return txt != null && txt.trim().length() != 0;
} }
@Override @Override
public byte[] getProtobufBody() { public byte[] getProtobufBody() {
MessageProto.Model.Builder builder = MessageProto.Model.newBuilder(); MessageProto.Model.Builder builder = MessageProto.Model.newBuilder();
@ -188,16 +182,16 @@ public class Message implements Serializable,EncodeFormatable {
/** /**
* 下面字段可能为空 * 下面字段可能为空
*/ */
if(content!=null){ if (content != null) {
builder.setContent(content); builder.setContent(content);
} }
if(title!=null){ if (title != null) {
builder.setTitle(title); builder.setTitle(title);
} }
if(extra!=null){ if (extra != null) {
builder.setExtra(extra); builder.setExtra(extra);
} }
if(format!=null){ if (format != null) {
builder.setFormat(format); builder.setFormat(format);
} }
return builder.build().toByteArray(); return builder.build().toByteArray();
@ -224,6 +218,7 @@ public class Message implements Serializable,EncodeFormatable {
} }
return null; return null;
} }
@Override @Override
public byte getDataType() { public byte getDataType() {
return CIMConstant.ProtobufType.MESSAGE; return CIMConstant.ProtobufType.MESSAGE;

27
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/ReplyBody.java
View File

@ -31,11 +31,12 @@ import com.alibaba.fastjson.JSONObject;
import com.farsunset.cim.sdk.server.constant.CIMConstant; import com.farsunset.cim.sdk.server.constant.CIMConstant;
import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable; import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable;
import com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto; import com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto;
/** /**
* 请求应答对象 * 请求应答对象
* *
*/ */
public class ReplyBody implements Serializable ,EncodeFormatable{ public class ReplyBody implements Serializable, EncodeFormatable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -44,7 +45,6 @@ public class ReplyBody implements Serializable ,EncodeFormatable{
*/ */
private String key; private String key;
/** /**
* 返回码 * 返回码
*/ */
@ -60,13 +60,12 @@ public class ReplyBody implements Serializable ,EncodeFormatable{
*/ */
private HashMap<String, String> data = new HashMap<String, String>(); private HashMap<String, String> data = new HashMap<String, String>();
private long timestamp; private long timestamp;
public ReplyBody() public ReplyBody() {
{
timestamp = System.currentTimeMillis(); timestamp = System.currentTimeMillis();
} }
public long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }
@ -75,8 +74,6 @@ public class ReplyBody implements Serializable ,EncodeFormatable{
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getKey() { public String getKey() {
return key; return key;
} }
@ -86,7 +83,7 @@ public class ReplyBody implements Serializable ,EncodeFormatable{
} }
public void put(String k, String v) { public void put(String k, String v) {
if(v!=null && k!=null){ if (v != null && k != null) {
data.put(k, v); data.put(k, v);
} }
} }
@ -124,18 +121,16 @@ public class ReplyBody implements Serializable ,EncodeFormatable{
} }
@Override @Override
public String toString() public String toString() {
{
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#ReplyBody#").append("\n"); buffer.append("#ReplyBody#").append("\n");
buffer.append("key:").append(this.getKey()).append("\n"); buffer.append("key:").append(this.getKey()).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n"); buffer.append("timestamp:").append(timestamp).append("\n");
buffer.append("code:").append(code).append("\n"); buffer.append("code:").append(code).append("\n");
if(!data.isEmpty()){ if (!data.isEmpty()) {
buffer.append("data{").append("\n"); buffer.append("data{").append("\n");
for(String key:getKeySet()) for (String key : getKeySet()) {
{
buffer.append(key).append(":").append(this.get(key)).append("\n"); buffer.append(key).append(":").append(this.get(key)).append("\n");
} }
buffer.append("}"); buffer.append("}");
@ -143,14 +138,15 @@ public class ReplyBody implements Serializable ,EncodeFormatable{
return buffer.toString(); return buffer.toString();
} }
@Override @Override
public byte[] getProtobufBody() { public byte[] getProtobufBody() {
ReplyBodyProto.Model.Builder builder = ReplyBodyProto.Model.newBuilder(); ReplyBodyProto.Model.Builder builder = ReplyBodyProto.Model.newBuilder();
builder.setCode(code); builder.setCode(code);
if(message!=null){ if (message != null) {
builder.setMessage(message); builder.setMessage(message);
} }
if(!data.isEmpty()){ if (!data.isEmpty()) {
builder.putAllData(data); builder.putAllData(data);
} }
builder.setKey(key); builder.setKey(key);
@ -163,6 +159,7 @@ public class ReplyBody implements Serializable ,EncodeFormatable{
public byte getDataType() { public byte getDataType() {
return CIMConstant.ProtobufType.REPLYBODY; return CIMConstant.ProtobufType.REPLYBODY;
} }
@Override @Override
public byte[] getJSONBody() { public byte[] getJSONBody() {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();

13
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/SentBody.java
View File

@ -25,6 +25,7 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
/** /**
* java |android 客户端请求结构 * java |android 客户端请求结构
* *
@ -59,13 +60,12 @@ public class SentBody implements Serializable {
this.key = key; this.key = key;
} }
public void remove(String k) { public void remove(String k) {
data.remove(k); data.remove(k);
} }
public void put(String k, String v) { public void put(String k, String v) {
if(v!=null && k!=null){ if (v != null && k != null) {
data.put(k, v); data.put(k, v);
} }
} }
@ -78,18 +78,17 @@ public class SentBody implements Serializable {
return data.keySet(); return data.keySet();
} }
@Override @Override
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#SentBody#").append("\n");; buffer.append("#SentBody#").append("\n");
;
buffer.append("key:").append(key).append("\n"); buffer.append("key:").append(key).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n"); buffer.append("timestamp:").append(timestamp).append("\n");
if(!data.isEmpty()){ if (!data.isEmpty()) {
buffer.append("data{").append("\n"); buffer.append("data{").append("\n");
for(String key:getKeySet()) for (String key : getKeySet()) {
{
buffer.append(key).append(":").append(this.get(key)).append("\n"); buffer.append(key).append(":").append(this.get(key)).append("\n");
} }
buffer.append("}"); buffer.append("}");

6
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/WebsocketResponse.java
View File

@ -22,11 +22,12 @@
package com.farsunset.cim.sdk.server.model; package com.farsunset.cim.sdk.server.model;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
/** /**
*websocket握手响应结果 * websocket握手响应结果
* *
*/ */
public class WebsocketResponse{ public class WebsocketResponse {
private String token; private String token;
@ -42,6 +43,7 @@ public class WebsocketResponse{
} }
return null; return null;
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();

3
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/feature/EncodeFormatable.java
View File

@ -20,11 +20,14 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.server.model.feature; package com.farsunset.cim.sdk.server.model.feature;
/** /**
* 需要向另一端发送的结构体 * 需要向另一端发送的结构体
*/ */
public interface EncodeFormatable { public interface EncodeFormatable {
byte[] getProtobufBody(); byte[] getProtobufBody();
byte[] getJSONBody(); byte[] getJSONBody();
byte getDataType(); byte getDataType();
} }

617
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/proto/MessageProto.java
View File

File diff suppressed because it is too large Load Diff

669
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java
View File

File diff suppressed because it is too large Load Diff

587
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/model/proto/SentBodyProto.java
View File

File diff suppressed because it is too large Load Diff

112
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/session/CIMSession.java
View File

@ -35,7 +35,7 @@ import com.farsunset.cim.sdk.server.constant.CIMConstant;
* IoSession包装类,集群时 将此对象存入表中 * IoSession包装类,集群时 将此对象存入表中
*/ */
public class CIMSession implements Serializable{ public class CIMSession implements Serializable {
/** /**
* *
@ -45,8 +45,8 @@ public class CIMSession implements Serializable{
public transient static String HOST = "HOST"; public transient static String HOST = "HOST";
public transient static final int STATUS_ENABLED = 0; public transient static final int STATUS_ENABLED = 0;
public transient static final int STATUS_DISABLED = 1; public transient static final int STATUS_DISABLED = 1;
public transient static final int APNS_ON=1; public transient static final int APNS_ON = 1;
public transient static final int APNS_OFF=0; public transient static final int APNS_OFF = 0;
public transient static String CHANNEL_IOS = "ios"; public transient static String CHANNEL_IOS = "ios";
public transient static String CHANNEL_ANDROID = "android"; public transient static String CHANNEL_ANDROID = "android";
@ -56,36 +56,33 @@ public class CIMSession implements Serializable{
private transient IoSession session; private transient IoSession session;
private String gid;//session全局ID private String gid;// session全局ID
private Long nid;//session在本台服务器上的ID private Long nid;// session在本台服务器上的ID
private String deviceId;//客户端ID (设备号码+应用包名),ios为devicetoken private String deviceId;// 客户端ID (设备号码+应用包名),ios为devicetoken
private String host;//session绑定的服务器IP private String host;// session绑定的服务器IP
private String account;//session绑定的账号 private String account;// session绑定的账号
private String channel;//终端设备类型 private String channel;// 终端设备类型
private String deviceModel;//终端设备型号 private String deviceModel;// 终端设备型号
private String clientVersion;//终端应用版本 private String clientVersion;// 终端应用版本
private String systemVersion;//终端系统版本 private String systemVersion;// 终端系统版本
private String packageName;//终端应用包名 private String packageName;// 终端应用包名
private Long bindTime;//登录时间 private Long bindTime;// 登录时间
private Long heartbeat;//心跳时间 private Long heartbeat;// 心跳时间
private Double longitude;//经度 private Double longitude;// 经度
private Double latitude;//维度 private Double latitude;// 维度
private String location;//位置 private String location;// 位置
private int apnsAble;//apns推送状态 private int apnsAble;// apns推送状态
private int status;// 状态 private int status;// 状态
public CIMSession(IoSession session) { public CIMSession(IoSession session) {
this.session = session; this.session = session;
this.nid = session.getId(); this.nid = session.getId();
} }
public CIMSession() public CIMSession() {
{
} }
public String getAccount() { public String getAccount() {
return account; return account;
} }
@ -96,11 +93,6 @@ public class CIMSession implements Serializable{
setAttribute(CIMConstant.SESSION_KEY, account); setAttribute(CIMConstant.SESSION_KEY, account);
} }
public Double getLongitude() { public Double getLongitude() {
return longitude; return longitude;
} }
@ -151,7 +143,6 @@ public class CIMSession implements Serializable{
return deviceId; return deviceId;
} }
public String getChannel() { public String getChannel() {
return channel; return channel;
} }
@ -178,15 +169,10 @@ public class CIMSession implements Serializable{
setAttribute("deviceId", deviceId); setAttribute("deviceId", deviceId);
} }
public String getHost() { public String getHost() {
return host; return host;
} }
public Long getBindTime() { public Long getBindTime() {
return bindTime; return bindTime;
} }
@ -196,7 +182,6 @@ public class CIMSession implements Serializable{
setAttribute("bindTime", bindTime); setAttribute("bindTime", bindTime);
} }
public String getClientVersion() { public String getClientVersion() {
return clientVersion; return clientVersion;
} }
@ -206,10 +191,6 @@ public class CIMSession implements Serializable{
setAttribute("clientVersion", clientVersion); setAttribute("clientVersion", clientVersion);
} }
public String getSystemVersion() { public String getSystemVersion() {
return systemVersion; return systemVersion;
} }
@ -234,9 +215,6 @@ public class CIMSession implements Serializable{
setAttribute("host", host); setAttribute("host", host);
} }
public int getApnsAble() { public int getApnsAble() {
return apnsAble; return apnsAble;
} }
@ -255,39 +233,36 @@ public class CIMSession implements Serializable{
setAttribute("status", status); setAttribute("status", status);
} }
public void setAttribute(String key, Object value) { public void setAttribute(String key, Object value) {
if(session!=null) if (session != null)
session.setAttribute(key, value); session.setAttribute(key, value);
} }
public boolean containsAttribute(String key) { public boolean containsAttribute(String key) {
if(session!=null) if (session != null)
return session.containsAttribute(key); return session.containsAttribute(key);
return false; return false;
} }
public Object getAttribute(String key) { public Object getAttribute(String key) {
if(session!=null) if (session != null)
return session.getAttribute(key); return session.getAttribute(key);
return null; return null;
} }
public void removeAttribute(String key) { public void removeAttribute(String key) {
if(session!=null) if (session != null)
session.removeAttribute(key); session.removeAttribute(key);
} }
public SocketAddress getRemoteAddress() { public SocketAddress getRemoteAddress() {
if(session!=null) if (session != null)
return session.getRemoteAddress(); return session.getRemoteAddress();
return null; return null;
} }
public boolean write(Object msg) { public boolean write(Object msg) {
if(session!=null) if (session != null) {
{
WriteFuture future = session.write(msg); WriteFuture future = session.write(msg);
future.awaitUninterruptibly(10 * 1000); future.awaitUninterruptibly(10 * 1000);
return future.isWritten(); return future.isWritten();
@ -297,21 +272,18 @@ public class CIMSession implements Serializable{
} }
public boolean isConnected() { public boolean isConnected() {
if(session != null) if (session != null) {
{
return session.isConnected(); return session.isConnected();
} }
if(!isLocalhost()) if (!isLocalhost()) {
{
return status == STATUS_ENABLED; return status == STATUS_ENABLED;
} }
return false; return false;
} }
public boolean isLocalhost() public boolean isLocalhost() {
{
try { try {
String ip = InetAddress.getLocalHost().getHostAddress(); String ip = InetAddress.getLocalHost().getHostAddress();
@ -323,18 +295,16 @@ public class CIMSession implements Serializable{
} }
public void closeNow() { public void closeNow() {
if(session!=null) if (session != null)
session.closeNow(); session.closeNow();
} }
public void closeOnFlush() { public void closeOnFlush() {
if(session!=null) if (session != null)
session.closeOnFlush(); session.closeOnFlush();
} }
public void setPackageName(String packageName) { public void setPackageName(String packageName) {
this.packageName = packageName; this.packageName = packageName;
setAttribute("packageName", apnsAble); setAttribute("packageName", apnsAble);
@ -344,15 +314,14 @@ public class CIMSession implements Serializable{
return packageName; return packageName;
} }
public int hashCode() {
public int hashCode(){
return (deviceId + nid + host).hashCode(); return (deviceId + nid + host).hashCode();
} }
public boolean equals(Object o) { public boolean equals(Object o) {
if(o instanceof CIMSession){ if (o instanceof CIMSession) {
return hashCode() == o.hashCode(); return hashCode() == o.hashCode();
} }
return false; return false;
@ -363,8 +332,7 @@ public class CIMSession implements Serializable{
if (o instanceof CIMSession) { if (o instanceof CIMSession) {
CIMSession t = (CIMSession) o; CIMSession t = (CIMSession) o;
if(t.deviceId!=null && deviceId!=null) if (t.deviceId != null && deviceId != null) {
{
return !t.deviceId.equals(deviceId); return !t.deviceId.equals(deviceId);
} }
} }
@ -384,10 +352,7 @@ public class CIMSession implements Serializable{
return session; return session;
} }
public String toString() {
public String toString()
{
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("{"); buffer.append("{");
@ -397,7 +362,8 @@ public class CIMSession implements Serializable{
buffer.append("\"").append("host").append("\":").append("\"").append(host).append("\"").append(","); buffer.append("\"").append("host").append("\":").append("\"").append(host).append("\"").append(",");
buffer.append("\"").append("account").append("\":").append("\"").append(account).append("\"").append(","); buffer.append("\"").append("account").append("\":").append("\"").append(account).append("\"").append(",");
buffer.append("\"").append("channel").append("\":").append("\"").append(channel).append("\"").append(","); buffer.append("\"").append("channel").append("\":").append("\"").append(channel).append("\"").append(",");
buffer.append("\"").append("deviceModel").append("\":").append("\"").append(deviceModel).append("\"").append(","); buffer.append("\"").append("deviceModel").append("\":").append("\"").append(deviceModel).append("\"")
.append(",");
buffer.append("\"").append("status").append("\":").append(status).append(","); buffer.append("\"").append("status").append("\":").append(status).append(",");
buffer.append("\"").append("apnsAble").append("\":").append(apnsAble).append(","); buffer.append("\"").append("apnsAble").append("\":").append(apnsAble).append(",");
buffer.append("\"").append("bindTime").append("\":").append(bindTime).append(","); buffer.append("\"").append("bindTime").append("\":").append(bindTime).append(",");
@ -407,6 +373,4 @@ public class CIMSession implements Serializable{
} }
} }

26
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/session/DefaultSessionManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.server.session; package com.farsunset.cim.sdk.server.session;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -28,25 +29,20 @@ import java.util.concurrent.atomic.AtomicInteger;
import com.farsunset.cim.sdk.server.constant.CIMConstant; import com.farsunset.cim.sdk.server.constant.CIMConstant;
/** /**
* 自带默认 session管理实现， 各位可以自行实现 AbstractSessionManager接口来实现自己的 session管理 * 自带默认 session管理实现， 各位可以自行实现 AbstractSessionManager接口来实现自己的 session管理 服务器集群时
*服务器集群时 须要将CIMSession 信息存入数据库或者nosql 等 第三方存储空间中，便于所有服务器都可以访问 * 须要将CIMSession 信息存入数据库或者nosql 等 第三方存储空间中，便于所有服务器都可以访问
*/ */
public class DefaultSessionManager implements SessionManager{ public class DefaultSessionManager implements SessionManager {
private static HashMap<String,CIMSession> sessions =new HashMap<String,CIMSession>();
private static HashMap<String, CIMSession> sessions = new HashMap<String, CIMSession>();
private static final AtomicInteger connectionsCounter = new AtomicInteger(0); private static final AtomicInteger connectionsCounter = new AtomicInteger(0);
/** /**
* *
*/ */
public void add(CIMSession session) { public void add(CIMSession session) {
if(session!=null) if (session != null) {
{
session.setAttribute(CIMConstant.SESSION_KEY, session.getAccount()); session.setAttribute(CIMConstant.SESSION_KEY, session.getAccount());
sessions.put(session.getAccount(), session); sessions.put(session.getAccount(), session);
connectionsCounter.incrementAndGet(); connectionsCounter.incrementAndGet();
@ -54,14 +50,11 @@ public class DefaultSessionManager implements SessionManager{
} }
public CIMSession get(String account) { public CIMSession get(String account) {
return sessions.get(account); return sessions.get(account);
} }
public List<CIMSession> queryAll() { public List<CIMSession> queryAll() {
List<CIMSession> list = new ArrayList<CIMSession>(); List<CIMSession> list = new ArrayList<CIMSession>();
list.addAll(sessions.values()); list.addAll(sessions.values());
@ -70,24 +63,19 @@ public class DefaultSessionManager implements SessionManager{
public void remove(CIMSession session) { public void remove(CIMSession session) {
sessions.remove(session.getAttribute(CIMConstant.SESSION_KEY)); sessions.remove(session.getAttribute(CIMConstant.SESSION_KEY));
} }
public void remove(String account) { public void remove(String account) {
sessions.remove(account); sessions.remove(account);
} }
public boolean containsCIMSession(String account) {
public boolean containsCIMSession(String account)
{
return sessions.containsKey(account); return sessions.containsKey(account);
} }
@Override @Override
public void update(CIMSession session) { public void update(CIMSession session) {
sessions.put(session.getAccount(), session); sessions.put(session.getAccount(), session);

11
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/sdk/server/session/SessionManager.java
View File

@ -23,15 +23,12 @@ package com.farsunset.cim.sdk.server.session;
import java.util.List; import java.util.List;
/** /**
* 客户端的 session管理接口 * 客户端的 session管理接口 可自行实现此接口管理session
* 可自行实现此接口管理session
*/ */
public interface SessionManager { public interface SessionManager {
/** /**
* 添加新的session * 添加新的session
*/ */
@ -44,20 +41,22 @@ public interface SessionManager {
/** /**
* *
* @param account 客户端session的 key 一般可用 用户账号来对应session * @param account
* 客户端session的 key 一般可用 用户账号来对应session
* @return * @return
*/ */
CIMSession get(String account); CIMSession get(String account);
/** /**
* 获取所有session * 获取所有session
*
* @return * @return
*/ */
public List<CIMSession> queryAll(); public List<CIMSession> queryAll();
/** /**
* 删除session * 删除session
*
* @param session * @param session
*/ */
public void remove(String account); public void remove(String account);

26
cim_for_mina/cim-server/WebContent/console/webclient/cim.web.sdk.js
View File

@ -5,6 +5,8 @@ var SDK_VERSION = "1.0.0";
var SDK_CHANNEL = "browser"; var SDK_CHANNEL = "browser";
var APP_PACKAGE = "com.farsunset.webcim"; var APP_PACKAGE = "com.farsunset.webcim";
var ACCOUNT; var ACCOUNT;
const ACTION_999 = "999";//特殊的消息类型，代表被服务端强制下线
var socket; var socket;
var manualStop = false; var manualStop = false;
var CIMWebBridge = new Object(); var CIMWebBridge = new Object();
@ -37,6 +39,12 @@ CIMWebBridge.stop = function(){
socket.close(); socket.close();
}; };
CIMWebBridge.resume = function(){
manualStop = false;
CIMWebBridge.connection();
};
CIMWebBridge.innerOnConnectionSuccessed = function(){ CIMWebBridge.innerOnConnectionSuccessed = function(){
if(typeof onConnectionSuccessed != 'undefined' && onConnectionSuccessed instanceof Function){ if(typeof onConnectionSuccessed != 'undefined' && onConnectionSuccessed instanceof Function){
onConnectionSuccessed(); onConnectionSuccessed();
@ -53,12 +61,13 @@ CIMWebBridge.innerOnMessageReceived = function(e){
*/ */
if(data == CMD_HEARTBEAT_REQUEST){ if(data == CMD_HEARTBEAT_REQUEST){
socket.send(CMD_HEARTBEAT_RESPONSE); socket.send(CMD_HEARTBEAT_RESPONSE);
return return;
} }
var json = JSON.parse(data); var json = JSON.parse(data);
if(json.contentType == "Message" && typeof onMessageReceived != 'undefined' && onMessageReceived instanceof Function){ if(json.contentType == "Message"){
onMessageReceived(json); onInterceptMessageReceived(json);
return;
} }
if(json.contentType == "ReplyBody" && typeof onReplyReceived != 'undefined' && onReplyReceived instanceof Function){ if(json.contentType == "ReplyBody" && typeof onReplyReceived != 'undefined' && onReplyReceived instanceof Function){
@ -76,6 +85,17 @@ CIMWebBridge.sendRequest = function(body){
socket.send(json); socket.send(json);
}; };
function onInterceptMessageReceived(message){
//被强制下线之后，不再继续连接服务端
if(message.action == ACTION_999){
manualStop = true;
}
//收到消息后，将消息发送给页面
if(onMessageReceived instanceof Function){
onMessageReceived(message);
}
}
function getBrowser() { function getBrowser() {
var explorer = window.navigator.userAgent.toLowerCase() ; var explorer = window.navigator.userAgent.toLowerCase() ;
// ie // ie

5
cim_for_mina/cim-server/WebContent/console/webclient/main.jsp
View File

@ -49,6 +49,11 @@
function onMessageReceived(message) function onMessageReceived(message)
{ {
if(message.acction == ACTION_999){
doHideDialog('MessageDialog');
doShowDialog('LoginDialog');
return ;
}
$("#messageList").append("<div class='alert alert-info' >"+message.content+"</div>"); $("#messageList").append("<div class='alert alert-info' >"+message.content+"</div>");
} }

19
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/admin/action/SessionAction.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.admin.action; package com.farsunset.cim.admin.action;
import java.io.IOException; import java.io.IOException;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
@ -32,6 +31,7 @@ import com.farsunset.cim.sdk.server.model.Message;
import com.farsunset.cim.sdk.server.session.DefaultSessionManager; import com.farsunset.cim.sdk.server.session.DefaultSessionManager;
import com.farsunset.cim.util.ContextHolder; import com.farsunset.cim.util.ContextHolder;
import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.ActionSupport;
public class SessionAction extends ActionSupport { public class SessionAction extends ActionSupport {
/** /**
@ -39,27 +39,22 @@ public class SessionAction extends ActionSupport {
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public String list() {
ServletActionContext.getRequest().setAttribute("sessionList",
((DefaultSessionManager) ContextHolder.getBean("CIMSessionManager")).queryAll());
public String list()
{
ServletActionContext.getRequest().setAttribute("sessionList", ((DefaultSessionManager) ContextHolder.getBean("CIMSessionManager")).queryAll());
return "list"; return "list";
} }
public void offline() throws IOException public void offline() throws IOException {
{
String account = ServletActionContext.getRequest().getParameter("account"); String account = ServletActionContext.getRequest().getParameter("account");
Message msg = new Message(); Message msg = new Message();
msg.setAction(CIMConstant.MessageAction.ACTION_999);//强行下线消息类型 msg.setAction(CIMConstant.MessageAction.ACTION_999);// 强行下线消息类型
msg.setReceiver(account); msg.setReceiver(account);
//向客户端 发送消息 // 向客户端 发送消息
ContextHolder.getBean(SystemMessagePusher.class).push(msg); ContextHolder.getBean(SystemMessagePusher.class).push(msg);
} }

80
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/api/action/MessageAction.java
View File

@ -41,7 +41,7 @@ import com.opensymphony.xwork2.ModelDriven;
* *
* @author farsunset (3979434@qq.com) * @author farsunset (3979434@qq.com)
*/ */
public class MessageAction extends ActionSupport implements ModelDriven<Message>{ public class MessageAction extends ActionSupport implements ModelDriven<Message> {
/** /**
* *
@ -51,35 +51,34 @@ public class MessageAction extends ActionSupport implements ModelDriven<Messa
/** /**
* 关于http参数获取， struts2 的模型驱动 比如 http 参数 sender=xiaomao&receiver=xiaogou * 关于http参数获取， struts2 的模型驱动 比如 http 参数 sender=xiaomao&receiver=xiaogou
* struts自动会将参数的值 存入getModel()返回的对象的对应属性中，即xiaomao会存入message.sender属性,xiaogou会存入message.receiver属性 * struts自动会将参数的值
* 存入getModel()返回的对象的对应属性中，即xiaomao会存入message.sender属性,xiaogou会存入message.receiver属性
* 省去了request.getParameter("sender")方式获取参数，，如果参数名在getModel()返回的对象中不存在，则需要用request.getParameter()获取 * 省去了request.getParameter("sender")方式获取参数，，如果参数名在getModel()返回的对象中不存在，则需要用request.getParameter()获取
* 其他相关*Action.java中 同理，这里做统一说明! * 其他相关*Action.java中 同理，这里做统一说明!
*/ */
public String send() throws Exception { public String send() throws Exception {
HashMap<String,Object> datamap = new HashMap<String,Object>(); HashMap<String, Object> datamap = new HashMap<String, Object>();
HashMap<String,String> data = new HashMap<String,String>(); HashMap<String, String> data = new HashMap<String, String>();
ServletActionContext.getResponse().setContentType("text/json;charset=UTF-8"); ServletActionContext.getResponse().setContentType("text/json;charset=UTF-8");
datamap.put("code", 200); datamap.put("code", 200);
try{ try {
checkParams(); checkParams();
message.setMid(StringUtil.getUUID()); message.setMid(StringUtil.getUUID());
if(Constants.MessageType.TYPE_2.equals(message.getAction())) if (Constants.MessageType.TYPE_2.equals(message.getAction())) {
{ // 向客户端 发送消息
//向客户端 发送消息
ContextHolder.getBean(SystemMessagePusher.class).push(message); ContextHolder.getBean(SystemMessagePusher.class).push(message);
}else } else {
{ // 向客户端 发送消息
//向客户端 发送消息 ((DefaultMessagePusher) ContextHolder.getBean("messagePusher")).push(message);
((DefaultMessagePusher)ContextHolder.getBean("messagePusher")).push(message);
} }
data.put("id", message.getMid()); data.put("id", message.getMid());
data.put("createTime", String.valueOf(message.getTimestamp())); data.put("createTime", String.valueOf(message.getTimestamp()));
datamap.put("data", data); datamap.put("data", data);
}catch(Exception e){ } catch (Exception e) {
datamap.put("code", 500); datamap.put("code", 500);
e.printStackTrace(); e.printStackTrace();
@ -89,45 +88,32 @@ public class MessageAction extends ActionSupport implements ModelDriven<Messa
return null; return null;
} }
/** /**
* 文件由客户端发往阿里云 OSS 存储 * 文件由客户端发往阿里云 OSS 存储
*
* @param messageServiceImpl * @param messageServiceImpl
*/ */
/* private void fileHandler(Message mo, HttpServletRequest request) throws IOException /*
{ * private void fileHandler(Message mo, HttpServletRequest request) throws
if(request instanceof MultiPartRequestWrapper){ * IOException { if(request instanceof MultiPartRequestWrapper){
MultiPartRequestWrapper pr = (MultiPartRequestWrapper) request; * MultiPartRequestWrapper pr = (MultiPartRequestWrapper) request;
if(pr.getFiles("file")!=null) * if(pr.getFiles("file")!=null) { File file = pr.getFiles("file")[0];
{ *
File file = pr.getFiles("file")[0]; * String fileType = request.getParameter("fileType"); String dir =
* dirMap.get(fileType); if(StringUtils.isEmpty(dir)) { throw new
* IllegalArgumentException("fileType:" +fileType+" 未定义" );
*
* } String path = request.getSession().getServletContext().getRealPath(dir);
* String uuid=UUID.randomUUID().toString().replaceAll("-", ""); File des = new
* File(path+"/"+uuid); FileUtil.copyFile(file, des); mo.setFile(dir+"/"+uuid);
* mo.setFileType(fileType); } }
*
* }
*/
String fileType = request.getParameter("fileType"); private void checkParams() throws ServletRequestBindingException {
String dir = dirMap.get(fileType);
if(StringUtils.isEmpty(dir))
{
throw new IllegalArgumentException("fileType:" +fileType+" 未定义" );
} if (StringUtils.isEmpty(message.getReceiver())) {
String path = request.getSession().getServletContext().getRealPath(dir);
String uuid=UUID.randomUUID().toString().replaceAll("-", "");
File des = new File(path+"/"+uuid);
FileUtil.copyFile(file, des);
mo.setFile(dir+"/"+uuid);
mo.setFileType(fileType);
}
}
}*/
private void checkParams() throws ServletRequestBindingException
{
if(StringUtils.isEmpty(message.getReceiver()))
{
throw new IllegalArgumentException("receiver 不能为空!"); throw new IllegalArgumentException("receiver 不能为空!");
} }
@ -139,6 +125,4 @@ public class MessageAction extends ActionSupport implements ModelDriven<Messa
return message; return message;
} }
} }

36
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
View File

@ -35,7 +35,6 @@ import com.farsunset.cim.sdk.server.session.DefaultSessionManager;
import com.farsunset.cim.util.ContextHolder; import com.farsunset.cim.util.ContextHolder;
import com.farsunset.cim.util.StringUtil; import com.farsunset.cim.util.StringUtil;
/** /**
* 账号绑定实现 * 账号绑定实现
* *
@ -56,7 +55,7 @@ public class BindHandler implements CIMRequestHandler {
newSession.setAccount(account); newSession.setAccount(account);
newSession.setDeviceId(message.get("deviceId")); newSession.setDeviceId(message.get("deviceId"));
newSession.setHost(InetAddress.getLocalHost().getHostAddress()); newSession.setHost(InetAddress.getLocalHost().getHostAddress());
newSession.setChannel( message.get("channel")); newSession.setChannel(message.get("channel"));
newSession.setDeviceModel(message.get("device")); newSession.setDeviceModel(message.get("device"));
newSession.setClientVersion(message.get("version")); newSession.setClientVersion(message.get("version"));
newSession.setSystemVersion(message.get("osVersion")); newSession.setSystemVersion(message.get("osVersion"));
@ -70,67 +69,56 @@ public class BindHandler implements CIMRequestHandler {
// 如果是账号已经在另一台终端登录。则让另一个终端下线 // 如果是账号已经在另一台终端登录。则让另一个终端下线
if (newSession.fromOtherDevice(oldSession)) { if (newSession.fromOtherDevice(oldSession)) {
sendForceOfflineMessage(oldSession, account,newSession.getDeviceModel()); sendForceOfflineMessage(oldSession, account, newSession.getDeviceModel());
} }
//如果是重复连接，则直接返回 // 如果是重复连接，则直接返回
if (newSession.equals(oldSession)) { if (newSession.equals(oldSession)) {
oldSession.setStatus(CIMSession.STATUS_ENABLED); oldSession.setStatus(CIMSession.STATUS_ENABLED);
sessionManager.update(oldSession); sessionManager.update(oldSession);
reply.put("sid", oldSession.getGid());
return reply; return reply;
} }
closeQuietly(oldSession); closeQuietly(oldSession);
// 第一次设置心跳时间为登录时间
//第一次设置心跳时间为登录时间
newSession.setBindTime(System.currentTimeMillis()); newSession.setBindTime(System.currentTimeMillis());
newSession.setHeartbeat(System.currentTimeMillis()); newSession.setHeartbeat(System.currentTimeMillis());
sessionManager.add(newSession); sessionManager.add(newSession);
} catch (Exception e) { } catch (Exception e) {
reply.setCode(CIMConstant.ReturnCode.CODE_500); reply.setCode(CIMConstant.ReturnCode.CODE_500);
e.printStackTrace(); e.printStackTrace();
} }
logger.debug("bind :account:" +message.get("account")+"-----------------------------" +reply.getCode()); logger.debug("bind :account:" + message.get("account") + "-----------------------------" + reply.getCode());
reply.put("sid", newSession.getGid());
return reply; return reply;
} }
private void sendForceOfflineMessage(CIMSession oldSession, String account, String deviceModel) {
private void sendForceOfflineMessage(CIMSession oldSession, String account,String deviceModel) {
Message msg = new Message(); Message msg = new Message();
msg.setMid(String.valueOf(System.currentTimeMillis())); msg.setMid(String.valueOf(System.currentTimeMillis()));
msg.setAction(CIMConstant.MessageAction.ACTION_999);// 强行下线消息类型 msg.setAction(CIMConstant.MessageAction.ACTION_999);// 强行下线消息类型
msg.setReceiver(account); msg.setReceiver(account);
msg.setContent(deviceModel); msg.setContent(deviceModel);
closeQuietly(oldSession, msg);
closeQuietly(oldSession,msg);
if (!oldSession.isLocalhost()) {
ContextHolder.getBean(SystemMessagePusher.class).push(msg); ContextHolder.getBean(SystemMessagePusher.class).push(msg);
} }
}
// 同一设备切换网络时关闭旧的连接
//同一设备切换网络时关闭旧的连接 private void closeQuietly(CIMSession oldSession) {
private void closeQuietly(CIMSession oldSession){ if (oldSession != null && oldSession.isConnected()) {
if(oldSession!=null && oldSession.isConnected()){
oldSession.removeAttribute(CIMConstant.SESSION_KEY); oldSession.removeAttribute(CIMConstant.SESSION_KEY);
oldSession.closeNow(); oldSession.closeNow();
} }
} }
//不同设备同一账号登录时关闭旧的连接 // 不同设备同一账号登录时关闭旧的连接
private void closeQuietly(CIMSession oldSession,Message msg){ private void closeQuietly(CIMSession oldSession, Message msg) {
if (oldSession.isConnected()) { if (oldSession.isConnected()) {
oldSession.write(msg); oldSession.write(msg);
oldSession.removeAttribute(CIMConstant.SESSION_KEY); oldSession.removeAttribute(CIMConstant.SESSION_KEY);

6
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
View File

@ -41,8 +41,8 @@ public class SessionClosedHandler implements CIMRequestHandler {
public ReplyBody process(CIMSession ios, SentBody message) { public ReplyBody process(CIMSession ios, SentBody message) {
Object account =ios.getAttribute(CIMConstant.SESSION_KEY); Object account = ios.getAttribute(CIMConstant.SESSION_KEY);
if(account == null){ if (account == null) {
return null; return null;
} }
DefaultSessionManager sessionManager = ((DefaultSessionManager) ContextHolder.getBean("CIMSessionManager")); DefaultSessionManager sessionManager = ((DefaultSessionManager) ContextHolder.getBean("CIMSessionManager"));
@ -53,6 +53,4 @@ public class SessionClosedHandler implements CIMRequestHandler {
return null; return null;
} }
} }

5
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/push/CIMMessagePusher.java
View File

@ -23,20 +23,17 @@ package com.farsunset.cim.push;
import com.farsunset.cim.sdk.server.model.Message; import com.farsunset.cim.sdk.server.model.Message;
/** /**
* 消息发送实接口 * 消息发送实接口
* *
*/ */
public interface CIMMessagePusher { public interface CIMMessagePusher {
/** /**
* 向用户发送消息 * 向用户发送消息
*
* @param msg * @param msg
*/ */
public void push(Message msg); public void push(Message msg);
} }

40
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
View File

@ -31,29 +31,26 @@ import com.farsunset.cim.sdk.server.session.DefaultSessionManager;
*/ */
public class DefaultMessagePusher implements CIMMessagePusher { public class DefaultMessagePusher implements CIMMessagePusher {
private DefaultSessionManager sessionManager; private DefaultSessionManager sessionManager;
public void setSessionManager(DefaultSessionManager sessionManager) { public void setSessionManager(DefaultSessionManager sessionManager) {
this.sessionManager = sessionManager; this.sessionManager = sessionManager;
} }
/** /**
* 向用户发送消息 * 向用户发送消息
*
* @param msg * @param msg
*/ */
public void push(Message msg) { public void push(Message msg) {
CIMSession session = sessionManager.get(msg.getReceiver()); CIMSession session = sessionManager.get(msg.getReceiver());
/* /*
* 服务器集群时，可以在此 * 服务器集群时，可以在此 判断当前session是否连接于本台服务器，如果是，继续往下走，如果不是，将此消息发往当前session连接的服务器并
* 判断当前session是否连接于本台服务器，如果是，继续往下走，如果不是，将此消息发往当前session连接的服务器并 return * return if(session!=null&&!session.isLocalhost()){//判断当前session是否连接于本台服务器，如不是
* if(session!=null&&!session.isLocalhost()){//判断当前session是否连接于本台服务器，如不是
* //发往目标服务器处理 * //发往目标服务器处理
* MessageDispatcher.execute(MessageUtil.transform(msg),session.getHost()); * MessageDispatcher.execute(MessageUtil.transform(msg),session.getHost());
* return; * return; }
* }
*/ */
if (session != null && session.isConnected()) { if (session != null && session.isConnected()) {
@ -65,32 +62,29 @@ public class DefaultMessagePusher implements CIMMessagePusher {
// 如果用户标示了APNS ON 说明这是ios设备需要使用apns发送 // 如果用户标示了APNS ON 说明这是ios设备需要使用apns发送
if (session != null && session.getApnsAble() == CIMSession.APNS_ON) { if (session != null && session.getApnsAble() == CIMSession.APNS_ON) {
apnsPush(1,msg.getContent(),session.getDeviceId()); apnsPush(1, msg.getContent(), session.getDeviceId());
} }
} }
/** /**
* 引入javaapns相关jar * 引入javaapns相关jar
*
* @param badge * @param badge
* @param content * @param content
* @param token * @param token
*/ */
private void apnsPush(int badge,String content,String token){ private void apnsPush(int badge, String content, String token) {
/*String password = "password"; /*
String keystore = "p12 文件 绝对路径"; * String password = "password"; String keystore = "p12 文件 绝对路径"; boolean
boolean isDebug = true; * isDebug = true;
*
PushNotificationPayload payload = PushNotificationPayload.complex(); * PushNotificationPayload payload = PushNotificationPayload.complex(); try {
try { * payload.addAlert(content); payload.addBadge(1); payload.addSound("default");
payload.addAlert(content); * Push.payload(payload, keystore, password, isDebug, token);
payload.addBadge(1); *
payload.addSound("default"); * } catch (Exception e) { e.printStackTrace(); }
Push.payload(payload, keystore, password, isDebug, token); */
} catch (Exception e) {
e.printStackTrace();
}*/
} }
} }

5
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java
View File

@ -23,11 +23,10 @@ package com.farsunset.cim.push;
import com.farsunset.cim.sdk.server.model.Message; import com.farsunset.cim.sdk.server.model.Message;
public class SystemMessagePusher extends DefaultMessagePusher{ public class SystemMessagePusher extends DefaultMessagePusher {
@Override @Override
public void push(Message message){ public void push(Message message) {
message.setSender("system"); message.setSender("system");
super.push(message); super.push(message);

24
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/session/ClusterSessionManager.java
View File

@ -26,34 +26,30 @@ import com.farsunset.cim.sdk.server.session.CIMSession;
import com.farsunset.cim.sdk.server.session.SessionManager; import com.farsunset.cim.sdk.server.session.SessionManager;
/** /**
* 集群 session管理实现示例， 各位可以自行实现 AbstractSessionManager接口来实现自己的 session管理 * 集群 session管理实现示例， 各位可以自行实现 AbstractSessionManager接口来实现自己的 session管理 服务器集群时
*服务器集群时 须要将CIMSession 信息存入数据库或者nosql 等 第三方存储空间中，便于所有服务器都可以访问 * 须要将CIMSession 信息存入数据库或者nosql 等 第三方存储空间中，便于所有服务器都可以访问
*/ */
public class ClusterSessionManager implements SessionManager{ public class ClusterSessionManager implements SessionManager {
public CIMSession get(String account) { public CIMSession get(String account) {
//这里查询数据库 // 这里查询数据库
/*CIMSession session = database.getSession(account); /*
session.setIoSession(ContextHolder.getBean(CIMNioSocketAcceptor.class).getManagedSessions().get(session.getNid())); * CIMSession session = database.getSession(account);
return session;*/ * session.setIoSession(ContextHolder.getBean(CIMNioSocketAcceptor.class).
* getManagedSessions().get(session.getNid())); return session;
*/
return null; return null;
} }
@Override @Override
public List<CIMSession> queryAll() { public List<CIMSession> queryAll() {
return null; return null;
} }
@Override @Override
public void remove(String account) { public void remove(String account) {
} }
@Override @Override
@ -66,6 +62,4 @@ public class ClusterSessionManager implements SessionManager{
} }
} }

46
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/util/Constants.java
View File

@ -23,47 +23,45 @@ package com.farsunset.cim.util;
public interface Constants { public interface Constants {
public class Common {
public class Common{ public final static String STATUS_1 = "1";
public final static String STATUS_1="1"; public final static String STATUS_0 = "0";
public final static String STATUS_0="0"; public final static String STATUS_2 = "2";
public final static String STATUS_2="2"; public final static String STATUS_3 = "3";
public final static String STATUS_3="3"; public final static String TYPR_1 = "1";
public final static String TYPR_1="1"; public final static String TYPR_2 = "2";
public final static String TYPR_2="2";
public final static String TYPR_9 = "9"; public final static String TYPR_9 = "9";
} }
public class User{
public final static Integer SUCCESS_CODE=1; public class User {
public final static Integer ERROR_CODE=0; public final static Integer SUCCESS_CODE = 1;
public final static String User="User"; public final static Integer ERROR_CODE = 0;
public final static String User = "User";
} }
public class RequestParam public class RequestParam {
{ public final static String CURRENTPAGE = "currentPage";
public final static String CURRENTPAGE="currentPage"; public final static String TYPE = "type";
public final static String TYPE="type";
public static final String SIZE = "size"; public static final String SIZE = "size";
} }
public class Number{ public class Number {
public final static Integer INT_0=0; public final static Integer INT_0 = 0;
public final static Integer INT_10=10; public final static Integer INT_10 = 10;
public final static Integer INT_403=403; public final static Integer INT_403 = 403;
} }
public static interface MessageType{ public static interface MessageType {
// 用户之间的普通消息
//用户之间的普通消息
public static final String TYPE_0 = "0"; public static final String TYPE_0 = "0";
//系统向用户发送的普通消息 // 系统向用户发送的普通消息
public static final String TYPE_2 = "2"; public static final String TYPE_2 = "2";
} }

13
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/util/ContextHolder.java
View File

@ -24,25 +24,22 @@ package com.farsunset.cim.util;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
public class ContextHolder implements ApplicationContextAware{
public class ContextHolder implements ApplicationContextAware {
private static ApplicationContext context; private static ApplicationContext context;
public static Object getBean(String name) public static Object getBean(String name) {
{
return context.getBean(name); return context.getBean(name);
} }
public static <T> T getBean(Class<T> c) public static <T> T getBean(Class<T> c) {
{
return context.getBean(c); return context.getBean(c);
} }
@Override @Override
public void setApplicationContext(ApplicationContext applicationContext) public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
throws BeansException {
context = applicationContext; context = applicationContext;
} }
} }

25
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/util/MessageDispatcher.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.util; package com.farsunset.cim.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
@ -39,20 +40,17 @@ import org.apache.http.util.EntityUtils;
import com.farsunset.cim.sdk.server.model.Message; import com.farsunset.cim.sdk.server.model.Message;
public class MessageDispatcher { public class MessageDispatcher {
private static BlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>(); private static BlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
private static ThreadPoolExecutor executor = new ThreadPoolExecutor(3, 5, 20, TimeUnit.SECONDS,queue);; private static ThreadPoolExecutor executor = new ThreadPoolExecutor(3, 5, 20, TimeUnit.SECONDS, queue);;
final static String sendUrl = "http://%1$s:8080/cim-servier/cgi/message_send.api"; final static String sendUrl = "http://%1$s:8080/cim-servier/cgi/message_send.api";
public static void execute(final Message msg,final String ip) public static void execute(final Message msg, final String ip) {
{
executor.execute(new Runnable() { executor.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
httpPost(String.format(sendUrl,ip),msg); httpPost(String.format(sendUrl, ip), msg);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -60,20 +58,18 @@ public class MessageDispatcher {
}); });
} }
private static String httpPost(String url, Message msg) throws Exception {
private static String httpPost(String url,Message msg) throws Exception
{
CloseableHttpClient httpclient = HttpClients.createDefault(); CloseableHttpClient httpclient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(url); HttpPost httpPost = new HttpPost(url);
List <NameValuePair> nvps = new ArrayList <NameValuePair>(); List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("mid", msg.getMid())); nvps.add(new BasicNameValuePair("mid", msg.getMid()));
nvps.add(new BasicNameValuePair("extra", msg.getExtra())); nvps.add(new BasicNameValuePair("extra", msg.getExtra()));
nvps.add(new BasicNameValuePair("action", msg.getAction())); nvps.add(new BasicNameValuePair("action", msg.getAction()));
nvps.add(new BasicNameValuePair("title", msg.getTitle())); nvps.add(new BasicNameValuePair("title", msg.getTitle()));
nvps.add(new BasicNameValuePair("content",msg.getContent())); nvps.add(new BasicNameValuePair("content", msg.getContent()));
nvps.add(new BasicNameValuePair("sender", msg.getSender())); nvps.add(new BasicNameValuePair("sender", msg.getSender()));
nvps.add(new BasicNameValuePair("receiver",msg.getReceiver())); nvps.add(new BasicNameValuePair("receiver", msg.getReceiver()));
nvps.add(new BasicNameValuePair("timestamp",String.valueOf(msg.getTimestamp()))); nvps.add(new BasicNameValuePair("timestamp", String.valueOf(msg.getTimestamp())));
httpPost.setEntity(new UrlEncodedFormEntity(nvps)); httpPost.setEntity(new UrlEncodedFormEntity(nvps));
CloseableHttpResponse response2 = httpclient.execute(httpPost); CloseableHttpResponse response2 = httpclient.execute(httpPost);
String data = null; String data = null;
@ -85,10 +81,7 @@ public class MessageDispatcher {
response2.close(); response2.close();
} }
return data; return data;
} }
} }

21
cim_for_mina/cim-server/src/main/java/com/farsunset/cim/util/StringUtil.java
View File

@ -25,35 +25,29 @@ import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
public class StringUtil { public class StringUtil {
public static boolean isEmpty(Object obj) {
public static boolean isEmpty(Object obj) if (null == obj)
{
if(null == obj)
return true; return true;
if("".equals(obj.toString().trim())) if ("".equals(obj.toString().trim())) {
{
return true; return true;
} }
return false; return false;
} }
public static boolean isNotEmpty(Object obj) public static boolean isNotEmpty(Object obj) {
{
return !isEmpty(obj); return !isEmpty(obj);
} }
public static String getSequenceId()
{ public static String getSequenceId() {
String mark = String.valueOf(System.currentTimeMillis()); String mark = String.valueOf(System.currentTimeMillis());
return mark; return mark;
} }
public static String getCurrentlyDateTime() { public static String getCurrentlyDateTime() {
SimpleDateFormat dateFormat = new SimpleDateFormat( SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
"yyyyMMddHHmmss");
return dateFormat.format(new Date()); return dateFormat.format(new Date());
} }
@ -73,5 +67,4 @@ public class StringUtil {
return UUID.randomUUID().toString().replaceAll("-", ""); return UUID.randomUUID().toString().replaceAll("-", "");
} }
} }

52
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheManager.java
View File

@ -26,8 +26,8 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
class CIMCacheManager {
class CIMCacheManager {
public static final String CIM_CONFIG_INFO = "CIM_CONFIG_INFO"; public static final String CIM_CONFIG_INFO = "CIM_CONFIG_INFO";
@ -45,16 +45,12 @@ class CIMCacheManager {
public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE"; public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE";
public static void remove(Context context, String key) {
public static void remove(Context context ,String key)
{
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
resolver.delete(Uri.parse(CIMCacheProvider.CONTENT_URI), key, null); resolver.delete(Uri.parse(CIMCacheProvider.CONTENT_URI), key, null);
} }
public static void putString(Context context, String key, String value) {
public static void putString(Context context ,String key,String value)
{
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
@ -64,13 +60,11 @@ class CIMCacheManager {
} }
public static String getString(Context context ,String key) public static String getString(Context context, String key) {
{
String value = null; String value = null;
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
Cursor cursor = resolver.query(Uri.parse(CIMCacheProvider.CONTENT_URI), new String[]{key}, null,null,null); Cursor cursor = resolver.query(Uri.parse(CIMCacheProvider.CONTENT_URI), new String[] { key }, null, null, null);
if (cursor!=null && cursor.moveToFirst()) if (cursor != null && cursor.moveToFirst()) {
{
value = cursor.getString(0); value = cursor.getString(0);
cursor.close(); cursor.close();
} }
@ -78,34 +72,30 @@ class CIMCacheManager {
return value; return value;
} }
private static void closeQuietly(Cursor cursor){ private static void closeQuietly(Cursor cursor) {
try{ try {
if(cursor!=null) if (cursor != null)
cursor.close(); cursor.close();
}catch(Exception e){} } catch (Exception e) {
}
} }
public static void putBoolean(Context context,String key,boolean value) public static void putBoolean(Context context, String key, boolean value) {
{ putString(context, key, Boolean.toString(value));
putString(context,key,Boolean.toString(value));
} }
public static boolean getBoolean(Context context,String key) public static boolean getBoolean(Context context, String key) {
{ String value = getString(context, key);
String value = getString(context,key); return value == null ? false : Boolean.parseBoolean(value);
return value == null?false:Boolean.parseBoolean(value);
} }
public static void putInt(Context context, String key, int value) {
public static void putInt(Context context,String key,int value) putString(context, key, String.valueOf(value));
{
putString(context,key, String.valueOf(value));
} }
public static int getInt(Context context,String key) public static int getInt(Context context, String key) {
{ String value = getString(context, key);
String value = getString(context,key); return value == null ? 0 : Integer.parseInt(value);
return value == null?0:Integer.parseInt(value);
} }
} }

8
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheProvider.java
View File

@ -29,10 +29,9 @@ import android.database.MatrixCursor;
import android.net.Uri; import android.net.Uri;
public class CIMCacheProvider extends ContentProvider { public class CIMCacheProvider extends ContentProvider {
public static final String CONTENT_URI="content://com.farsunset.cim.provider"; public static final String CONTENT_URI = "content://com.farsunset.cim.provider";
static final String MODEL_KEY = "PRIVATE_CIM_CONFIG"; static final String MODEL_KEY = "PRIVATE_CIM_CONFIG";
@Override @Override
public int delete(Uri arg0, String key, String[] arg2) { public int delete(Uri arg0, String key, String[] arg2) {
getContext().getSharedPreferences(MODEL_KEY, Context.MODE_PRIVATE).edit().remove(key).apply(); getContext().getSharedPreferences(MODEL_KEY, Context.MODE_PRIVATE).edit().remove(key).apply();
@ -59,9 +58,9 @@ public class CIMCacheProvider extends ContentProvider {
@Override @Override
public Cursor query(Uri arg0, String[] arg1, String key, String[] arg3, String arg4) { public Cursor query(Uri arg0, String[] arg1, String key, String[] arg3, String arg4) {
MatrixCursor cursor = new MatrixCursor(new String[]{"value"}); MatrixCursor cursor = new MatrixCursor(new String[] { "value" });
String value = getContext().getSharedPreferences(MODEL_KEY, Context.MODE_PRIVATE).getString(arg1[0], null); String value = getContext().getSharedPreferences(MODEL_KEY, Context.MODE_PRIVATE).getString(arg1[0], null);
cursor.addRow(new Object[]{value}); cursor.addRow(new Object[] { value });
return cursor; return cursor;
} }
@ -70,5 +69,4 @@ public class CIMCacheProvider extends ContentProvider {
return 0; return 0;
} }
} }

170
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheToolkit.java
View File

@ -1,170 +0,0 @@
/**
* Copyright 2013-2023 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
***************************************************************************************
* *
* Website : http://www.farsunset.com *
* *
***************************************************************************************
*/
package com.farsunset.cim.sdk.android;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
class CIMCacheToolkit extends SQLiteOpenHelper {
private static final String DATABASE_NAME = "CIM_CONFIG_INFO.db";
private static final int DATABASE_VERSION = 20160406;
private static final String TABLE_NAME = "T_CIM_CONFIG";
private static CIMCacheToolkit toolkit;
private static final String TABLE_SQL = "CREATE TABLE IF NOT EXISTS "+TABLE_NAME+" (KEY VARCHAR(64) PRIMARY KEY,VALUE TEXT)";
private static final String DELETE_SQL = "DELETE FROM "+TABLE_NAME+" WHERE KEY = ?";
private static final String QUERY_SQL = "SELECT VALUE FROM "+TABLE_NAME+" WHERE KEY = ?";
private SQLiteDatabase mSQLiteDatabase;
public static final String CIM_CONFIG_INFO = "CIM_CONFIG_INFO";
public static final String KEY_ACCOUNT = "KEY_ACCOUNT";
public static final String KEY_MANUAL_STOP = "KEY_MANUAL_STOP";
public static final String KEY_CIM_DESTROYED = "KEY_CIM_DESTROYED";
public static final String KEY_CIM_SERVIER_HOST = "KEY_CIM_SERVIER_HOST";
public static final String KEY_CIM_SERVIER_PORT = "KEY_CIM_SERVIER_PORT";
public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE";
public synchronized static CIMCacheToolkit getInstance(Context context){
if(toolkit==null){
toolkit = new CIMCacheToolkit(context);
}
return toolkit;
}
public CIMCacheToolkit(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
super(context, name, factory, version);
}
public CIMCacheToolkit(Context context){
this(context, DATABASE_NAME,null, DATABASE_VERSION);
}
public synchronized void remove(String key)
{
getSQLiteDatabase().execSQL(DELETE_SQL,new String[]{key});
}
public synchronized void putString(String key,String value)
{
ContentValues values = new ContentValues();
values.put("VALUE", value);
int result = getSQLiteDatabase().updateWithOnConflict(TABLE_NAME, values, "KEY=?",new String[]{key},SQLiteDatabase.CONFLICT_FAIL);
if(result<=0){
values.put("KEY", key);
getSQLiteDatabase().insert(TABLE_NAME, null, values);
}
}
public synchronized String getString(String key)
{
String value = null;
Cursor cursor = getSQLiteDatabase().rawQuery(QUERY_SQL, new String[]{key});
if (cursor!=null)
{
if(cursor.moveToFirst()){
value = cursor.getString(0);
}
cursor.close();
}
return value;
}
public void putBoolean(String key,boolean value)
{
putString(key,Boolean.toString(value));
}
public boolean getBoolean(String key)
{
String value = getString(key);
return value == null?false:Boolean.parseBoolean(value);
}
public void putInt(String key,int value)
{
putString(key, String.valueOf(value));
}
public int getInt(String key)
{
String value = getString(key);
return value == null?0:Integer.parseInt(value);
}
@Override
public void onCreate(SQLiteDatabase database) {
database.execSQL(TABLE_SQL);
}
public static synchronized void destroy(){
if (toolkit!=null){
try{toolkit.mSQLiteDatabase.close();}catch(Exception e){}
try{toolkit.close();}catch(Exception e){}
}
toolkit = null;
}
private SQLiteDatabase getSQLiteDatabase(){
if(mSQLiteDatabase!=null){
return mSQLiteDatabase;
}else
{
mSQLiteDatabase = getWritableDatabase();
}
return mSQLiteDatabase;
}
@Override
public void onUpgrade(SQLiteDatabase database, int oldVersion, int newVersion) {
}
}

93
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMConnectorManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import java.util.Random; import java.util.Random;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -64,23 +65,21 @@ import com.farsunset.cim.sdk.android.model.SentBody;
class CIMConnectorManager extends SimpleChannelInboundHandler<Object> { class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
private final String TAG = CIMConnectorManager.class.getSimpleName(); private final String TAG = CIMConnectorManager.class.getSimpleName();
private final int CONNECT_TIMEOUT = 10 * 1000;//秒 private final int CONNECT_TIMEOUT = 10 * 1000;// 秒
private final int WRITE_TIMEOUT = 10 * 1000;//秒 private final int WRITE_TIMEOUT = 10 * 1000;// 秒
private final int READ_IDLE_TIME = 120;//秒 private final int READ_IDLE_TIME = 120;// 秒
private final int HEARBEAT_TIME_OUT = (READ_IDLE_TIME + 20) * 1000;// 收到服务端心跳请求超时时间 毫秒 private final int HEARBEAT_TIME_OUT = (READ_IDLE_TIME + 20) * 1000;// 收到服务端心跳请求超时时间 毫秒
private final String KEY_LAST_HEART_TIME = "KEY_LAST_HEART_TIME" ; private final String KEY_LAST_HEART_TIME = "KEY_LAST_HEART_TIME";
private Bootstrap bootstrap; private Bootstrap bootstrap;
private EventLoopGroup loopGroup ; private EventLoopGroup loopGroup;
private Channel channel;; private Channel channel;;
private ExecutorService executor = Executors.newFixedThreadPool(1); private ExecutorService executor = Executors.newFixedThreadPool(1);
private Context context; private Context context;
private static CIMConnectorManager manager; private static CIMConnectorManager manager;
private CIMConnectorManager(Context ctx) { private CIMConnectorManager(Context ctx) {
context = ctx; context = ctx;
@ -97,7 +96,7 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
public void initChannel(SocketChannel ch) throws Exception { public void initChannel(SocketChannel ch) throws Exception {
ch.pipeline().addLast(new ClientMessageDecoder()); ch.pipeline().addLast(new ClientMessageDecoder());
ch.pipeline().addLast(new ClientMessageEncoder()); ch.pipeline().addLast(new ClientMessageEncoder());
ch.pipeline().addLast(new IdleStateHandler(READ_IDLE_TIME,0,0)); ch.pipeline().addLast(new IdleStateHandler(READ_IDLE_TIME, 0, 0));
ch.pipeline().addLast(CIMConnectorManager.this); ch.pipeline().addLast(CIMConnectorManager.this);
} }
}); });
@ -112,20 +111,20 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
} }
private synchronized void syncConnection( String host, int port) { private synchronized void syncConnection(String host, int port) {
if(isConnected()){ if (isConnected()) {
return ; return;
} }
try { try {
Log.i(TAG, "****************CIM正在连接服务器 "+host+":"+port+"......"); Log.i(TAG, "****************CIM正在连接服务器 " + host + ":" + port + "......");
ChannelFuture channelFuture = bootstrap.connect(host, port).syncUninterruptibly(); ChannelFuture channelFuture = bootstrap.connect(host, port).syncUninterruptibly();
channel = channelFuture.channel(); channel = channelFuture.channel();
} catch (Exception e) { } catch (Exception e) {
long interval = CIMConstant.RECONN_INTERVAL_TIME - (5*1000 - new Random().nextInt(15*1000)); long interval = CIMConstant.RECONN_INTERVAL_TIME - (5 * 1000 - new Random().nextInt(15 * 1000));
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED); intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED);
@ -133,7 +132,7 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
intent.putExtra("interval", interval); intent.putExtra("interval", interval);
context.sendBroadcast(intent); context.sendBroadcast(intent);
Log.e(TAG, "****************CIM连接服务器失败 "+host+":"+port+"......将在"+interval/1000+"秒后重新尝试连接"); Log.e(TAG, "****************CIM连接服务器失败 " + host + ":" + port + "......将在" + interval / 1000 + "秒后重新尝试连接");
} }
@ -152,8 +151,7 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
} }
executor.execute(new Runnable() { executor.execute(new Runnable() {
public void run() public void run() {
{
syncConnection(host, port); syncConnection(host, port);
} }
}); });
@ -166,24 +164,22 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
String exceptionName = SessionClosedException.class.getSimpleName(); String exceptionName = SessionClosedException.class.getSimpleName();
if(channel!=null && channel.isActive()) if (channel != null && channel.isActive()) {
{
ChannelFuture future = channel.writeAndFlush(body); ChannelFuture future = channel.writeAndFlush(body);
isSuccessed = future.awaitUninterruptibly(WRITE_TIMEOUT); isSuccessed = future.awaitUninterruptibly(WRITE_TIMEOUT);
if(!isSuccessed && future.cause()!=null){ if (!isSuccessed && future.cause() != null) {
exceptionName = future.cause().getClass().getSimpleName(); exceptionName = future.cause().getClass().getSimpleName();
} }
} }
if(!isSuccessed){ if (!isSuccessed) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_SENT_FAILED); intent.setAction(CIMConstant.IntentAction.ACTION_SENT_FAILED);
intent.putExtra(Exception.class.getName(),exceptionName); intent.putExtra(Exception.class.getName(), exceptionName);
intent.putExtra(SentBody.class.getName(), body); intent.putExtra(SentBody.class.getName(), body);
context.sendBroadcast(intent); context.sendBroadcast(intent);
}else } else {
{
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED); intent.setAction(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED);
intent.putExtra(SentBody.class.getName(), (SentBody) body); intent.putExtra(SentBody.class.getName(), (SentBody) body);
@ -208,26 +204,20 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
if (channel == null) { if (channel == null) {
return false; return false;
} }
return channel.isActive() ; return channel.isActive();
} }
public void closeSession() {
if (channel != null) {
public void closeSession()
{
if(channel!=null)
{
channel.close(); channel.close();
} }
} }
@Override @Override
public void channelActive(ChannelHandlerContext ctx) throws Exception { public void channelActive(ChannelHandlerContext ctx) throws Exception {
Log.i(TAG, "****************CIM连接服务器成功:" + ctx.channel().localAddress() + " NID:"
Log.i(TAG, "****************CIM连接服务器成功:"+ctx.channel().localAddress()+" NID:"+ctx.channel().id().asShortText()); + ctx.channel().id().asShortText());
setLastHeartbeatTime(ctx.channel()); setLastHeartbeatTime(ctx.channel());
@ -240,7 +230,8 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
@Override @Override
public void channelInactive(ChannelHandlerContext ctx) { public void channelInactive(ChannelHandlerContext ctx) {
Log.e(TAG, "****************CIM与服务器断开连接:"+ctx.channel().localAddress()+" NID:"+ctx.channel().id().asShortText()); Log.e(TAG, "****************CIM与服务器断开连接:" + ctx.channel().localAddress() + " NID:"
+ ctx.channel().id().asShortText());
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED); intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED);
@ -252,19 +243,17 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) { public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
/** /**
* 用于解决，wifi情况下。偶而路由器与服务器断开连接时，客户端并没及时收到关闭事件 * 用于解决，wifi情况下。偶而路由器与服务器断开连接时，客户端并没及时收到关闭事件 导致这样的情况下当前连接无效也不会重连的问题
* 导致这样的情况下当前连接无效也不会重连的问题
* *
*/ */
if (evt instanceof IdleStateEvent && ((IdleStateEvent) evt).state().equals(IdleState.READER_IDLE)) if (evt instanceof IdleStateEvent && ((IdleStateEvent) evt).state().equals(IdleState.READER_IDLE)) {
{ Log.d(TAG, "****************CIM " + IdleState.READER_IDLE + ":" + ctx.channel().localAddress() + " NID:"
Log.d(TAG, "****************CIM "+IdleState.READER_IDLE+":"+ctx.channel().localAddress()+" NID:"+ctx.channel().id().asShortText()); + ctx.channel().id().asShortText());
Long lastTime = getLastHeartbeatTime(ctx.channel()); Long lastTime = getLastHeartbeatTime(ctx.channel());
if(lastTime != null && System.currentTimeMillis() - lastTime > HEARBEAT_TIME_OUT) if (lastTime != null && System.currentTimeMillis() - lastTime > HEARBEAT_TIME_OUT) {
{
channel.close(); channel.close();
Log.e(TAG, "****************CIM心跳超时 ,即将重新连接......"+" NID:"+ctx.channel().id().asShortText()); Log.e(TAG, "****************CIM心跳超时 ,即将重新连接......" + " NID:" + ctx.channel().id().asShortText());
} }
} }
@ -273,9 +262,10 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
@Override @Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
Log.e(TAG, "****************CIM连接出现未知异常:"+ctx.channel().localAddress()+" NID:"+ctx.channel().id().asShortText()); Log.e(TAG, "****************CIM连接出现未知异常:" + ctx.channel().localAddress() + " NID:"
+ ctx.channel().id().asShortText());
if(cause!=null && cause.getMessage()!=null){ if (cause != null && cause.getMessage() != null) {
Log.e(TAG, cause.getMessage()); Log.e(TAG, cause.getMessage());
} }
@ -286,7 +276,7 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
} }
@Override @Override
public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception{ public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
if (msg instanceof Message) { if (msg instanceof Message) {
Intent intent = new Intent(); Intent intent = new Intent();
@ -303,7 +293,7 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
context.sendBroadcast(intent); context.sendBroadcast(intent);
} }
//收到服务端发来的心跳请求命令，则马上回应服务器 // 收到服务端发来的心跳请求命令，则马上回应服务器
if (msg instanceof HeartbeatRequest) { if (msg instanceof HeartbeatRequest) {
ctx.writeAndFlush(HeartbeatResponse.getInstance()); ctx.writeAndFlush(HeartbeatResponse.getInstance());
setLastHeartbeatTime(ctx.channel()); setLastHeartbeatTime(ctx.channel());
@ -311,13 +301,11 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
} }
private void setLastHeartbeatTime(Channel channel) private void setLastHeartbeatTime(Channel channel) {
{
channel.attr(AttributeKey.valueOf(KEY_LAST_HEART_TIME)).set(System.currentTimeMillis()); channel.attr(AttributeKey.valueOf(KEY_LAST_HEART_TIME)).set(System.currentTimeMillis());
} }
private Long getLastHeartbeatTime(Channel channel) private Long getLastHeartbeatTime(Channel channel) {
{
return (Long) channel.attr(AttributeKey.valueOf(KEY_LAST_HEART_TIME)).get(); return (Long) channel.attr(AttributeKey.valueOf(KEY_LAST_HEART_TIME)).get();
} }
@ -326,7 +314,8 @@ class CIMConnectorManager extends SimpleChannelInboundHandler<Object> {
ConnectivityManager nw = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager nw = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = nw.getActiveNetworkInfo(); NetworkInfo networkInfo = nw.getActiveNetworkInfo();
return networkInfo != null; return networkInfo != null;
} catch (Exception e) {} } catch (Exception e) {
}
return false; return false;
} }

117
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.constant.CIMConstant;
import com.farsunset.cim.sdk.android.exception.SessionClosedException; import com.farsunset.cim.sdk.android.exception.SessionClosedException;
import com.farsunset.cim.sdk.android.model.Message; import com.farsunset.cim.sdk.android.model.Message;
@ -33,10 +32,11 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
/** /**
* 消息入口，所有消息都会经过这里 * 消息入口，所有消息都会经过这里
*/ */
public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver{ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver {
protected Context context; protected Context context;
@ -48,123 +48,108 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver{
/* /*
* 操作事件广播，用于提高service存活率 * 操作事件广播，用于提高service存活率
*/ */
if(intent.getAction().equals(Intent.ACTION_USER_PRESENT) if (intent.getAction().equals(Intent.ACTION_USER_PRESENT)
||intent.getAction().equals(Intent.ACTION_POWER_CONNECTED) || intent.getAction().equals(Intent.ACTION_POWER_CONNECTED)
||intent.getAction().equals(Intent.ACTION_POWER_DISCONNECTED)) || intent.getAction().equals(Intent.ACTION_POWER_DISCONNECTED)) {
{
startPushService(); startPushService();
} }
/* /*
* 设备网络状态变化事件 * 设备网络状态变化事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_NETWORK_CHANGED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_NETWORK_CHANGED)) {
{ ConnectivityManager connectivityManager = (ConnectivityManager) context
ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE); .getSystemService(Context.CONNECTIVITY_SERVICE);
onDevicesNetworkChanged(connectivityManager.getActiveNetworkInfo()); onDevicesNetworkChanged(connectivityManager.getActiveNetworkInfo());
} }
/* /*
* cim断开服务器事件 * cim断开服务器事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED)) {
{
onInnerConnectionClosed(); onInnerConnectionClosed();
} }
/* /*
* cim连接服务器失败事件 * cim连接服务器失败事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED)) {
{
long interval = intent.getLongExtra("interval", CIMConstant.RECONN_INTERVAL_TIME); long interval = intent.getLongExtra("interval", CIMConstant.RECONN_INTERVAL_TIME);
String exceptionName = intent.getStringExtra(Exception.class.getName()); String exceptionName = intent.getStringExtra(Exception.class.getName());
onConnectionFailed(exceptionName,interval); onConnectionFailed(exceptionName, interval);
} }
/* /*
* cim连接服务器成功事件 * cim连接服务器成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED)) {
{
onInnerConnectionSuccessed(); onInnerConnectionSuccessed();
} }
/* /*
* 收到推送消息事件 * 收到推送消息事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED)) {
{ onInnerMessageReceived((Message) intent.getSerializableExtra(Message.class.getName()), intent);
onInnerMessageReceived((Message)intent.getSerializableExtra(Message.class.getName()),intent);
} }
/* /*
* 获取收到replybody成功事件 * 获取收到replybody成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED)) {
{ onReplyReceived((ReplyBody) intent.getSerializableExtra(ReplyBody.class.getName()));
onReplyReceived((ReplyBody)intent.getSerializableExtra(ReplyBody.class.getName()));
} }
/* /*
* 获取sendbody发送失败事件 * 获取sendbody发送失败事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_FAILED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_FAILED)) {
{
String exceptionName = intent.getStringExtra(Exception.class.getName()); String exceptionName = intent.getStringExtra(Exception.class.getName());
SentBody sentBody = (SentBody)intent.getSerializableExtra(SentBody.class.getName()); SentBody sentBody = (SentBody) intent.getSerializableExtra(SentBody.class.getName());
onSentFailed(exceptionName,sentBody); onSentFailed(exceptionName, sentBody);
} }
/* /*
* 获取sendbody发送成功事件 * 获取sendbody发送成功事件
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED)) {
{ onSentSucceed((SentBody) intent.getSerializableExtra(SentBody.class.getName()));
onSentSucceed((SentBody)intent.getSerializableExtra(SentBody.class.getName()));
} }
/* /*
* 重新连接，如果断开的话 * 重新连接，如果断开的话
*/ */
if(intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_RECOVERY)) if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_RECOVERY)) {
{ CIMPushManager.connect(context, 0);
CIMPushManager.connect(context,0);
} }
} }
private void startPushService(){ private void startPushService() {
Intent intent = new Intent(context, CIMPushService.class); Intent intent = new Intent(context, CIMPushService.class);
intent.setAction(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE); intent.setAction(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE);
context.startService(intent); context.startService(intent);
} }
private void onInnerConnectionClosed(){ private void onInnerConnectionClosed() {
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_CONNECTION_STATE, false); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
if(CIMConnectorManager.isNetworkConnected(context)) if (CIMConnectorManager.isNetworkConnected(context)) {
{ CIMPushManager.connect(context, 0);
CIMPushManager.connect(context,0);
} }
onConnectionClosed(); onConnectionClosed();
} }
private void onConnectionFailed(String exceptionName,long reinterval){ private void onConnectionFailed(String exceptionName, long reinterval) {
if(CIMConnectorManager.isNetworkConnected(context)) if (CIMConnectorManager.isNetworkConnected(context)) {
{
onConnectionFailed(); onConnectionFailed();
CIMPushManager.connect(context,reinterval); CIMPushManager.connect(context, reinterval);
} }
} }
private void onInnerConnectionSuccessed(){ private void onInnerConnectionSuccessed() {
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_CONNECTION_STATE, true); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE, true);
boolean autoBind = CIMPushManager.autoBindAccount(context); boolean autoBind = CIMPushManager.autoBindAccount(context);
onConnectionSuccessed(autoBind); onConnectionSuccessed(autoBind);
@ -172,51 +157,43 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver{
private void onDevicesNetworkChanged(NetworkInfo info) { private void onDevicesNetworkChanged(NetworkInfo info) {
if(info !=null) if (info != null) {
{ CIMPushManager.connect(context, 0);
CIMPushManager.connect(context,0);
} }
onNetworkChanged(info); onNetworkChanged(info);
} }
private void onInnerMessageReceived(com.farsunset.cim.sdk.android.model.Message message, Intent intent){ private void onInnerMessageReceived(com.farsunset.cim.sdk.android.model.Message message, Intent intent) {
if(isForceOfflineMessage(message.getAction())) if (isForceOfflineMessage(message.getAction())) {
{
CIMPushManager.stop(context); CIMPushManager.stop(context);
} }
onMessageReceived(message,intent); onMessageReceived(message, intent);
} }
private boolean isForceOfflineMessage(String action) private boolean isForceOfflineMessage(String action) {
{
return CIMConstant.MessageAction.ACTION_999.equals(action); return CIMConstant.MessageAction.ACTION_999.equals(action);
} }
private void onSentFailed(String exceptionName, SentBody body){ private void onSentFailed(String exceptionName, SentBody body) {
//与服务端端开链接，重新连接 // 与服务端端开链接，重新连接
if(SessionClosedException.class.getSimpleName().equals(exceptionName)) if (SessionClosedException.class.getSimpleName().equals(exceptionName)) {
{ CIMPushManager.connect(context, 0);
CIMPushManager.connect(context,0); } else {
}else // 发送失败 重新发送
{
//发送失败 重新发送
CIMPushManager.sendRequest(context, body); CIMPushManager.sendRequest(context, body);
} }
} }
public abstract void onMessageReceived(com.farsunset.cim.sdk.android.model.Message message, Intent intent);
public abstract void onMessageReceived(com.farsunset.cim.sdk.android.model.Message message,Intent intent);
public void onNetworkChanged(NetworkInfo info) { public void onNetworkChanged(NetworkInfo info) {
CIMListenerManager.notifyOnNetworkChanged(info); CIMListenerManager.notifyOnNetworkChanged(info);
} }
public void onConnectionSuccessed(boolean hasAutoBind) { public void onConnectionSuccessed(boolean hasAutoBind) {
CIMListenerManager.notifyOnConnectionSuccessed(hasAutoBind); CIMListenerManager.notifyOnConnectionSuccessed(hasAutoBind);
} }
@ -233,7 +210,7 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver{
CIMListenerManager.notifyOnReplyReceived(body); CIMListenerManager.notifyOnReplyReceived(body);
} }
public void onSentSucceed(SentBody body){ public void onSentSucceed(SentBody body) {
CIMListenerManager.notifyOnSentSucceed(body); CIMListenerManager.notifyOnSentSucceed(body);
} }
} }

17
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventListener.java
View File

@ -28,41 +28,43 @@ import com.farsunset.cim.sdk.android.model.ReplyBody;
import com.farsunset.cim.sdk.android.model.SentBody; import com.farsunset.cim.sdk.android.model.SentBody;
/** /**
*CIM 主要事件接口 * CIM 主要事件接口
*/ */
public interface CIMEventListener public interface CIMEventListener {
{
/** /**
* 当收到服务端推送过来的消息时调用 * 当收到服务端推送过来的消息时调用
*
* @param message * @param message
*/ */
void onMessageReceived(Message message); void onMessageReceived(Message message);
/** /**
* 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用 * 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用
*
* @param replybody * @param replybody
*/ */
void onReplyReceived(ReplyBody replybody); void onReplyReceived(ReplyBody replybody);
/** /**
* 当调用CIMPushManager.sendRequest()向服务端发送请求成功时 * 当调用CIMPushManager.sendRequest()向服务端发送请求成功时
*
* @param body * @param body
*/ */
void onSentSuccessed(SentBody body); void onSentSuccessed(SentBody body);
/** /**
* 当手机网络发生变化时调用 * 当手机网络发生变化时调用
*
* @param networkinfo * @param networkinfo
*/ */
void onNetworkChanged(NetworkInfo networkinfo); void onNetworkChanged(NetworkInfo networkinfo);
/** /**
* 当连接服务器成功时回调 * 当连接服务器成功时回调
* @param hasAutoBind : true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount *
* @param hasAutoBind
* : true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount
*/ */
void onConnectionSuccessed(boolean hasAutoBind); void onConnectionSuccessed(boolean hasAutoBind);
@ -83,4 +85,3 @@ public interface CIMEventListener
*/ */
int getEventDispatchOrder(); int getEventDispatchOrder();
} }

17
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMListenerManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -31,7 +32,6 @@ import com.farsunset.cim.sdk.android.model.SentBody;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.util.Log; import android.util.Log;
/** /**
* CIM 消息监听器管理 * CIM 消息监听器管理
*/ */
@ -44,11 +44,10 @@ public class CIMListenerManager {
if (!cimListeners.contains(listener)) { if (!cimListeners.contains(listener)) {
cimListeners.add(listener); cimListeners.add(listener);
Collections.sort(cimListeners,comparator); Collections.sort(cimListeners, comparator);
} }
} }
public static void removeMessageListener(CIMEventListener listener) { public static void removeMessageListener(CIMEventListener listener) {
for (int i = 0; i < cimListeners.size(); i++) { for (int i = 0; i < cimListeners.size(); i++) {
if (listener.getClass() == cimListeners.get(i).getClass()) { if (listener.getClass() == cimListeners.get(i).getClass()) {
@ -57,19 +56,18 @@ public class CIMListenerManager {
} }
} }
public static void notifyOnNetworkChanged(NetworkInfo info) { public static void notifyOnNetworkChanged(NetworkInfo info) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onNetworkChanged(info); listener.onNetworkChanged(info);
} }
} }
public static void notifyOnConnectionSuccessed(boolean hasAutoBind) { public static void notifyOnConnectionSuccessed(boolean hasAutoBind) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onConnectionSuccessed(hasAutoBind); listener.onConnectionSuccessed(hasAutoBind);
} }
} }
public static void notifyOnMessageReceived(Message message) { public static void notifyOnMessageReceived(Message message) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onMessageReceived(message); listener.onMessageReceived(message);
@ -88,7 +86,6 @@ public class CIMListenerManager {
} }
} }
public static void notifyOnReplyReceived(ReplyBody body) { public static void notifyOnReplyReceived(ReplyBody body) {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
listener.onReplyReceived(body); listener.onReplyReceived(body);
@ -101,31 +98,29 @@ public class CIMListenerManager {
} }
} }
public static void destory() { public static void destory() {
cimListeners.clear(); cimListeners.clear();
} }
public static void logListenersName() { public static void logListenersName() {
for (CIMEventListener listener : cimListeners) { for (CIMEventListener listener : cimListeners) {
Log.i(CIMEventListener.class.getSimpleName(),"#######" + listener.getClass().getName() + "#######" ); Log.i(CIMEventListener.class.getSimpleName(), "#######" + listener.getClass().getName() + "#######");
} }
} }
/** /**
* 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序 * 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序
*/ */
private static class CIMMessageReceiveComparator implements Comparator<CIMEventListener>{ private static class CIMMessageReceiveComparator implements Comparator<CIMEventListener> {
@Override @Override
public int compare(CIMEventListener arg1, CIMEventListener arg2) { public int compare(CIMEventListener arg1, CIMEventListener arg2) {
int order1 = arg1.getEventDispatchOrder(); int order1 = arg1.getEventDispatchOrder();
int order2 = arg2.getEventDispatchOrder(); int order2 = arg2.getEventDispatchOrder();
return order2 - order1 ; return order2 - order1;
} }
} }
} }

149
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushManager.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import java.util.UUID; import java.util.UUID;
import android.content.Context; import android.content.Context;
@ -36,43 +37,43 @@ import com.farsunset.cim.sdk.android.model.SentBody;
*/ */
public class CIMPushManager { public class CIMPushManager {
static String ACTION_ACTIVATE_PUSH_SERVICE ="ACTION_ACTIVATE_PUSH_SERVICE"; static String ACTION_ACTIVATE_PUSH_SERVICE = "ACTION_ACTIVATE_PUSH_SERVICE";
static String ACTION_CREATE_CIM_CONNECTION ="ACTION_CREATE_CIM_CONNECTION"; static String ACTION_CREATE_CIM_CONNECTION = "ACTION_CREATE_CIM_CONNECTION";
static String ACTION_SEND_REQUEST_BODY ="ACTION_SEND_REQUEST_BODY"; static String ACTION_SEND_REQUEST_BODY = "ACTION_SEND_REQUEST_BODY";
static String ACTION_CLOSE_CIM_CONNECTION ="ACTION_CLOSE_CIM_CONNECTION"; static String ACTION_CLOSE_CIM_CONNECTION = "ACTION_CLOSE_CIM_CONNECTION";
static String ACTION_DESTORY ="ACTION_DESTORY"; static String ACTION_DESTORY = "ACTION_DESTORY";
static String KEY_SEND_BODY ="KEY_SEND_BODY"; static String KEY_SEND_BODY = "KEY_SEND_BODY";
static String KEY_CIM_CONNECTION_STATUS ="KEY_CIM_CONNECTION_STATUS"; static String KEY_CIM_CONNECTION_STATUS = "KEY_CIM_CONNECTION_STATUS";
/** /**
* 初始化,连接服务端，在程序启动页或者 在Application里调用 * 初始化,连接服务端，在程序启动页或者 在Application里调用
*
* @param context * @param context
* @param ip * @param ip
* @param port * @param port
*/ */
public static void connect(Context context,String host,int port){ public static void connect(Context context, String host, int port) {
connect(context,host,port,false,0); connect(context, host, port, false, 0);
} }
private static void connect(Context context,String ip,int port,boolean autoBind,long delayedTime){ private static void connect(Context context, String ip, int port, boolean autoBind, long delayedTime) {
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED, false); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED, false);
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_MANUAL_STOP, false); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, false);
CIMCacheManager.putString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST, ip); CIMCacheManager.putString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST, ip);
CIMCacheManager.putInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT, port); CIMCacheManager.putInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT, port);
if(!autoBind) if (!autoBind) {
{ CIMCacheManager.remove(context, CIMCacheManager.KEY_ACCOUNT);
CIMCacheManager.remove(context,CIMCacheManager.KEY_ACCOUNT);
} }
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
@ -84,94 +85,88 @@ public class CIMPushManager {
} }
protected static void connect(Context context,long delayedTime){ protected static void connect(Context context, long delayedTime) {
boolean isManualStop = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_MANUAL_STOP);
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualStop || isManualDestory) if (isManualStop || isManualDestory) {
{ return;
return ;
} }
String host = CIMCacheManager.getString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST); String host = CIMCacheManager.getString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST);
int port =CIMCacheManager.getInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT); int port = CIMCacheManager.getInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT);
connect(context,host,port,true,delayedTime); connect(context, host, port, true, delayedTime);
} }
/** /**
* 设置一个账号登录到服务端 * 设置一个账号登录到服务端
* @param account 用户唯一ID *
* @param account
* 用户唯一ID
*/ */
public static void bindAccount(Context context,String account){ public static void bindAccount(Context context, String account) {
boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); if (isManualDestory || account == null || account.trim().length() == 0) {
if(isManualDestory || account==null || account.trim().length()==0) return;
{
return ;
} }
sendBindRequest(context,account); sendBindRequest(context, account);
} }
private static void sendBindRequest(Context context, String account) {
private static void sendBindRequest(Context context, String account){ CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, false);
CIMCacheManager.putString(context, CIMCacheManager.KEY_ACCOUNT, account);
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_MANUAL_STOP, false); String deviceId = CIMCacheManager.getString(context, CIMCacheManager.KEY_DEVICE_ID);
CIMCacheManager.putString(context,CIMCacheManager.KEY_ACCOUNT, account); if (TextUtils.isEmpty(deviceId)) {
String deviceId = CIMCacheManager.getString(context,CIMCacheManager.KEY_DEVICE_ID);
if(TextUtils.isEmpty(deviceId)) {
deviceId = UUID.randomUUID().toString().replaceAll("-", ""); deviceId = UUID.randomUUID().toString().replaceAll("-", "");
CIMCacheManager.putString(context,CIMCacheManager.KEY_DEVICE_ID, deviceId); CIMCacheManager.putString(context, CIMCacheManager.KEY_DEVICE_ID, deviceId);
} }
SentBody sent = new SentBody(); SentBody sent = new SentBody();
sent.setKey(CIMConstant.RequestKey.CLIENT_BIND); sent.setKey(CIMConstant.RequestKey.CLIENT_BIND);
sent.put("account", account); sent.put("account", account);
sent.put("deviceId",deviceId); sent.put("deviceId", deviceId);
sent.put("channel", "android"); sent.put("channel", "android");
sent.put("device",android.os.Build.MODEL); sent.put("device", android.os.Build.MODEL);
sent.put("version",getVersionName(context)); sent.put("version", getVersionName(context));
sent.put("osVersion",android.os.Build.VERSION.RELEASE); sent.put("osVersion", android.os.Build.VERSION.RELEASE);
sent.put("packageName",context.getPackageName()); sent.put("packageName", context.getPackageName());
sendRequest(context,sent); sendRequest(context, sent);
} }
protected static boolean autoBindAccount(Context context){ protected static boolean autoBindAccount(Context context) {
String account = CIMCacheManager.getString(context,CIMCacheManager.KEY_ACCOUNT); String account = CIMCacheManager.getString(context, CIMCacheManager.KEY_ACCOUNT);
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if( account==null || account.trim().length()==0 || isManualDestory ) if (account == null || account.trim().length() == 0 || isManualDestory) {
{
return false; return false;
} }
sendBindRequest(context,account); sendBindRequest(context, account);
return true; return true;
} }
/** /**
* 发送一个CIM请求 * 发送一个CIM请求
*
* @param context * @param context
* @body * @body
*/ */
public static void sendRequest(Context context, SentBody body){ public static void sendRequest(Context context, SentBody body) {
boolean isManualStop = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_MANUAL_STOP);
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualStop || isManualDestory) if (isManualStop || isManualDestory) {
{ return;
return ;
} }
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
@ -183,16 +178,17 @@ public class CIMPushManager {
/** /**
* 停止接受推送，将会退出当前账号登录，端口与服务端的连接 * 停止接受推送，将会退出当前账号登录，端口与服务端的连接
*
* @param context * @param context
*/ */
public static void stop(Context context){ public static void stop(Context context) {
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualDestory){ if (isManualDestory) {
return ; return;
} }
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_MANUAL_STOP, true); CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, true);
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.setAction(ACTION_CLOSE_CIM_CONNECTION); serviceIntent.setAction(ACTION_CLOSE_CIM_CONNECTION);
@ -200,16 +196,15 @@ public class CIMPushManager {
} }
/** /**
* 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复 * 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复
*
* @param context * @param context
*/ */
public static void destroy(Context context){ public static void destroy(Context context) {
CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED, true);
CIMCacheManager.putBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED, true); CIMCacheManager.putString(context, CIMCacheManager.KEY_ACCOUNT, null);
CIMCacheManager.putString(context,CIMCacheManager.KEY_ACCOUNT, null);
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.setAction(ACTION_DESTORY); serviceIntent.setAction(ACTION_DESTORY);
@ -217,27 +212,25 @@ public class CIMPushManager {
} }
/** /**
* 重新恢复接收推送，重新连接服务端，并登录当前账号 * 重新恢复接收推送，重新连接服务端，并登录当前账号
*
* @param context * @param context
*/ */
public static void resume(Context context){ public static void resume(Context context) {
boolean isManualDestory = CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_DESTROYED); boolean isManualDestory = CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
if(isManualDestory){ if (isManualDestory) {
return ; return;
} }
autoBindAccount(context); autoBindAccount(context);
} }
public static boolean isConnected(Context context){ public static boolean isConnected(Context context) {
return CIMCacheManager.getBoolean(context,CIMCacheManager.KEY_CIM_CONNECTION_STATE); return CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE);
} }
private static String getVersionName(Context context) { private static String getVersionName(Context context) {
String versionName = null; String versionName = null;
try { try {

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

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android; package com.farsunset.cim.sdk.android;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.Handler; import android.os.Handler;
@ -28,95 +29,85 @@ import android.os.Message;
import android.util.Log; import android.util.Log;
import com.farsunset.cim.sdk.android.model.SentBody; import com.farsunset.cim.sdk.android.model.SentBody;
/** /**
* 与服务端连接服务 * 与服务端连接服务
*
* @author 3979434 * @author 3979434
* *
*/ */
public class CIMPushService extends Service { public class CIMPushService extends Service {
private final String TAG = CIMPushService.class.getSimpleName(); private final String TAG = CIMPushService.class.getSimpleName();
public final static String KEY_DELAYED_TIME ="KEY_DELAYED_TIME"; public final static String KEY_DELAYED_TIME = "KEY_DELAYED_TIME";
private CIMConnectorManager manager; private CIMConnectorManager manager;
@Override @Override
public void onCreate() public void onCreate() {
{
manager = CIMConnectorManager.getManager(this.getApplicationContext()); manager = CIMConnectorManager.getManager(this.getApplicationContext());
} }
Handler connectionHandler = new Handler() {
Handler connectionHandler = new Handler(){
@Override @Override
public void handleMessage(android.os.Message message){ public void handleMessage(android.os.Message message) {
connectionHandler.removeMessages(0); connectionHandler.removeMessages(0);
String host = message.getData().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST); String host = message.getData().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST);
int port = message.getData().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT,0); int port = message.getData().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT, 0);
manager.connect(host, port); manager.connect(host, port);
} }
}; };
@Override @Override
public int onStartCommand(Intent intent,int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent); intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent);
String action = intent.getAction(); String action = intent.getAction();
if(CIMPushManager.ACTION_CREATE_CIM_CONNECTION.equals(action)) if (CIMPushManager.ACTION_CREATE_CIM_CONNECTION.equals(action)) {
{
long delayMillis = intent.getLongExtra(KEY_DELAYED_TIME,0); long delayMillis = intent.getLongExtra(KEY_DELAYED_TIME, 0);
if( delayMillis > 0){ if (delayMillis > 0) {
Message msg = connectionHandler.obtainMessage(); Message msg = connectionHandler.obtainMessage();
msg.what = 0; msg.what = 0;
msg.setData(intent.getExtras()); msg.setData(intent.getExtras());
connectionHandler.sendMessageDelayed(msg, delayMillis); connectionHandler.sendMessageDelayed(msg, delayMillis);
}else } else {
{
String host = intent.getStringExtra(CIMCacheManager.KEY_CIM_SERVIER_HOST); String host = intent.getStringExtra(CIMCacheManager.KEY_CIM_SERVIER_HOST);
int port = intent.getIntExtra(CIMCacheManager.KEY_CIM_SERVIER_PORT,0); int port = intent.getIntExtra(CIMCacheManager.KEY_CIM_SERVIER_PORT, 0);
manager.connect(host,port); manager.connect(host, port);
} }
} }
if(CIMPushManager.ACTION_SEND_REQUEST_BODY.equals(action)) if (CIMPushManager.ACTION_SEND_REQUEST_BODY.equals(action)) {
{
manager.send((SentBody) intent.getSerializableExtra(CIMPushManager.KEY_SEND_BODY)); manager.send((SentBody) intent.getSerializableExtra(CIMPushManager.KEY_SEND_BODY));
} }
if(CIMPushManager.ACTION_CLOSE_CIM_CONNECTION.equals(action)) if (CIMPushManager.ACTION_CLOSE_CIM_CONNECTION.equals(action)) {
{
manager.closeSession(); manager.closeSession();
} }
if(CIMPushManager.ACTION_DESTORY.equals(action)) if (CIMPushManager.ACTION_DESTORY.equals(action)) {
{
manager.destroy(); manager.destroy();
this.stopSelf(); this.stopSelf();
} }
if(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE.equals(action) ) if (CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE.equals(action)) {
{ if (!manager.isConnected()) {
if(!manager.isConnected()){
boolean isManualStop = CIMCacheManager.getBoolean(getApplicationContext(),CIMCacheManager.KEY_MANUAL_STOP); boolean isManualStop = CIMCacheManager.getBoolean(getApplicationContext(),
CIMCacheManager.KEY_MANUAL_STOP);
Log.w(TAG, "manager.isConnected() == false, isManualStop == " + isManualStop); Log.w(TAG, "manager.isConnected() == false, isManualStop == " + isManualStop);
CIMPushManager.connect(this,0); CIMPushManager.connect(this, 0);
}else } else {
{
Log.i(TAG, "manager.isConnected() == true"); Log.i(TAG, "manager.isConnected() == true");
} }
} }
return START_STICKY; return START_STICKY;
} }

43
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/constant/CIMConstant.java
View File

@ -26,30 +26,28 @@ package com.farsunset.cim.sdk.android.constant;
*/ */
public interface CIMConstant { public interface CIMConstant {
long RECONN_INTERVAL_TIME= 30 * 1000; long RECONN_INTERVAL_TIME = 30 * 1000;
//消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度 // 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
int DATA_HEADER_LENGTH = 3; int DATA_HEADER_LENGTH = 3;
public static interface ReturnCode{
String CODE_404 ="404"; public static interface ReturnCode {
String CODE_403 ="403"; String CODE_404 = "404";
String CODE_405 ="405"; String CODE_403 = "403";
String CODE_200 ="200"; String CODE_405 = "405";
String CODE_206 ="206"; String CODE_200 = "200";
String CODE_500 ="500"; String CODE_206 = "206";
String CODE_500 = "500";
} }
public static interface ProtobufType {
public static interface ProtobufType{
byte C_H_RS = 0; byte C_H_RS = 0;
byte S_H_RQ = 1; byte S_H_RQ = 1;
byte MESSAGE = 2; byte MESSAGE = 2;
@ -57,27 +55,24 @@ public interface CIMConstant {
byte REPLYBODY = 4; byte REPLYBODY = 4;
} }
public static interface RequestKey{ public static interface RequestKey {
String CLIENT_BIND = "client_bind";
String CLIENT_BIND ="client_bind"; String CLIENT_LOGOUT = "client_logout";
String CLIENT_LOGOUT ="client_logout";
@Deprecated @Deprecated
String CLIENT_PULL_MESSAGE ="client_pull_message"; String CLIENT_PULL_MESSAGE = "client_pull_message";
} }
public static interface MessageAction {
public static interface MessageAction{ // 被其他设备登录挤下线消息
String ACTION_999 = "999";
//被其他设备登录挤下线消息
String ACTION_999 ="999";
} }
public static interface IntentAction {
public static interface IntentAction{
// 消息广播action // 消息广播action
String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED"; String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED";
@ -103,7 +98,7 @@ public interface CIMConstant {
// 网络变化广播 // 网络变化广播
String ACTION_NETWORK_CHANGED = "android.net.conn.CONNECTIVITY_CHANGE"; String ACTION_NETWORK_CHANGED = "android.net.conn.CONNECTIVITY_CHANGE";
//重试连接 // 重试连接
String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY"; String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY";
// 未知异常 // 未知异常

3
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/filter/ClientMessageDecoder.java
View File

@ -41,6 +41,7 @@ import io.netty.handler.codec.ByteToMessageDecoder;
*/ */
public class ClientMessageDecoder extends ByteToMessageDecoder { public class ClientMessageDecoder extends ByteToMessageDecoder {
final static String TAG = ClientMessageDecoder.class.getSimpleName(); final static String TAG = ClientMessageDecoder.class.getSimpleName();
@Override @Override
protected void decode(ChannelHandlerContext arg0, ByteBuf buffer, List<Object> queue) throws Exception { protected void decode(ChannelHandlerContext arg0, ByteBuf buffer, List<Object> queue) throws Exception {
@ -73,7 +74,7 @@ public class ClientMessageDecoder extends ByteToMessageDecoder {
Object message = mappingMessageObject(dataBytes, conetnType); Object message = mappingMessageObject(dataBytes, conetnType);
if(message!=null){ if (message != null) {
queue.add(message); queue.add(message);
} }

14
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/filter/ClientMessageEncoder.java
View File

@ -21,7 +21,6 @@
*/ */
package com.farsunset.cim.sdk.android.filter; package com.farsunset.cim.sdk.android.filter;
import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.constant.CIMConstant;
import com.farsunset.cim.sdk.android.model.Protobufable; import com.farsunset.cim.sdk.android.model.Protobufable;
@ -31,7 +30,6 @@ import io.netty.handler.codec.MessageToByteEncoder;
import android.util.Log; import android.util.Log;
/** /**
* 客户端消息发送前进行编码,可在此加密消息 * 客户端消息发送前进行编码,可在此加密消息
* *
@ -41,14 +39,12 @@ public class ClientMessageEncoder extends MessageToByteEncoder<Object> {
@Override @Override
protected void encode(ChannelHandlerContext ctx, Object message, ByteBuf out) throws Exception { protected void encode(ChannelHandlerContext ctx, Object message, ByteBuf out) throws Exception {
if (message instanceof Protobufable) {
if(message instanceof Protobufable){
Protobufable data = (Protobufable) message; Protobufable data = (Protobufable) message;
byte[] byteArray = data.getByteArray(); byte[] byteArray = data.getByteArray();
out.writeBytes(createHeader(data.getType(), byteArray.length));
out.writeBytes(createHeader(data.getType(),byteArray.length));
out.writeBytes(byteArray); out.writeBytes(byteArray);
} }
@ -58,11 +54,12 @@ public class ClientMessageEncoder extends MessageToByteEncoder<Object> {
/** /**
* 消息体最大为65535 * 消息体最大为65535
*
* @param type * @param type
* @param length * @param length
* @return * @return
*/ */
private byte[] createHeader(byte type,int length){ private byte[] createHeader(byte type, int length) {
byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH]; byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH];
header[0] = type; header[0] = type;
header[1] = (byte) (length & 0xff); header[1] = (byte) (length & 0xff);
@ -70,7 +67,4 @@ public class ClientMessageEncoder extends MessageToByteEncoder<Object> {
return header; return header;
} }
} }

8
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatRequest.java
View File

@ -24,11 +24,12 @@ package com.farsunset.cim.sdk.android.model;
import java.io.Serializable; import java.io.Serializable;
import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.constant.CIMConstant;
/** /**
* 服务端心跳请求 * 服务端心跳请求
* *
*/ */
public class HeartbeatRequest implements Serializable,Protobufable { public class HeartbeatRequest implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String TAG = "SERVER_HEARTBEAT_REQUEST"; private static final String TAG = "SERVER_HEARTBEAT_REQUEST";
@ -36,7 +37,7 @@ public class HeartbeatRequest implements Serializable,Protobufable {
private static HeartbeatRequest object = new HeartbeatRequest(); private static HeartbeatRequest object = new HeartbeatRequest();
private HeartbeatRequest(){ private HeartbeatRequest() {
} }
@ -49,11 +50,10 @@ public class HeartbeatRequest implements Serializable,Protobufable {
return CMD_HEARTBEAT_RESPONSE.getBytes(); return CMD_HEARTBEAT_RESPONSE.getBytes();
} }
public String toString(){ public String toString() {
return TAG; return TAG;
} }
@Override @Override
public byte getType() { public byte getType() {
return CIMConstant.ProtobufType.S_H_RQ; return CIMConstant.ProtobufType.S_H_RQ;

8
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatResponse.java
View File

@ -24,10 +24,11 @@ package com.farsunset.cim.sdk.android.model;
import java.io.Serializable; import java.io.Serializable;
import com.farsunset.cim.sdk.android.constant.CIMConstant; import com.farsunset.cim.sdk.android.constant.CIMConstant;
/** /**
* 客户端心跳响应 * 客户端心跳响应
*/ */
public class HeartbeatResponse implements Serializable,Protobufable { public class HeartbeatResponse implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String TAG = "CLIENT_HEARTBEAT_RESPONSE"; private static final String TAG = "CLIENT_HEARTBEAT_RESPONSE";
@ -35,19 +36,20 @@ public class HeartbeatResponse implements Serializable,Protobufable {
private static HeartbeatResponse object = new HeartbeatResponse(); private static HeartbeatResponse object = new HeartbeatResponse();
private HeartbeatResponse(){ private HeartbeatResponse() {
} }
public static HeartbeatResponse getInstance() { public static HeartbeatResponse getInstance() {
return object; return object;
} }
@Override @Override
public byte[] getByteArray() { public byte[] getByteArray() {
return CMD_HEARTBEAT_RESPONSE.getBytes(); return CMD_HEARTBEAT_RESPONSE.getBytes();
} }
public String toString(){ public String toString() {
return TAG; return TAG;
} }

22
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Message.java
View File

@ -30,13 +30,11 @@ public class Message implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 消息类型，用户自定义消息类别 * 消息类型，用户自定义消息类别
*/ */
private String mid; private String mid;
/** /**
* 消息类型，用户自定义消息类别 * 消息类型，用户自定义消息类别
*/ */
@ -59,8 +57,6 @@ public class Message implements Serializable {
*/ */
private String receiver; private String receiver;
/** /**
* content 内容格式 * content 内容格式
*/ */
@ -73,11 +69,10 @@ public class Message implements Serializable {
private long timestamp; private long timestamp;
public Message() {
public Message()
{
timestamp = System.currentTimeMillis(); timestamp = System.currentTimeMillis();
} }
public long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }
@ -86,14 +81,14 @@ public class Message implements Serializable {
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getAction() { public String getAction() {
return action; return action;
} }
public void setAction(String action) { public void setAction(String action) {
this.action = action; this.action = action;
} }
public String getTitle() { public String getTitle() {
return title; return title;
} }
@ -126,7 +121,6 @@ public class Message implements Serializable {
this.receiver = receiver; this.receiver = receiver;
} }
public String getFormat() { public String getFormat() {
return format; return format;
} }
@ -135,14 +129,14 @@ public class Message implements Serializable {
this.format = format; this.format = format;
} }
public String getExtra() { public String getExtra() {
return extra; return extra;
} }
public void setExtra(String extra) { public void setExtra(String extra) {
this.extra = extra; this.extra = extra;
} }
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
@ -159,7 +153,6 @@ public class Message implements Serializable {
return buffer.toString(); return buffer.toString();
} }
public String getMid() { public String getMid() {
return mid; return mid;
} }
@ -169,8 +162,7 @@ public class Message implements Serializable {
} }
public boolean isNotEmpty(String txt) { public boolean isNotEmpty(String txt) {
return txt != null && txt.trim().length()!=0; return txt != null && txt.trim().length() != 0;
} }
} }

1
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Protobufable.java
View File

@ -20,6 +20,7 @@
*************************************************************************************** ***************************************************************************************
*/ */
package com.farsunset.cim.sdk.android.model; package com.farsunset.cim.sdk.android.model;
/** /**
* 需要向另一端发送的结构体 * 需要向另一端发送的结构体
*/ */

15
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/ReplyBody.java
View File

@ -39,7 +39,6 @@ public class ReplyBody implements Serializable {
*/ */
private String key; private String key;
/** /**
* 返回码 * 返回码
*/ */
@ -50,16 +49,13 @@ public class ReplyBody implements Serializable {
*/ */
private String message; private String message;
private long timestamp; private long timestamp;
/** /**
* 返回数据集合 * 返回数据集合
*/ */
private Hashtable<String, String> data = new Hashtable<String, String>(); private Hashtable<String, String> data = new Hashtable<String, String>();
public long getTimestamp() { public long getTimestamp() {
return timestamp; return timestamp;
} }
@ -68,8 +64,6 @@ public class ReplyBody implements Serializable {
this.timestamp = timestamp; this.timestamp = timestamp;
} }
public String getKey() { public String getKey() {
return key; return key;
} }
@ -114,19 +108,16 @@ public class ReplyBody implements Serializable {
this.code = code; this.code = code;
} }
public String toString() {
public String toString()
{
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#ReplyBody#").append("\n"); buffer.append("#ReplyBody#").append("\n");
buffer.append("key:").append(this.getKey()).append("\n"); buffer.append("key:").append(this.getKey()).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n"); buffer.append("timestamp:").append(timestamp).append("\n");
buffer.append("code:").append(code).append("\n"); buffer.append("code:").append(code).append("\n");
if(!data.isEmpty()){ if (!data.isEmpty()) {
buffer.append("data{").append("\n"); buffer.append("data{").append("\n");
for(String key:getKeySet()) for (String key : getKeySet()) {
{
buffer.append(key).append(":").append(this.get(key)).append("\n"); buffer.append(key).append(":").append(this.get(key)).append("\n");
} }
buffer.append("}"); buffer.append("}");

16
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/SentBody.java
View File

@ -32,7 +32,7 @@ import com.farsunset.cim.sdk.android.model.proto.SentBodyProto;
* java |android 客户端请求结构 * java |android 客户端请求结构
* *
*/ */
public class SentBody implements Serializable,Protobufable { public class SentBody implements Serializable, Protobufable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -67,18 +67,16 @@ public class SentBody implements Serializable,Protobufable {
} }
public void put(String k, String v) { public void put(String k, String v) {
if(k == null || v == null){ if (k == null || v == null) {
return; return;
} }
data.put(k, v); data.put(k, v);
} }
public Set<String> getKeySet() { public Set<String> getKeySet() {
return data.keySet(); return data.keySet();
} }
public void remove(String k) { public void remove(String k) {
data.remove(k); data.remove(k);
} }
@ -86,13 +84,13 @@ public class SentBody implements Serializable,Protobufable {
@Override @Override
public String toString() { public String toString() {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("#SentBody#").append("\n");; buffer.append("#SentBody#").append("\n");
;
buffer.append("key:").append(key).append("\n"); buffer.append("key:").append(key).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n"); buffer.append("timestamp:").append(timestamp).append("\n");
if(!data.isEmpty()){ if (!data.isEmpty()) {
buffer.append("data{").append("\n"); buffer.append("data{").append("\n");
for(String key:getKeySet()) for (String key : getKeySet()) {
{
buffer.append(key).append(":").append(this.get(key)).append("\n"); buffer.append(key).append(":").append(this.get(key)).append("\n");
} }
buffer.append("}"); buffer.append("}");
@ -105,7 +103,7 @@ public class SentBody implements Serializable,Protobufable {
SentBodyProto.Model.Builder builder = SentBodyProto.Model.newBuilder(); SentBodyProto.Model.Builder builder = SentBodyProto.Model.newBuilder();
builder.setKey(key); builder.setKey(key);
builder.setTimestamp(timestamp); builder.setTimestamp(timestamp);
if(!data.isEmpty()){ if (!data.isEmpty()) {
builder.putAllData(data); builder.putAllData(data);
} }
return builder.build().toByteArray(); return builder.build().toByteArray();

617
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java
View File

File diff suppressed because it is too large Load Diff

672
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java
View File

File diff suppressed because it is too large Load Diff

586
cim_for_netty/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More