Update CIMPushManager.java

This commit is contained in:
远方夕阳 2014-09-04 14:36:53 +08:00
parent d792807714
commit 9e3a1f537b

View File

@ -14,7 +14,7 @@ import com.farsunset.cim.nio.mutual.SentBody;
public class CIMPushManager { public class CIMPushManager {
static String ACTION_CONNECTION ="ACTION_CONNECTION"; static String ACTION_CONNECTION ="ACTION_CONNECTION";
static String ACTION_CONNECTION_STATUS ="ACTION_CONNECTION_STATUS"; static String ACTION_CONNECTION_STATUS ="ACTION_CONNECTION_STATUS";
@ -75,21 +75,15 @@ public class CIMPushManager {
public static void setAccount(Context context,String account){ public static void setAccount(Context context,String account){
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_MANUAL_STOP, false); boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED);
if(isManualDestory || account==null || account.trim().length()==0)
if(account==null || account.trim().length()==0)
{ {
return ; return ;
} }
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_MANUAL_STOP, false);
CIMDataConfig.putString(context,CIMDataConfig.KEY_ACCOUNT, account); CIMDataConfig.putString(context,CIMDataConfig.KEY_ACCOUNT, account);
boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED);
if(isManualDestory || account==null){
return ;
}
String imei = ((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId(); String imei = ((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
SentBody sent = new SentBody(); SentBody sent = new SentBody();
sent.setKey(CIMConstant.RequestKey.CLIENT_BIND); sent.setKey(CIMConstant.RequestKey.CLIENT_BIND);
@ -120,10 +114,13 @@ public class CIMPushManager {
*/ */
public static void sendRequest(Context context,SentBody body){ public static void sendRequest(Context context,SentBody body){
boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED); boolean isManualStop = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_MANUAL_STOP);
if(isManualDestory){ boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED);
return ;
} if(isManualStop || isManualDestory)
{
return ;
}
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.putExtra(KEY_SEND_BODY, body); serviceIntent.putExtra(KEY_SEND_BODY, body);
@ -138,13 +135,13 @@ public class CIMPushManager {
*/ */
public static void stop(Context context){ public static void stop(Context context){
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_MANUAL_STOP, true);
boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED); boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED);
if(isManualDestory){ if(isManualDestory){
return ; return ;
} }
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_MANUAL_STOP, true);
Intent serviceIntent = new Intent(context, CIMPushService.class); Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.putExtra(SERVICE_ACTION, ACTION_DISCONNECTION); serviceIntent.putExtra(SERVICE_ACTION, ACTION_DISCONNECTION);
context.startService(serviceIntent); context.startService(serviceIntent);