调式im重连机制

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -749,8 +749,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_master")
-                .equals("USOFTSYS")) {
+        if ("USOFTSYS".equals(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_master"))
+                ) {
             if (PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
                 menu.findItem(R.id.oa_signin_set).setVisible(true);
             } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XReconnectionManager.java

@@ -359,7 +359,8 @@ public class XReconnectionManager extends AbstractConnectionListener {
 
 	@Override
 	public void connectionClosedOnError(Exception e) {
-		LogUtil.d("reconnect","<<connectionClosedOnError>> mConnection:"+((XMPPTCPConnection)mConnection).getUser());
+		LogUtil.d("reconnect","<<connectionClosedOnError>> mConnection:"+((XMPPTCPConnection)mConnection).getUser()
+		+" isAuthenticated():"+mConnection.isAuthenticated());
 		doReconnecting = true;
 		if (e instanceof StreamErrorException) {// 有人重复登陆
 			StreamErrorException xmppEx = (StreamErrorException) e;

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XmppConnectionManager.java

@@ -128,7 +128,7 @@ public class XmppConnectionManager {
 					}
 				} else {
 					LogUtil.d("Xmpp","isLoginAllowed():"+isLoginAllowed());
-					//doLogining=true;
+					doLogining=true;
 					if (isLoginAllowed()) {
 						login(mLoginUserId, mLoginPassword);
 					}