1：完成全部功能的迁移；下次进行百度推送的配置以及信息的界面更新；

skWeiChatBaidu/src/main/java/com/sk/weichat/db/dao/FriendDao.java

@@ -26,6 +26,7 @@ import com.sk.weichat.bean.message.XmppMessage;
 import com.sk.weichat.db.SQLiteHelper;
 import com.sk.weichat.db.SQLiteRawUtil;
 import com.sk.weichat.sp.TableVersionSp;
+import com.sk.weichat.ui.erp.util.ViewUtil;
 import com.sk.weichat.util.TimeUtils;
 import com.sk.weichat.xmpp.listener.ChatMessageListener;
 
@@ -80,9 +81,24 @@ public class FriendDao {
 	public void checkSystemFriend(String ownerId) {
 		try {
 			List<Friend> friendsList = friendDao.queryForEq("ownerId", ownerId);
-//			if (friendsList != null && friendsList.size() > 0) {// 说明不是第一次创建，直接返回
-//				return;
-//			}
+
+			if (friendsList != null && friendsList.size() > 0) {// 说明不是第一次创建，直接返回
+//				Friend friend = new Friend();
+//				friend.setOwnerId(ownerId);
+//				// 新朋友消息10001号
+//				friend.setUserId(Friend.ID_NEW_FRIEND_MESSAGE);
+//				friend.setNickName(Friend.NICKNAME_NEW_FRIEND_MESSAGE);
+//				friend.setStatus(Friend.STATUS_SYSTEM);
+//				friendsList = friendDao.queryForMatching(friend);
+//				if (friendsList == null || friendsList.size() <= 0) {// 添加这个新朋友消息10001号
+//					Log.i("FriendDao","创建系统菜单........");
+//				}else{
+					Log.i("FriendDao","发现已有系统菜单,直接返回！");
+					return;
+//				}
+			}
+
+
 
 			Friend friend = new Friend();
 			friend.setOwnerId(ownerId);
@@ -93,6 +109,7 @@ public class FriendDao {
 			friend.setStatus(Friend.STATUS_SYSTEM);
 			friendsList = friendDao.queryForMatching(friend);
 			if (friendsList == null || friendsList.size() <= 0) {// 添加这个新朋友消息10001号
+				Log.i("FriendDao","创建系统菜单........");
 				friendDao.create(friend);
 				// 添加一条新朋友提示，更新到好友表中
 				ChatMessage chatMessage = new ChatMessage();
@@ -156,7 +173,7 @@ public class FriendDao {
 			 friend.setStatus(Friend.STATUS_SYSTEM);// 不显示
 			 friendsList = friendDao.queryForMatching(friend);
 			 if (friendsList == null || friendsList.size() <= 0) {// 添加这个面试中心10003
-			 friendDao.create(friend);
+			     friendDao.create(friend);
 				 // 添加一条系统提示
 				 ChatMessage chatMessage = new ChatMessage();
 				 chatMessage.setType(XmppMessage.TYPE_TIP);
@@ -291,6 +308,7 @@ public class FriendDao {
 				markUserMessageUnRead(ownerId, Friend.ID_ERP_GONGGAO);
 				// 更新消息记录
 				updateLastChatMessage(ownerId, Friend.ID_ERP_GONGGAO, chatMessage);
+
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
@@ -336,6 +354,27 @@ public class FriendDao {
 		}
 	}
 
+	/**
+	 * 更新某个好友的阅读状态，设置多少条消息（设置+未读）
+	 *
+	 * @return
+	 */
+	public void markUserMessageUnRead(String ownerId, String friendId,int num) {
+		try {
+			PreparedQuery<Friend> preparedQuery = friendDao.queryBuilder().where().eq("ownerId", ownerId).and().eq("userId", friendId).prepare();
+			List<Friend> friendsList = friendDao.query(preparedQuery);
+			if (friendsList != null && friendsList.size() > 0) {
+				Friend friend = friendsList.get(0);
+				int unReadCount = friend.getUnReadNum();
+				friend.setUnReadNum(num+unReadCount);
+				friendDao.update(friend);
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+
+
 	/* 获取消息模块未读数量总和 */
 	public int getMsgUnReadNumTotal(String ownerId) {
 		try {
@@ -385,8 +424,13 @@ public class FriendDao {
 		List<Friend> friends = null;
 		try {
 			// 过滤条件，content不为空，status ==2（好友） status==8（显示系统号）
-			PreparedQuery<Friend> preparedQuery = friendDao.queryBuilder().orderBy("timeSend", false).where().eq("ownerId", ownerId).and()
-					.isNotNull("content").and().ge("status", Friend.STATUS_FRIEND).and().le("status", Friend.STATUS_SYSTEM).prepare();
+			PreparedQuery<Friend> preparedQuery = friendDao.queryBuilder()
+					.orderBy("timeSend", false)
+					.where().eq("ownerId", ownerId).and()
+					.isNotNull("content").and()
+					.ge("status", Friend.STATUS_FRIEND).and()
+					.le("status", Friend.STATUS_SYSTEM)
+					.prepare();
 			friends = friendDao.query(preparedQuery);
 		} catch (SQLException e) {
 			e.printStackTrace();
@@ -603,10 +647,14 @@ public class FriendDao {
 		if (TextUtils.isEmpty(content)) {
 			content = "";
 		}
+		Friend friend=FriendDao.getInstance().getFriend(ownerId,friendId);
+		Log.i("friend","friend status:"+friend.getStatus());
+		Log.i("friend","friend userId:"+friend.getUserId());
 		UpdateBuilder<Friend, Integer> builder = friendDao.updateBuilder();
 		try {
 			builder.updateColumnValue("content", content);
 			builder.updateColumnValue("type", type);
+			//builder.updateColumnValue("status",2);//陌生人也会显示在首页列表
 			builder.updateColumnValue("timeSend", message.getTimeSend());
 			builder.where().eq("ownerId", ownerId).and().eq("userId", friendId);
 			friendDao.update(builder.prepare());

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/CompanyContactsActivity.java

@@ -382,7 +382,7 @@ public class CompanyContactsActivity extends BaseActivity {
 
     private void initView() {
         initListener();
-        LoginErpServer();
+        mHandler.sendEmptyMessage(UPDATE_CHANGE_MASTER);
     }
 
     /**
@@ -566,14 +566,14 @@ public class CompanyContactsActivity extends BaseActivity {
      * @author：Administrator on 2016/1/30 17:50
      */
     public void LoginErpServer() {
-        String url = "http://218.17.158.219:8099/ERP" + "/mobile/login.action";
-        Map<String, Object> param = new HashMap<String, Object>();
-        param.put("username", "13510568818");
-        param.put("password", "111111");
-        param.put("master", "USOFTSYS");
-        CommonUtil.setSharedPreferences(ct, "erp_master", "USOFTSYS");
-        CommonUtil.setSharedPreferences(ct, "erp_commpany", "优软UAS标准版");
-        ViewUtil.httpSendRequest(ct, url, param, mHandler, null, LOAD_SUCCESS_LOGIN, null, null, "get");
+//        String url = "http://218.17.158.219:8099/ERP" + "/mobile/login.action";
+//        Map<String, Object> param = new HashMap<String, Object>();
+//        param.put("username", "13510568818");
+//        param.put("password", "111111");
+//        param.put("master", "USOFTSYS");
+//        CommonUtil.setSharedPreferences(ct, "erp_master", "USOFTSYS");
+//        CommonUtil.setSharedPreferences(ct, "erp_commpany", "优软UAS标准版");
+//        ViewUtil.httpSendRequest(ct, url, param, mHandler, null, LOAD_SUCCESS_LOGIN, null, null, "get");
     }
 
     /**
@@ -581,7 +581,7 @@ public class CompanyContactsActivity extends BaseActivity {
      * @功能:加载通讯录数据
      */
     public void LoadServerData(String master, String lastdate) {
-        String url = "http://218.17.158.219:8099/ERP/" + "mobile/getAllHrorgEmps.action";
+        String url = Constants.getAppBaseUrl(this) + "mobile/getAllHrorgEmps.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("master", master);
         if (lastdate == null) {

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/InformActivity.java

@@ -13,7 +13,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
+import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
+import com.sk.weichat.bean.Friend;
+import com.sk.weichat.db.dao.FriendDao;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.erp.adapter.SchedultAdapter;
 import com.sk.weichat.ui.erp.entity.AllProcess;
@@ -91,6 +94,9 @@ public class InformActivity extends BaseActivity {
         setContentView(R.layout.informed_listview);
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("我的知会");
+        String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        // 表示已读
+        FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_ZHIHUI);
         listview_main = (PullToRefreshListView) findViewById(R.id.listview_informed);
         mEmptyLayout = new EmptyLayout(this, listview_main.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/LeaveActivity.java

@@ -47,10 +47,8 @@ public class LeaveActivity extends BaseActivity  implements  OnClickListener{
     private final static int SUCCESS_UNCOMMIT = 3;
     private final static int SUCCESS_UPDATE = 4;
     private final static int SUCCESS_DELETE = 5;
-
     private final static int SUCCESS_LEAVETYPE = 9;
     private final static int SUCCESS_VACATION= 10;
-
     private final static int SUCCESS_MANKIND = 11;
 
     @ViewInject(R.id.ry_set_startTime)

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/NewsTwoActivity.java

@@ -9,7 +9,10 @@ import com.alibaba.fastjson.JSON;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
+import com.sk.weichat.bean.Friend;
+import com.sk.weichat.db.dao.FriendDao;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.erp.model.NewsEntity;
 import com.sk.weichat.ui.erp.net.ViewUtil;
@@ -55,6 +58,10 @@ public class NewsTwoActivity extends BaseActivity{
 		 ct=this;
          ViewUtils.inject(this);
          TAG="NewsTwoActivity";
+		String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+		// 表示已读
+		FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_NEWS);
+
      	 mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
     	 mEmptyLayout.setShowEmptyButton(false);
     	 mEmptyLayout.setShowErrorButton(false);

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/NoticesActivity.java

@@ -9,7 +9,10 @@ import com.alibaba.fastjson.JSON;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
+import com.sk.weichat.bean.Friend;
+import com.sk.weichat.db.dao.FriendDao;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.erp.model.NoticeEntity;
 import com.sk.weichat.ui.erp.net.ViewUtil;
@@ -85,9 +88,15 @@ public class NoticesActivity extends BaseActivity{
         if (getIntent().getIntExtra("type", 0)==1) {
         	 param.put("condition", "NO_INFOTYPE='TZ'");
 			getSupportActionBar().setTitle("通知");
+			String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+			// 表示已读
+			FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_NOTICE);
 		}else{
 			 param.put("condition", "NO_INFOTYPE='GG'");
 			getSupportActionBar().setTitle("公告");
+			String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+			// 表示已读
+			FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_GONGGAO);
 		}
         LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID="+CommonUtil.getSharedPreferences(ct, "sessionId"));

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/ScheduleActivity.java

@@ -10,7 +10,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.lidroid.xutils.ViewUtils;
+import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
+import com.sk.weichat.bean.Friend;
+import com.sk.weichat.db.dao.FriendDao;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.erp.adapter.SchedultAdapter;
 import com.sk.weichat.ui.erp.entity.AllProcess;
@@ -74,6 +77,9 @@ public class ScheduleActivity extends BaseActivity{
     	ViewUtils.inject(this);
     	listview_main=(PullToRefreshListView)findViewById(R.id.listview_schedult);
 		getSupportActionBar().setTitle("待审批的流程");
+		String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+		  // 表示已读
+		FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_PROCESS);
 
     	mEmptyLayout = new EmptyLayout(this, listview_main.getRefreshableView());
     	mEmptyLayout.setShowEmptyButton(false);
@@ -97,17 +103,17 @@ public class ScheduleActivity extends BaseActivity{
 							Blowfish blowfish = new Blowfish("00" + d);
 							t = blowfish.encryptString(password);
 						}
-//						Intent intent = new Intent(ScheduleActivity.this, WebViewLoadActivity.class);
-//						if (allList != null || !allList.isEmpty()) {
-//							String url = allList.get(position - 1).getLink();
-//							String master = allList.get(position - 1).getMaster();
-//							intent.putExtra("url", url);
-//							intent.putExtra("t", t);
-//							intent.putExtra("d", d);
-//							intent.putExtra("master", master);
-//							startActivity(intent);
+						Intent intent = new Intent(ScheduleActivity.this, WebViewLoadActivity.class);
+						if (allList != null || !allList.isEmpty()) {
+							String url = allList.get(position - 1).getLink();
+							String master = allList.get(position - 1).getMaster();
+							intent.putExtra("url", url);
+							intent.putExtra("t", t);
+							intent.putExtra("d", d);
+							intent.putExtra("master", master);
+							startActivity(intent);
 //
-//						}
+						}
 					}
 				}, 0);
 			}

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/TaskActivity.java

@@ -15,7 +15,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.lidroid.xutils.ViewUtils;
+import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
+import com.sk.weichat.bean.Friend;
+import com.sk.weichat.db.dao.FriendDao;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.erp.adapter.SchedultAdapter;
 import com.sk.weichat.ui.erp.entity.AllProcess;
@@ -155,6 +158,10 @@ public class TaskActivity extends BaseActivity {
         context = TaskActivity.this;
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("我的任务");
+
+        String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        // 表示已读
+        FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_TASK);
         listview_main = (PullToRefreshListView) findViewById(R.id.listview_schedult);   /**注释：initview */
         /**注释：自定义view */
         mEmptyLayout = new EmptyLayout(this, listview_main.getRefreshableView());

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/util/ViewUtil.java

@@ -8,9 +8,16 @@ import android.util.Log;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
+import com.sk.weichat.MyApplication;
+import com.sk.weichat.bean.Friend;
+import com.sk.weichat.db.dao.FriendDao;
+import com.sk.weichat.ui.erp.model.AllProcess;
 import com.sk.weichat.ui.erp.net.HttpUtil;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -144,4 +151,6 @@ public class ViewUtil {
         }, time);
     }
 
+
+
 }

skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MessageFragment.java

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Message;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -48,7 +49,10 @@ import com.sk.weichat.ui.erp.activity.NewsTwoActivity;
 import com.sk.weichat.ui.erp.activity.NoticesActivity;
 import com.sk.weichat.ui.erp.activity.ScheduleActivity;
 import com.sk.weichat.ui.erp.activity.TaskActivity;
+import com.sk.weichat.ui.erp.model.AllProcess;
 import com.sk.weichat.ui.erp.util.CommonUtil;
+import com.sk.weichat.ui.erp.util.Constants;
+import com.sk.weichat.ui.erp.util.FlexJsonUtil;
 import com.sk.weichat.ui.erp.util.ViewUtil;
 import com.sk.weichat.util.HtmlUtils;
 import com.sk.weichat.util.ProgressDialogUtil;
@@ -66,7 +70,9 @@ import com.sk.weichat.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @desc:消息列表
@@ -84,6 +90,7 @@ public class MessageFragment extends EasyFragment {
 	private NearlyMessageAdapter mAdapter;
 	private Handler mHandler = new Handler();
 	private boolean isRefeshed;
+	//界面更新广播
 	private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
 		@Override
 		public void onReceive(Context context, Intent intent) {
@@ -177,7 +184,7 @@ public class MessageFragment extends EasyFragment {
 		mPullToRefreshListView.setOnRefreshListener(new OnRefreshListener<SlideListView>() {
 			@Override
 			public void onRefresh(PullToRefreshBase<SlideListView> refreshView) {
-				upDataFriend();
+				//upDataFriend();
 				loadData();
 			}
 		});
@@ -189,27 +196,20 @@ public class MessageFragment extends EasyFragment {
 				if (friend.getRoomFlag() == 0) {
 					if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {// 新朋友消息
 						startActivity(new Intent(getActivity(), NewFriendActivity.class));
-					}
-					else if (friend.getUserId().equals(Friend.ID_ERP_PROCESS)){//待办事宜
+					} else if (friend.getUserId().equals(Friend.ID_ERP_PROCESS)) {//待办事宜
 						//ViewUtil.ShowMessageFDialogAutoDismiss(getActivity(),"待审批流程",2000);
 						startActivity(new Intent(getActivity(), ScheduleActivity.class));
-					}
-					else if(friend.getUserId().equals(Friend.ID_ERP_TASK)){//我的任务
+					} else if (friend.getUserId().equals(Friend.ID_ERP_TASK)) {//我的任务
 						startActivity(new Intent(getActivity(), TaskActivity.class));
-					}
-					else if(friend.getUserId().equals(Friend.ID_ERP_ZHIHUI)){//我的知会
+					} else if (friend.getUserId().equals(Friend.ID_ERP_ZHIHUI)) {//我的知会
 						startActivity(new Intent(getActivity(), InformActivity.class));
-					}
-					else if(friend.getUserId().equals(Friend.ID_ERP_NEWS)){//新闻
-						startActivity(new Intent(getActivity(),NewsTwoActivity.class));
-					}
-					else if(friend.getUserId().equals(Friend.ID_ERP_NOTICE)){//通知
-						startActivity(new Intent(getActivity(), NoticesActivity.class).putExtra("type",1));
-					}
-					else if(friend.getUserId().equals(Friend.ID_ERP_GONGGAO)){//公告
-						startActivity(new Intent(getActivity(), NoticesActivity.class).putExtra("type",0));
-					}
-					else {
+					} else if (friend.getUserId().equals(Friend.ID_ERP_NEWS)) {//新闻
+						startActivity(new Intent(getActivity(), NewsTwoActivity.class));
+					} else if (friend.getUserId().equals(Friend.ID_ERP_NOTICE)) {//通知
+						startActivity(new Intent(getActivity(), NoticesActivity.class).putExtra("type", 1));
+					} else if (friend.getUserId().equals(Friend.ID_ERP_GONGGAO)) {//公告
+						startActivity(new Intent(getActivity(), NoticesActivity.class).putExtra("type", 0));
+					} else {
 						Intent intent = new Intent(getActivity(), ChatActivity.class);
 						intent.putExtra(ChatActivity.FRIEND, friend);
 						startActivity(intent);
@@ -315,6 +315,7 @@ public class MessageFragment extends EasyFragment {
 			}
 		}).start();
 
+		//loadERPMsgNum(getActivity());//另外的线程网络请求
 	}
 
 	private final void setSortCondition(BaseSortModel<Friend> mode) {
@@ -406,6 +407,10 @@ public class MessageFragment extends EasyFragment {
 		getActivity().sendBroadcast(mIntent);
 	}
 
+
+
+
+
 	public class NearlyMessageAdapter extends SlideBaseAdapter {
 
 		public NearlyMessageAdapter(Context context) {
@@ -553,4 +558,81 @@ public class MessageFragment extends EasyFragment {
 		}
 	}
 
+
+
+
+	public Map<String,Object> getErpMsgNums(Message msg){
+		Map<String,Object> numMap=new HashMap<String,Object>();
+		String reString=msg.getData().getString("result");
+		if (reString != null && !reString.equals("500")) {
+			Map<String, Object> results = FlexJsonUtil.fromJson(reString);
+			if (results.get("allProcess") != null) {
+				List<AllProcess> allProcesses = new ArrayList<AllProcess>();
+				try {
+					allProcesses = FlexJsonUtil.fromJsonArray(
+							FlexJsonUtil.toJson(results.get("allProcess")),
+							AllProcess.class);
+				} catch (Exception e) {}
+				int task_num = 0, pagin_num = 0, daiban_num = 0;
+				for (int i = 0; i < allProcesses.size(); i++) {
+					if (allProcesses.get(i).getTypecode().contains("task")) {
+						task_num++;
+					} else if (allProcesses.get(i).getTypecode()
+							.contains("pagingrelease")) {
+						pagin_num++;
+					} else {
+						daiban_num++;
+					}
+				}
+				String owerId= MyApplication.getInstance().mLoginUser.getUserId();
+				//clear
+				FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_PROCESS);
+				FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_TASK);
+				FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_ZHIHUI);
+				//update
+				FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_PROCESS, daiban_num);
+				FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_TASK, task_num);
+				FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, pagin_num);
+				//MsgBroadcast.broadcastMsgNumUpdate(MyApplication.getInstance(), true, 1);
+				return numMap;
+			} else {
+				String owerId= MyApplication.getInstance().mLoginUser.getUserId();
+				FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_PROCESS);
+				FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_TASK);
+				FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_ZHIHUI);
+				return numMap;
+			}
+		} else {
+			String owerId= MyApplication.getInstance().mLoginUser.getUserId();
+			FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_PROCESS);
+			FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_TASK);
+			FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_ZHIHUI);
+			return numMap;
+		}
+	}
+
+
+	public  void loadERPMsgNum(Context ct){
+		String url= Constants.getAppBaseUrl(ct)+"mobile/getallprocess.action";
+		Map<String, Object> param=new HashMap<String, Object>();
+		param.put("employeeCode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+		param.put("currentMaster", CommonUtil.getSharedPreferences(ct, "erp_master"));
+		param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+		LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+		headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+		com.sk.weichat.ui.erp.net.ViewUtil.httpSendRequest(ct, url, param, handler, headers, load_success_erpMsgNum, null, null, "get");
+	}
+
+
+	private  final int load_success_erpMsgNum=5;
+	private  Handler handler=new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			switch (msg.what){
+				case load_success_erpMsgNum:
+					getErpMsgNums(msg);
+					break;
+			}
+		}
+	};
 }

skWeiChatBaidu/src/main/java/com/sk/weichat/xmpp/XChatManager.java

@@ -110,9 +110,11 @@ public class XChatManager {
 			mLoginUserId = userId;
 		}
 	}
-/**
- * 消息change的监听
- */
+
+	/**
+	 * 消息change的监听
+	 *
+	 */
 	private MessageListener mMessageListener = new MessageListener() {
 		@Override
 		public void processMessage(Chat arg0, Message message) {