|
|
@@ -211,12 +211,10 @@ public class MessageFragment extends EasyFragment {
|
|
|
mPullToRefreshListView.setOnRefreshListener(new OnRefreshListener<SlideListView>() {
|
|
|
@Override
|
|
|
public void onRefresh(PullToRefreshBase<SlideListView> refreshView) {
|
|
|
- Log.i("gongpengming", "进入刷新页面");
|
|
|
- //TODO 刷新信息
|
|
|
- updateMessageState();
|
|
|
refreshUI();
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
|
|
@Override
|
|
|
public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
|
|
|
@@ -650,8 +648,17 @@ public class MessageFragment extends EasyFragment {
|
|
|
Log.i("MessageFragment", "知会:" + pagin_num);
|
|
|
FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_PROCESS, daiban_num);
|
|
|
FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_TASK, task_num);
|
|
|
+ if (daiban_num>0){
|
|
|
+ updateProcessMsg("您有"+daiban_num+"条新的待审批流程");
|
|
|
+ }else{
|
|
|
+ updateProcessMsg("暂无待审批流程");
|
|
|
+ }
|
|
|
+ if (task_num>0){
|
|
|
+ updateTaskMsg("您有"+task_num+"条新的任务");
|
|
|
+ }else{
|
|
|
+ updateTaskMsg("暂无任务");
|
|
|
+ }
|
|
|
//FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, pagin_num);
|
|
|
-
|
|
|
//MsgBroadcast.broadcastMsgUiUpdate(MyApplication.getInstance());//刷新界面
|
|
|
//MsgBroadcast.broadcastMsgNumUpdate(MyApplication.getInstance(), true, 1);
|
|
|
return numMap;
|
|
|
@@ -764,7 +771,11 @@ public class MessageFragment extends EasyFragment {
|
|
|
|
|
|
FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, count);
|
|
|
FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_GONGGAO, count);
|
|
|
+ updateZhihuMsg("您有新的消息");
|
|
|
+ updateGonggaoMsg("收到"+count+"条公告");
|
|
|
} else {
|
|
|
+ updateZhihuMsg("暂无消息");
|
|
|
+ updateGonggaoMsg("暂无未读公告");
|
|
|
String owerId = MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_GONGGAO);
|
|
|
}
|
|
|
@@ -805,7 +816,11 @@ public class MessageFragment extends EasyFragment {
|
|
|
|
|
|
FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, count);
|
|
|
FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_NOTICE, count);
|
|
|
+ updateZhihuMsg("您有新的消息");
|
|
|
+ updateNoticeMsg("收到"+count+"条通知");
|
|
|
} else {
|
|
|
+ updateZhihuMsg("暂无消息");
|
|
|
+ updateNoticeMsg("暂无未读通知");
|
|
|
String owerId = MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_NOTICE);
|
|
|
}
|
|
|
@@ -833,7 +848,11 @@ public class MessageFragment extends EasyFragment {
|
|
|
|
|
|
FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_ZHIHUI, count);
|
|
|
FriendDao.getInstance().markUserMessageUnRead(owerId, Friend.ID_ERP_NEWS, count);
|
|
|
+ updateZhihuMsg("您有新的消息");
|
|
|
+ updateNewsMsg("收到"+count+"条新闻");
|
|
|
} else {
|
|
|
+ updateZhihuMsg("暂无消息");
|
|
|
+ updateNewsMsg("暂无未读新闻");
|
|
|
String owerId = MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_NEWS);
|
|
|
}
|
|
|
@@ -847,11 +866,9 @@ public class MessageFragment extends EasyFragment {
|
|
|
|
|
|
|
|
|
|
|
|
- /**
|
|
|
- * @desc:刷新更新待审批流程,我的任务,通知和公告的信息列表状态
|
|
|
- * @author:Administrator on 2016/4/21 14:03
|
|
|
- */
|
|
|
- public void updateMessageState(){
|
|
|
+
|
|
|
+
|
|
|
+ public void updateProcessMsg(String msg) {
|
|
|
String ownerId=MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
ChatMessage chatMessage = new ChatMessage();
|
|
|
chatMessage.setType(XmppMessage.TYPE_TIP);
|
|
|
@@ -860,31 +877,84 @@ public class MessageFragment extends EasyFragment {
|
|
|
chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
|
|
|
// 为了使得初始生成的系统消息排在新朋友前面,所以在时间节点上延迟一点 1s
|
|
|
chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
|
|
|
- chatMessage.setContent("您有一条新的待处理流程...");
|
|
|
+ chatMessage.setContent(msg);
|
|
|
chatMessage.setMySend(false);// 表示不是自己发的
|
|
|
// 往消息表里插入一条记录
|
|
|
ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_PROCESS, chatMessage);
|
|
|
+ }
|
|
|
|
|
|
+ public void updateTaskMsg(String msg) {
|
|
|
+ String ownerId=MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
+ ChatMessage chatMessage = new ChatMessage();
|
|
|
+ chatMessage.setType(XmppMessage.TYPE_TIP);
|
|
|
+ chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
|
|
|
+ chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
|
|
|
+ // 为了使得初始生成的系统消息排在新朋友前面,所以在时间节点上延迟一点 1s
|
|
|
+ chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
|
|
|
+ chatMessage.setContent(msg);
|
|
|
+ chatMessage.setMySend(false);// 表示不是自己发的
|
|
|
chatMessage.setFromUserId(Friend.ID_ERP_TASK);
|
|
|
- chatMessage.setContent("您有一条新的任务...");
|
|
|
ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_TASK, chatMessage);
|
|
|
+ }
|
|
|
|
|
|
+ public void updateZhihuMsg(String msg) {
|
|
|
+ String ownerId=MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
+ ChatMessage chatMessage = new ChatMessage();
|
|
|
+ chatMessage.setType(XmppMessage.TYPE_TIP);
|
|
|
+ chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
|
|
|
+ chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
|
|
|
+ // 为了使得初始生成的系统消息排在新朋友前面,所以在时间节点上延迟一点 1s
|
|
|
+ chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
|
|
|
+ chatMessage.setContent(msg);
|
|
|
+ chatMessage.setMySend(false);// 表示不是自己发的
|
|
|
chatMessage.setFromUserId(Friend.ID_ERP_ZHIHUI);
|
|
|
- chatMessage.setContent("");
|
|
|
ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_ZHIHUI, chatMessage);
|
|
|
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ public void updateNewsMsg(String msg) {
|
|
|
+ String ownerId=MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
+ ChatMessage chatMessage = new ChatMessage();
|
|
|
+ chatMessage.setType(XmppMessage.TYPE_TIP);
|
|
|
+ chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
|
|
|
+ chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
|
|
|
+ // 为了使得初始生成的系统消息排在新朋友前面,所以在时间节点上延迟一点 1s
|
|
|
+ chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
|
|
|
+ chatMessage.setMySend(false);// 表示不是自己发的
|
|
|
chatMessage.setFromUserId(Friend.ID_ERP_NEWS);
|
|
|
- chatMessage.setContent("");
|
|
|
- ChatMessageDao.getInstance().saveNewSingleChatMessage(Friend.ID_ERP_ZHIHUI, Friend.ID_ERP_NEWS, chatMessage);
|
|
|
+ chatMessage.setContent(msg);
|
|
|
+ ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_NEWS, chatMessage);
|
|
|
+ }
|
|
|
|
|
|
- chatMessage.setFromUserId(Friend.ID_ERP_GONGGAO);
|
|
|
- chatMessage.setContent("");
|
|
|
- ChatMessageDao.getInstance().saveNewSingleChatMessage(Friend.ID_ERP_ZHIHUI, Friend.ID_ERP_GONGGAO, chatMessage);
|
|
|
|
|
|
+ public void updateNoticeMsg(String msg) {
|
|
|
+ String ownerId=MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
+ ChatMessage chatMessage = new ChatMessage();
|
|
|
+ chatMessage.setType(XmppMessage.TYPE_TIP);
|
|
|
+ chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
|
|
|
+ chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
|
|
|
+ // 为了使得初始生成的系统消息排在新朋友前面,所以在时间节点上延迟一点 1s
|
|
|
+ chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
|
|
|
+ chatMessage.setMySend(false);// 表示不是自己发的
|
|
|
chatMessage.setFromUserId(Friend.ID_ERP_NOTICE);
|
|
|
- chatMessage.setContent("");
|
|
|
- ChatMessageDao.getInstance().saveNewSingleChatMessage(Friend.ID_ERP_ZHIHUI, Friend.ID_ERP_NOTICE, chatMessage);
|
|
|
+ chatMessage.setContent(msg);
|
|
|
+ ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_NOTICE, chatMessage);
|
|
|
+ }
|
|
|
|
|
|
+ public void updateGonggaoMsg(String msg) {
|
|
|
+ String ownerId=MyApplication.getInstance().mLoginUser.getUserId();
|
|
|
+ ChatMessage chatMessage = new ChatMessage();
|
|
|
+ chatMessage.setType(XmppMessage.TYPE_TIP);
|
|
|
+ chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
|
|
|
+ chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
|
|
|
+ // 为了使得初始生成的系统消息排在新朋友前面,所以在时间节点上延迟一点 1s
|
|
|
+ chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
|
|
|
+ chatMessage.setMySend(false);// 表示不是自己发的
|
|
|
+ chatMessage.setFromUserId(Friend.ID_ERP_GONGGAO);
|
|
|
+ chatMessage.setContent(msg);
|
|
|
+ ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_GONGGAO, chatMessage);
|
|
|
}
|
|
|
|
|
|
}
|