Merge remote-tracking branch 'origin/developer_master' into developer_master

# Conflicts:
#	WeiChat/src/main/java/com/sk/weichat/ui/cardcast/CardcastActivity.java

WeiChat/src/main/java/com/sk/weichat/ui/cardcast/CardcastActivity.java

@@ -36,6 +36,8 @@ public class CardcastActivity extends BaseActivity {
 
     private boolean mBind;
     private CoreService mXmppService;
+    private RadioButton btnG;
+    private RadioButton btnAG;
     private FriendFragment friendFragment;
     private AttentionFragment attentionFragment;
     private RoomFragment roomFragment;
@@ -64,12 +66,13 @@ public class CardcastActivity extends BaseActivity {
         roomFragment = new RoomFragment();
         friendFragment = new FriendFragment();
         attentionFragment = new AttentionFragment();
-
+        btnG = (RadioButton) findViewById(R.id.btn_guanzu);
+        btnAG = (RadioButton) findViewById(R.id.btn_aguanzu);
         FragmentManager fm = getSupportFragmentManager();
         bt = fm.beginTransaction();
         bt.add(R.id.fl, friendFragment);
         bt.add(R.id.fl, attentionFragment);
-        bt.hide(attentionFragment);
+        bt.hide(roomFragment);
         bt.commit();
         findViewById(R.id.tv_back).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -77,32 +80,32 @@ public class CardcastActivity extends BaseActivity {
                 CardcastActivity.this.finish();
             }
         });
-        findViewById(R.id.btn_guanzu).setOnClickListener(new View.OnClickListener() {
+        btnG.setOnClickListener(new View.OnClickListener() {
             @SuppressLint("NewApi")
             @Override
             public void onClick(View view) {
-//                btnG.setClickable(false);
-//                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu_pass));
-//                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu));
-//                btnAG.setClickable(true);
+                btnG.setClickable(false);
+                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu_pass));
+                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu));
+                btnAG.setClickable(true);
                 bt = getSupportFragmentManager().beginTransaction();
-                bt.show(attentionFragment);
                 bt.hide(friendFragment);
+                bt.show(attentionFragment);
                 bt.commit();
 
             }
         });
-        findViewById(R.id.btn_aguanzu).setOnClickListener(new View.OnClickListener() {
+        btnAG.setOnClickListener(new View.OnClickListener() {
             @SuppressLint("NewApi")
             @Override
             public void onClick(View view) {
-//                btnAG.setClickable(false);
-//                btnG.setClickable(true);
-//                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu));
-//                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu_pass));
+                btnAG.setClickable(false);
+                btnG.setClickable(true);
+                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu));
+                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu_pass));
                 bt = getSupportFragmentManager().beginTransaction();
-                bt.show(friendFragment);
                 bt.hide(attentionFragment);
+                bt.show(friendFragment);
                 bt.commit();
             }
         });

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NoticeMenuActivity.java

@@ -112,10 +112,17 @@ public class NoticeMenuActivity extends BaseActivity {
                 String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
                 long startTime = System.currentTimeMillis();
                 friends.clear();
-                friends.add(FriendDao.getInstance().getFriend(mLoginUserId,Friend.ID_ERP_NEWS));
-                friends.add(FriendDao.getInstance().getFriend(mLoginUserId,Friend.ID_ERP_NOTICE));
-                friends.add(FriendDao.getInstance().getFriend(mLoginUserId, Friend.ID_ERP_GONGGAO));
-
+                //取通知公告的时间，赋值给新闻，通知，公告；一级菜单给二级菜单赋值
+                int sendtime= FriendDao.getInstance().getFriend(mLoginUserId,Friend.ID_ERP_ZHIHUI).getTimeSend();
+                Friend news=  FriendDao.getInstance().getFriend(mLoginUserId, Friend.ID_ERP_NEWS);
+                Friend notic=  FriendDao.getInstance().getFriend(mLoginUserId,Friend.ID_ERP_NOTICE);
+                Friend gonggao = FriendDao.getInstance().getFriend(mLoginUserId, Friend.ID_ERP_GONGGAO);
+                news.setTimeSend(sendtime);
+                notic.setTimeSend(sendtime);
+                gonggao.setTimeSend(sendtime);
+                friends.add(news);
+                friends.add(notic);
+                friends.add(gonggao);
                 Log.i("NoticeMenu","friend.size="+friends.size());
                 long delayTime = 200 - (startTime - System.currentTimeMillis());// 保证至少200ms的刷新过程
                 if (delayTime < 0) {

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

@@ -32,6 +32,7 @@ import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
 import com.sk.weichat.bean.AttentionUser;
 import com.sk.weichat.bean.Friend;
+import com.sk.weichat.bean.message.ChatMessage;
 import com.sk.weichat.bean.message.XmppMessage;
 import com.sk.weichat.broadcast.MsgBroadcast;
 import com.sk.weichat.broadcast.MucgroupUpdateUtil;
@@ -69,12 +70,14 @@ import com.sk.weichat.volley.ObjectResult;
 import com.sk.weichat.volley.Result;
 import com.sk.weichat.volley.StringJsonArrayRequest;
 import com.sk.weichat.volley.StringJsonObjectRequest;
+import com.sk.weichat.xmpp.listener.ChatMessageListener;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * @desc:消息列表
@@ -210,6 +213,7 @@ public class MessageFragment extends EasyFragment {
             public void onRefresh(PullToRefreshBase<SlideListView> refreshView) {
                 Log.i("gongpengming", "进入刷新页面");
                 //TODO 刷新信息
+                updateMessageState();
                 refreshUI();
             }
         });
@@ -841,5 +845,47 @@ public class MessageFragment extends EasyFragment {
             }
         }
     };
+    
+    
+    
+    /**
+     * @desc:刷新更新待审批流程,我的任务,通知和公告的信息列表状态
+     * @author：Administrator on 2016/4/21 14:03
+     */
+    public void updateMessageState(){
+        String ownerId=MyApplication.getInstance().mLoginUser.getUserId();
+        ChatMessage chatMessage = new ChatMessage();
+        chatMessage.setType(XmppMessage.TYPE_TIP);
+        chatMessage.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));// 随机产生一个PacketId
+        chatMessage.setFromUserId(Friend.ID_ERP_PROCESS);
+        chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
+        // 为了使得初始生成的系统消息排在新朋友前面，所以在时间节点上延迟一点 1s
+        chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
+        chatMessage.setContent("您有一条新的待处理流程...");
+        chatMessage.setMySend(false);// 表示不是自己发的
+        // 往消息表里插入一条记录
+        ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_PROCESS, chatMessage);
+
+        chatMessage.setFromUserId(Friend.ID_ERP_TASK);
+        chatMessage.setContent("您有一条新的任务...");
+        ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_TASK, chatMessage);
+
+        chatMessage.setFromUserId(Friend.ID_ERP_ZHIHUI);
+        chatMessage.setContent("");
+        ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, Friend.ID_ERP_ZHIHUI, chatMessage);
+
+        chatMessage.setFromUserId(Friend.ID_ERP_NEWS);
+        chatMessage.setContent("");
+        ChatMessageDao.getInstance().saveNewSingleChatMessage(Friend.ID_ERP_ZHIHUI, 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);
+
+        chatMessage.setFromUserId(Friend.ID_ERP_NOTICE);
+        chatMessage.setContent("");
+        ChatMessageDao.getInstance().saveNewSingleChatMessage(Friend.ID_ERP_ZHIHUI, Friend.ID_ERP_NOTICE, chatMessage);
+
+    }
 
 }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }