修改部分bug，

修复用户名可以为空问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/HttpUtil.java

@@ -53,7 +53,7 @@ public class HttpUtil {
             LinkedHashMap<String, Object> headers,
             boolean sign) throws Exception {
         SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
-        DefaultHttpClient httpClient =  MyHttpClient.getNewHttpClient();
+        DefaultHttpClient httpClient = MyHttpClient.getNewHttpClient();
         HttpResponse response = null;
         try {
             StringBuilder buf = new StringBuilder(url);
@@ -100,7 +100,7 @@ public class HttpUtil {
             LinkedHashMap<String, Object> headers,
             boolean sign) throws Exception {
         SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
-        DefaultHttpClient httpClient =  MyHttpClient.getNewHttpClient();
+        DefaultHttpClient httpClient = MyHttpClient.getNewHttpClient();
         HttpResponse response = null;
         if (sign) {
             url += (url.indexOf("?") == -1 ? "?" : "&") + "_timestamp="
@@ -125,7 +125,6 @@ public class HttpUtil {
             httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             if (headers != null) {
                 for (String key : headers.keySet()) {
-                    System.out.println("add header:" + key + " value:" + headers.get(key).toString());
                     httpPost.addHeader(key, headers.get(key).toString());
                 }
             }
@@ -142,7 +141,7 @@ public class HttpUtil {
             String bodyString,
             boolean sign) throws Exception {
         SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
-        DefaultHttpClient httpClient =  MyHttpClient.getNewHttpClient();
+        DefaultHttpClient httpClient = MyHttpClient.getNewHttpClient();
         HttpResponse response = null;
         if (sign) {
             url += (url.indexOf("?") == -1 ? "?" : "&") + "_timestamp="

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MessagePresenter.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
@@ -63,7 +64,6 @@ public class MessagePresenter implements OnHttpResultListener {
     private final int LOAD_TASK = 0x14;
     private final int LOAD_EMNEWS_DETAILS = 0x15;
     private final int LOAD_B2B_COUNT = 0x16;//获取b2b的审批和任务数量
-    private final int READ_EMNEWS = 0x17;
     public static final String AUTO_SIGIN_ALART = "AUTO_SIGIN_ALART";
 
     private String SUB_READ_TIME;//订阅好点击阅读时间
@@ -77,22 +77,18 @@ public class MessagePresenter implements OnHttpResultListener {
 
     private String filter;//搜索数据
     private int emnewsNum, subsNum, processNum, taskNum;//红点消息分类数量
-
-
-    private String[] RECEIVER_LIST = {ConnectivityManager.CONNECTIVITY_ACTION, AUTO_SIGIN_ALART};
-    /**
-     * @desc:监听网络变化
-     * @author：Arison on 2016/11/30
-     */
+    private String[] RECEIVER_LIST = {ConnectivityManager.CONNECTIVITY_ACTION, AUTO_SIGIN_ALART, MsgBroadcast.ACTION_MSG_COMPANY_UPDATE, "com.app.home.update"};
     private BroadcastReceiver dataChangeReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (StringUtils.isEmpty(intent.getAction())) return;
             String action = intent.getAction();
+            if (StringUtils.isEmpty(action)) return;
             if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
                 iMessageView.changeNet(CommonUtil.isNetWorkConnected(MyApplication.getInstance()));
             } else if (AUTO_SIGIN_ALART.equals(action)) {
                 loadNews(isB2b);//获取消息
+            } else if (action.equals("com.app.home.update") || action.equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {
+                loadData();
             }
         }
     };
@@ -109,7 +105,7 @@ public class MessagePresenter implements OnHttpResultListener {
             IntentFilter dateFilter = new IntentFilter();
             for (String f : RECEIVER_LIST)
                 dateFilter.addAction(f);
-            ct.registerReceiver(dataChangeReceiver, dateFilter);
+            LocalBroadcastManager.getInstance(ct).registerReceiver(dataChangeReceiver, dateFilter);
         }
     }
 
@@ -860,6 +856,10 @@ public class MessagePresenter implements OnHttpResultListener {
     }
 
     public void onDestroyView(MainActivity mContext) {
-        ct.unregisterReceiver(dataChangeReceiver);
+        try {
+            mContext.unregisterReceiver(dataChangeReceiver);
+        } catch (Exception e) {
+
+        }
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -556,7 +556,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
      */
     private void submitWork(ArrayList<WorkModel> models, String macAddress) {
         subMitTime = System.currentTimeMillis();
-        if (true) {
+        if (isB2b) {
             Bundle bundle = new Bundle();
             bundle.putParcelableArrayList("models", models);
             signinWork(bundle, "");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/AutoErpSigninUitl.java

@@ -406,8 +406,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                                 signinWork(bundle, message);
                             }
                         });
-                    }else {
-                        CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed),message);
+                    } else {
+                        CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), message);
                     }
                     break;
                 case SIGNING:
@@ -417,7 +417,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                                 StringUtils.isEmpty(subtitle) ? getString(R.string.uu_auto_work_signined_up) : subtitle);
                         if (saveOk) {
                             Intent intent = new Intent(MessagePresenter.AUTO_SIGIN_ALART);
-                            LocalBroadcastManager.getInstance(ct).sendBroadcast(intent);
+                            LocalBroadcastManager.getInstance(MyApplication.getInstance()).sendBroadcast(intent);
                         }
                     }
                     loadLog(bundle);
@@ -507,13 +507,13 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
             String msg = null;
             if (StringUtils.isInclude(message, MyApplication.getInstance().getString(R.string.is_not_common_device))) {
                 msg = MyApplication.getInstance().getString(R.string.is_not_common_device_not_signin);
-                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed),msg);
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), msg);
             } else if (StringUtils.isInclude(message, "设备正处于申请变更绑定阶段")) {
                 msg = MyApplication.getInstance().getString(R.string.is_changeing_not_signin);
-                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed),msg);
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), msg);
             } else if (StringUtils.isInclude(message, "该设备已被他人绑定")) {
                 msg = MyApplication.getInstance().getString(R.string.is_binded_other_not_signin);
-                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed),msg);
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), msg);
             } else if (what == SIGNIN_MISSION) {
                 try {
                     Intent intent = new Intent();

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

@@ -141,7 +141,6 @@ public class ChatActivity extends ActionBackActivity
             int i = mFriend.getClickNum();
             FriendHelper.addGoodFriend(mFriend);
             if (i < 10 && mFriend.getClickNum() == 10) {
-                //TODO 更新通讯录为常用联系人
                 Intent intent = new Intent("com.app.home.update");
                 intent.putExtra("isGood", true);
                 sendBroadcast(intent);

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

@@ -1,12 +1,9 @@
 package com.xzjmyk.pm.activity.ui.message;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.v4.content.LocalBroadcastManager;
 import android.text.Editable;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -29,7 +26,6 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.audio.voicerecognition.VoiceToWord;
 import com.xzjmyk.pm.activity.bean.Friend;
-import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
@@ -99,8 +95,6 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
     public void onDestroy() {
         super.onDestroyView();
         presenter.onDestroyView(mContext);
-        LocalBroadcastManager.getInstance(MyApplication.getInstance()).unregisterReceiver(receiver);
-
     }
 
     @Override
@@ -163,29 +157,13 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
                 return true;
             }
         });
-
-        IntentFilter inputFilter = new IntentFilter();
-        LogUtil.d(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE);
-        inputFilter.addAction(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE);
-        inputFilter.addAction("com.app.home.update");
-        LocalBroadcastManager.getInstance(MyApplication.getInstance()).registerReceiver(receiver, inputFilter);
     }
 
-    private BroadcastReceiver receiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals("com.app.home.update")||intent.getAction().equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {
-                presenter.loadData();
-            }
-        }
-    };
+
 
     private void initView() {
         mVoice = new VoiceToWord(mContext, "534e3fe2");
         listView.getRefreshableView().addHeaderView(initHeaderView());
-//        listView.setShowIndicator(false);
-//        listView.getRefreshableView().setCacheColorHint(Color.parseColor("#000000"));
-//        listView.getRefreshableView().setScrollingCacheEnabled(false);
         listView.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
         mAdapter = new MessageAdapter(null, mContext);
         listView.getRefreshableView().setAdapter(mAdapter);