|
|
@@ -9,8 +9,10 @@ import android.os.Handler;
|
|
|
import android.os.Message;
|
|
|
import android.util.Log;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
+import com.common.LogUtil;
|
|
|
import com.core.app.MyApplication;
|
|
|
-import com.core.utils.CommonUtil;
|
|
|
+import com.core.net.utils.NetUtils;
|
|
|
|
|
|
import org.apache.harmony.javax.security.sasl.SaslException;
|
|
|
import org.jivesoftware.smack.AbstractConnectionListener;
|
|
|
@@ -107,18 +109,22 @@ public class XmppConnectionManager {
|
|
|
// NetworkInfo wifi = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
|
|
|
// boolean isConnectedGprs = gprs != null && gprs.isConnected();
|
|
|
// boolean isConnectedWifi = wifi != null && wifi.isConnected();
|
|
|
- return CommonUtil.isNetWorkConnected(MyApplication.getInstance());
|
|
|
+ return NetUtils.isNetWorkConnected(MyApplication.getInstance());
|
|
|
}
|
|
|
|
|
|
private BroadcastReceiver mNetWorkChangeReceiver = new BroadcastReceiver() {
|
|
|
@Override
|
|
|
public void onReceive(Context context, Intent intent) {
|
|
|
+ LogUtil.d("roamer","app net intent:"+ JSON.toJSONString(intent));
|
|
|
if (!intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
|
|
|
return;
|
|
|
}
|
|
|
final boolean isConnected = isGprsOrWifiConnected();
|
|
|
- if (mIsNetWorkActive != isConnected) {// 和之前的状态不同
|
|
|
- Log.d("roamer", "网络状态改变了doLogining:"+doLogining);
|
|
|
+ LogUtil.d("roamer"," app net isConnected:"+isConnected);
|
|
|
+ LogUtil.d("roamer"," app net mIsNetWorkActive:"+mIsNetWorkActive);
|
|
|
+ LogUtil.d("roamer"," app net mConnection:"+mConnection.isConnected());
|
|
|
+ if (mIsNetWorkActive != isConnected||!mConnection.isConnected()) {// 和之前的状态不同
|
|
|
+ Log.d("roamer", " doLogining:"+doLogining);
|
|
|
mIsNetWorkActive = isConnected;
|
|
|
// 网络状态改变了
|
|
|
if (!mIsNetWorkActive) {// 由有网变为没网
|
|
|
@@ -128,6 +134,7 @@ public class XmppConnectionManager {
|
|
|
} else {
|
|
|
doLogining=true;
|
|
|
if (isLoginAllowed()) {
|
|
|
+ Log.d("roamer", "app try login:"+isLoginAllowed());
|
|
|
login(mLoginUserId, mLoginPassword);
|
|
|
}
|
|
|
}
|
|
|
@@ -198,12 +205,12 @@ public class XmppConnectionManager {
|
|
|
private boolean doLogining = false;
|
|
|
|
|
|
private boolean isLoginAllowed() {
|
|
|
-// LogUtil.d("Xmpp","---------isLoginAllowed()------------");
|
|
|
-// LogUtil.d("Xmpp","doLogining:"+doLogining);
|
|
|
-// LogUtil.d("Xmpp","mIsNetWorkActive:"+mIsNetWorkActive);
|
|
|
-// LogUtil.d("Xmpp","!mConnection.isConnected():"+!mConnection.isConnected());
|
|
|
-// LogUtil.d("Xmpp","!mConnection.isAuthenticated():"+!mConnection.isAuthenticated());
|
|
|
-// LogUtil.d("Xmpp","---------isLoginAllowed()------------");
|
|
|
+ LogUtil.d("roamer","---------isLoginAllowed()------------");
|
|
|
+ LogUtil.d("roamer","doLogining:"+doLogining);
|
|
|
+ LogUtil.d("roamer","mIsNetWorkActive:"+mIsNetWorkActive);
|
|
|
+ LogUtil.d("roamer","!mConnection.isConnected():"+!mConnection.isConnected());
|
|
|
+ LogUtil.d("roamer","!mConnection.isAuthenticated():"+!mConnection.isAuthenticated());
|
|
|
+ LogUtil.d("roamer","---------isLoginAllowed()------------");
|
|
|
return doLogining && mIsNetWorkActive && (!mConnection.isConnected() || !mConnection.isAuthenticated());
|
|
|
}
|
|
|
|