Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into fix_bug

# Conflicts:
#	WeiChat/build.gradle
#	WeiChat/src/main/res/layout/fragment_message.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/NetWorkObservable.java

@@ -6,10 +6,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.database.Observable;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.util.Log;
 
 import com.xzjmyk.pm.activity.NetWorkObservable.NetWorkObserver;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 
 public class NetWorkObservable extends Observable<NetWorkObserver> {
 	public static interface NetWorkObserver {
@@ -25,7 +25,9 @@ public class NetWorkObservable extends Observable<NetWorkObserver> {
 		mContext = context;
 		// 获取程序启动时的网络状态
 		mConnectivityManager = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-		mIsNetWorkActive = isGprsOrWifiConnected();
+		
+		mIsNetWorkActive = CommonUtil.isNetWorkConnected(mContext);
+				//isGprsOrWifiConnected();
 		if (AppConfig.DEBUG) {
 			Log.d(AppConfig.TAG, "mIsNetWorkActive:" + mIsNetWorkActive);
 		}
@@ -36,11 +38,11 @@ public class NetWorkObservable extends Observable<NetWorkObserver> {
 	}
 
 	private boolean isGprsOrWifiConnected() {
-		NetworkInfo gprs = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-		NetworkInfo wifi = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-		boolean isConnectedGprs = gprs != null && gprs.isConnected();
-		boolean isConnectedWifi = wifi != null && wifi.isConnected();
-		return isConnectedGprs || isConnectedWifi;
+//		NetworkInfo gprs = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
+//		NetworkInfo wifi = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+//		boolean isConnectedGprs = gprs != null && gprs.isConnected();
+//		boolean isConnectedWifi = wifi != null && wifi.isConnected();
+		return CommonUtil.isNetWorkConnected(MyApplication.getInstance());
 	}
 
 	private BroadcastReceiver mNetWorkChangeReceiver = new BroadcastReceiver() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -495,8 +495,11 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
 
     private void doUserCheck() {
         if (!MyApplication.getInstance().isNetworkActive()) {
+//            if (mMessageFragment!=null)
+//            mMessageFragment.setNetNoticeVisiable(true);
             return;
         }
+//        if (mMessageFragment!=null) mMessageFragment.setNetNoticeVisiable(false);
         if (MyApplication.getInstance().mUserStatusChecked) {
             return;
         }
@@ -667,12 +670,12 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private void updateMessageTitle() {
         if (mImStatus == AuthStateListener.AUTH_STATE_NOT) {
             getSupportActionBar().setTitle(R.string.msg_offline);
-            mMessageFragment.setNetNoticeVisiable(true);
+           // mMessageFragment.setNetNoticeVisiable(true);
         } else if (mImStatus == AuthStateListener.AUTH_STATE_ING) {
             getSupportActionBar().setTitle(R.string.msg_connect);
         } else if (mImStatus == AuthStateListener.AUTH_STATE_SUCCESS) {
             getSupportActionBar().setTitle(R.string.msg_online);
-            mMessageFragment.setNetNoticeVisiable(false);
+           // mMessageFragment.setNetNoticeVisiable(false);
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -17,6 +17,7 @@ import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.Md5Util;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -125,10 +126,13 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             params.put("latitude", String.valueOf(latitude));
         if (longitude != 0)
             params.put("longitude", String.valueOf(longitude));
+        LogUtil.d("login:"+mConfig.USER_LOGIN);
+        LogUtil.d(JSON.toJSONString(params));
         final StringJsonObjectRequest<LoginRegisterResult> request = new StringJsonObjectRequest<LoginRegisterResult>(mConfig.USER_LOGIN,
                 new ErrorListener() {
                     @Override
                     public void onErrorResponse(VolleyError arg0) {
+                        LogUtil.d(JSON.toJSONString(arg0.getMessage()));
                         ProgressDialogUtil.dismiss(dialog);
                         ToastUtil.showErrorNet(mContext);
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -37,7 +37,6 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.TestActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -336,9 +335,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(new Intent(getActivity(), LocalVideoActivity.class));
                 break;
             case R.id.setting_rl:// 设置
-                startActivity(new Intent(getActivity(), DataFormDetailActivity.class));
+                // startActivity(new Intent(getActivity(), DataFormDetailActivity.class));
                // startActivity(new Intent(getActivity(), DataFormFieldActivity.class));
-              // startActivity(new Intent(getActivity(), SettingActivity.class));
+               startActivity(new Intent(getActivity(), SettingActivity.class));
                 break;
             case R.id.app_scan_code_rl://APP二维码
                 ImageView imageView = new ImageView(getActivity());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Color;
+import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -145,10 +146,26 @@ public class MessageFragment extends EasyFragment {
         return R.layout.fragment_message;
     }
 
+    /**
+      * @desc:监听网络变化
+      * @author：Arison on 2016/11/30
+      */
+    private BroadcastReceiver mNetWorkChangeReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (CommonUtil.isNetWorkConnected(MyApplication.getInstance())){
+                setNetNoticeVisiable(false);
+            }else{
+                setNetNoticeVisiable(true);
+            }
+        }
+    };
+    
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         mActivity.registerReceiver(mUpdateReceiver, new IntentFilter(MsgBroadcast.ACTION_MSG_UI_UPDATE));
         mActivity.registerReceiver(receiver, new IntentFilter(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE));
+        mActivity.registerReceiver(mNetWorkChangeReceiver,new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
         if (createView) {
             initView();
         }
@@ -159,6 +176,7 @@ public class MessageFragment extends EasyFragment {
         super.onDestroy();
         mActivity.unregisterReceiver(mUpdateReceiver);
         mActivity.unregisterReceiver(receiver);
+        mActivity.unregisterReceiver(mNetWorkChangeReceiver);
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/volley/FastVolley.java

@@ -10,6 +10,7 @@ import com.android.volley.RetryPolicy;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.Volley;
 import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 
 public class FastVolley {
 
@@ -42,7 +43,7 @@ public class FastVolley {
 		if (request == null) {
 			return;
 		}
-		if (!MyApplication.getInstance().isNetworkActive()) {
+		if (!CommonUtil.isNetWorkConnected(MyApplication.getInstance())) {
 			request.deliverError(new VolleyError(new NetworkError()));
 			return;
 		}

WeiChat/src/main/java/com/xzjmyk/pm/activity/volley/StringJsonObjectRequest.java

@@ -165,6 +165,7 @@ public class StringJsonObjectRequest<T> extends Request<String> {
         if (FastVolley.DEBUG) {
             Log.d(FastVolley.TAG, "StringJsonRequest deliverResponse:" + arg0);
         }
+      //  MyApplication.getInstance().isNetworkActive()
 
         if (TextUtils.isEmpty(arg0)) {
             deliverError(new VolleyError(new NetworkError()));

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

@@ -5,12 +5,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
 import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 
 import org.apache.harmony.javax.security.sasl.SaslException;
 import org.jivesoftware.smack.AbstractConnectionListener;
@@ -103,11 +103,11 @@ public class XmppConnectionManager {
 	}
 
 	private boolean isGprsOrWifiConnected() {
-		NetworkInfo gprs = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-		NetworkInfo wifi = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-		boolean isConnectedGprs = gprs != null && gprs.isConnected();
-		boolean isConnectedWifi = wifi != null && wifi.isConnected();
-		return isConnectedGprs || isConnectedWifi;
+//		NetworkInfo gprs = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
+//		NetworkInfo wifi = mConnectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+//		boolean isConnectedGprs = gprs != null && gprs.isConnected();
+//		boolean isConnectedWifi = wifi != null && wifi.isConnected();
+		return CommonUtil.isNetWorkConnected(MyApplication.getInstance());
 	}
 
 	private BroadcastReceiver mNetWorkChangeReceiver = new BroadcastReceiver() {