From 15f44ee2853775fb0bff4ea0d45243af8eecece0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= <xj753277@126.com>
Date: Wed, 31 Dec 2014 17:22:57 +0800
Subject: [PATCH] no message

---
 .../ichat/api/action/MessageAction.java       | 15 ++++++++--
 .../ichat/common/util/Constants.java          | 25 +---------------
 .../example/ui/SystemMessageActivity.java     | 23 ++++++++++-----
 .../ichat/api/action/MessageAction.java       | 29 ++++++++++++-------
 .../example/ui/SystemMessageActivity.java     | 12 ++++++++
 5 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/cim_for_mina/ichat-server/src/main/java/com/farsunset/ichat/api/action/MessageAction.java b/cim_for_mina/ichat-server/src/main/java/com/farsunset/ichat/api/action/MessageAction.java
index e021f12..f305f97 100644
--- a/cim_for_mina/ichat-server/src/main/java/com/farsunset/ichat/api/action/MessageAction.java
+++ b/cim_for_mina/ichat-server/src/main/java/com/farsunset/ichat/api/action/MessageAction.java
@@ -8,7 +8,9 @@ import org.apache.struts2.ServletActionContext;
 import org.springframework.web.bind.ServletRequestBindingException;
 
 import com.farsunset.cim.nio.mutual.Message;
+import com.farsunset.ichat.cim.push.DefaultMessagePusher;
 import com.farsunset.ichat.cim.push.SystemMessagePusher;
+import com.farsunset.ichat.common.util.Constants;
 import com.farsunset.ichat.common.util.ContextHolder;
 import com.google.gson.Gson;
 import com.opensymphony.xwork2.ActionSupport;
@@ -43,9 +45,16 @@ public class MessageAction  extends  ActionSupport  implements ModelDriven<Messa
 	        
 			checkParams();
 	        
-	        //向客户端 发送消息
-	        ContextHolder.getBean(SystemMessagePusher.class).pushMessageToUser(message);
-	        
+			if(Constants.MessageType.TYPE_2.equals(message.getType()))
+			{
+				  //向客户端 发送消息
+		        ContextHolder.getBean(SystemMessagePusher.class).pushMessageToUser(message);
+			}else
+			{
+				  //向客户端 发送消息
+		        ContextHolder.getBean(DefaultMessagePusher.class).pushMessageToUser(message);
+			}
+	              
 	        data.put("id", message.getMid());
 	        data.put("createTime", String.valueOf(message.getTimestamp()));
 	        datamap.put("data", data);
diff --git a/cim_for_mina/ichat-server/src/main/java/com/farsunset/ichat/common/util/Constants.java b/cim_for_mina/ichat-server/src/main/java/com/farsunset/ichat/common/util/Constants.java
index 9bba21b..300aaf9 100644
--- a/cim_for_mina/ichat-server/src/main/java/com/farsunset/ichat/common/util/Constants.java
+++ b/cim_for_mina/ichat-server/src/main/java/com/farsunset/ichat/common/util/Constants.java
@@ -42,32 +42,9 @@ public interface Constants {
 		//鐢ㄦ埛涔嬮棿鐨勬櫘閫氭秷鎭�
 		public static final String TYPE_0 = "0";
 		
-		public static final String TYPE_1 = "1";
-		
 		//绯荤粺鍚戠敤鎴峰彂閫佺殑鏅�氭秷鎭�
 		public static final String TYPE_2 = "2";
-		
-		//缇ら噷鐢ㄦ埛鍙戦�佺殑  娑堟伅
-		public static final String TYPE_3 = "3";
-		
-		//绯荤粺瀹氬埗娑堟伅---濂藉弸楠岃瘉璇锋眰
-		String TYPE_100 = "100";
-		
-		//绯荤粺瀹氬埗娑堟伅---鍚屾剰濂藉弸璇锋眰
-		String TYPE_101 = "101";
-		
-		//绯荤粺瀹氬埗娑堟伅---杩涚兢璇锋眰
-		String TYPE_102 = "102";
-		
-		//绯荤粺瀹氬埗娑堟伅---鍚屾剰杩涚兢璇锋眰
-		String TYPE_103 = "103";
-		
-	 
-		//绯荤粺瀹氬埗娑堟伅---濂藉弸涓嬬嚎娑堟伅
-		String TYPE_900 = "900";
-		
-		//绯荤粺瀹氬埗娑堟伅---濂藉弸涓婄嚎娑堟伅
-		String TYPE_901 = "901";
+		 
 	}
 	
 }
diff --git a/cim_for_mina/mchat-simple/src/com/farsunset/ichat/example/ui/SystemMessageActivity.java b/cim_for_mina/mchat-simple/src/com/farsunset/ichat/example/ui/SystemMessageActivity.java
index 442c031..554cc34 100644
--- a/cim_for_mina/mchat-simple/src/com/farsunset/ichat/example/ui/SystemMessageActivity.java
+++ b/cim_for_mina/mchat-simple/src/com/farsunset/ichat/example/ui/SystemMessageActivity.java
@@ -13,11 +13,13 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ListView;
 import android.widget.TextView;
+
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.farsunset.cim.client.android.CIMPushManager;
 import com.farsunset.cim.nio.constant.CIMConstant;
 import com.farsunset.cim.nio.mutual.Message;
+import com.farsunset.cim.nio.mutual.SentBody;
 import com.farsunset.ichat.example.R;
 import com.farsunset.ichat.example.adapter.SystemMsgListViewAdapter;
 import com.farsunset.ichat.example.app.CIMMonitorActivity;
@@ -88,6 +90,14 @@ public class SystemMessageActivity extends CIMMonitorActivity implements OnClick
 
 	}
  
+	//鑾峰彇绂荤嚎娑堟伅锛屼唬鐮佺ず渚嬶紝鍓嶆彁鏄湇鍔＄瑕佸疄鐜版鍔熻兘
+	private void getOfflineMessage()
+	{
+		SentBody sent = new SentBody();
+		sent.setKey(CIMConstant.RequestKey.CLIENT_OFFLINE_MESSAGE);
+		sent.put("account", this.getIntent().getStringExtra("account"));
+		CIMPushManager.sendRequest(this, sent);
+	}
  
 	@Override
 	public void onConnectionSucceed() {
@@ -112,14 +122,7 @@ public class SystemMessageActivity extends CIMMonitorActivity implements OnClick
 	private void  sendMessage() throws Exception
 	{
 		
-		
-		apiParams.put("content", "hello world!");
-		apiParams.put("sender", "xiaogou");//鍙戦�佽�呰处鍙�
-		apiParams.put("receiver", "xiaomao");//娑堟伅鎺ユ敹鑰呰处鍙�
-		apiParams.put("type",Constant.MessageType.TYPE_0);
-		
 		requester.execute(new TypeReference<JSONObject>(){}.getType(), null, SEND_MESSAGE_API_URL);
-		
 	}
 
 	@Override
@@ -136,6 +139,12 @@ public class SystemMessageActivity extends CIMMonitorActivity implements OnClick
 	
 	@Override
 	public Map<String, Object> getRequestParams() {
+		
+		apiParams.put("content", "hello world!");
+		apiParams.put("sender", "xiaogou");//鍙戦�佽�呰处鍙�
+		apiParams.put("receiver", "xiaomao");//娑堟伅鎺ユ敹鑰呰处鍙�
+		apiParams.put("type",Constant.MessageType.TYPE_0);
+
 		return apiParams;
 	}
 
diff --git a/cim_for_netty/ichat-server/src/main/java/com/farsunset/ichat/api/action/MessageAction.java b/cim_for_netty/ichat-server/src/main/java/com/farsunset/ichat/api/action/MessageAction.java
index 22b60be..1dcf4d7 100644
--- a/cim_for_netty/ichat-server/src/main/java/com/farsunset/ichat/api/action/MessageAction.java
+++ b/cim_for_netty/ichat-server/src/main/java/com/farsunset/ichat/api/action/MessageAction.java
@@ -8,7 +8,9 @@ import org.apache.struts2.ServletActionContext;
 import org.springframework.web.bind.ServletRequestBindingException;
 
 import com.farsunset.cim.nio.mutual.Message;
+import com.farsunset.ichat.cim.push.DefaultMessagePusher;
 import com.farsunset.ichat.cim.push.SystemMessagePusher;
+import com.farsunset.ichat.common.util.Constants;
 import com.farsunset.ichat.common.util.ContextHolder;
 import com.google.gson.Gson;
 import com.opensymphony.xwork2.ActionSupport;
@@ -27,10 +29,10 @@ public class MessageAction  extends  ActionSupport  implements ModelDriven<Messa
 	Message message = new Message();
  
     /**
-     * 锟斤拷锟斤拷http锟斤拷锟斤拷锟饺★拷锟�  struts2  锟斤拷模锟斤拷锟斤拷  锟斤拷锟斤拷 http 锟斤拷锟斤拷 sender=xiaomao&receiver=xiaogou
-     * struts锟皆讹拷锟结将锟斤拷锟斤拷锟街� 锟斤拷锟斤拷getModel()锟斤拷锟截的讹拷锟斤拷亩锟接︼拷锟斤拷锟斤拷校锟斤拷锟絰iaomao锟斤拷锟斤拷锟絤essage.sender锟斤拷锟斤拷,xiaogou锟斤拷锟斤拷锟絤essage.receiver锟斤拷锟斤拷
-     * 省去锟斤拷request.getParameter("sender")锟斤拷式锟斤拷取锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷getModel()锟斤拷锟截的讹拷锟斤拷锟叫诧拷锟斤拷锟节ｏ拷锟斤拷锟斤拷要锟斤拷request.getParameter()锟斤拷取
-     * 锟斤拷锟斤拷锟斤拷锟�*Action.java锟斤拷 同锟�?锟斤拷锟斤拷锟斤拷统一说锟斤拷!
+     * 鍏充簬http鍙傛暟鑾峰彇锛�  struts2  鐨勬ā鍨嬮┍鍔�  姣斿 http 鍙傛暟 sender=xiaomao&receiver=xiaogou
+     * struts鑷姩浼氬皢鍙傛暟鐨勫�� 瀛樺叆getModel()杩斿洖鐨勫璞＄殑瀵瑰簲灞炴�т腑锛屽嵆xiaomao浼氬瓨鍏essage.sender灞炴��,xiaogou浼氬瓨鍏essage.receiver灞炴��
+     * 鐪佸幓浜唕equest.getParameter("sender")鏂瑰紡鑾峰彇鍙傛暟锛岋紝濡傛灉鍙傛暟鍚嶅湪getModel()杩斿洖鐨勫璞′腑涓嶅瓨鍦紝鍒欓渶瑕佺敤request.getParameter()鑾峰彇
+     * 鍏朵粬鐩稿叧*Action.java涓� 鍚岀悊锛岃繖閲屽仛缁熶竴璇存槑!
      */
     public String send() throws Exception {
         
@@ -43,9 +45,16 @@ public class MessageAction  extends  ActionSupport  implements ModelDriven<Messa
 	        
 			checkParams();
 	        
-	        //锟斤拷突锟斤拷锟� 锟斤拷锟斤拷锟斤拷息
-	        ContextHolder.getBean(SystemMessagePusher.class).pushMessageToUser(message);
-	        
+			if(Constants.MessageType.TYPE_2.equals(message.getType()))
+			{
+				  //鍚戝鎴风 鍙戦�佹秷鎭�
+		        ContextHolder.getBean(SystemMessagePusher.class).pushMessageToUser(message);
+			}else
+			{
+				  //鍚戝鎴风 鍙戦�佹秷鎭�
+		        ContextHolder.getBean(DefaultMessagePusher.class).pushMessageToUser(message);
+			}
+	              
 	        data.put("id", message.getMid());
 	        data.put("createTime", String.valueOf(message.getTimestamp()));
 	        datamap.put("data", data);
@@ -63,7 +72,7 @@ public class MessageAction  extends  ActionSupport  implements ModelDriven<Messa
 
     
     /**
-     * 锟侥硷拷锟缴客伙拷锟剿凤拷锟斤拷锟斤拷锟斤拷 OSS 锟芥储
+     * 鏂囦欢鐢卞鎴风鍙戝線闃块噷浜� OSS 瀛樺偍
      * @param messageServiceImpl
      */
    /* private void fileHandler(Message mo, HttpServletRequest request) throws IOException 
@@ -78,7 +87,7 @@ public class MessageAction  extends  ActionSupport  implements ModelDriven<Messa
 		        String dir = dirMap.get(fileType);
 		        if(StringUtils.isEmpty(dir))
 		        {
-		          	  throw new IllegalArgumentException("fileType:" +fileType+" 未锟斤拷锟斤拷" );
+		          	  throw new IllegalArgumentException("fileType:" +fileType+" 鏈畾涔�" );
 		          	  
 		        }
 		        	String path = request.getSession().getServletContext().getRealPath(dir);
@@ -98,7 +107,7 @@ public class MessageAction  extends  ActionSupport  implements ModelDriven<Messa
     	   
           if(StringUtils.isEmpty(message.getReceiver()))
           {
-        	  throw new IllegalArgumentException("receiver 锟斤拷锟斤拷为锟斤拷!");
+        	  throw new IllegalArgumentException("receiver 涓嶈兘涓虹┖!");
         	  
           }
     }
diff --git a/cim_for_netty/mchat-simple/src/com/farsunset/ichat/example/ui/SystemMessageActivity.java b/cim_for_netty/mchat-simple/src/com/farsunset/ichat/example/ui/SystemMessageActivity.java
index 442c031..f795237 100644
--- a/cim_for_netty/mchat-simple/src/com/farsunset/ichat/example/ui/SystemMessageActivity.java
+++ b/cim_for_netty/mchat-simple/src/com/farsunset/ichat/example/ui/SystemMessageActivity.java
@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.farsunset.cim.client.android.CIMPushManager;
 import com.farsunset.cim.nio.constant.CIMConstant;
+import com.farsunset.cim.nio.mutual.SentBody;
 import com.farsunset.cim.nio.mutual.Message;
 import com.farsunset.ichat.example.R;
 import com.farsunset.ichat.example.adapter.SystemMsgListViewAdapter;
@@ -64,6 +65,17 @@ public class SystemMessageActivity extends CIMMonitorActivity implements OnClick
 		 showToask("鐧诲綍鎴愬姛锛岃閫氳繃鍚庡彴椤甸潰鍙戦�佹秷鎭惂^_^");
 	}
 	
+	
+	//鑾峰彇绂荤嚎娑堟伅锛屼唬鐮佺ず渚嬶紝鍓嶆彁鏄湇鍔＄瑕佸疄鐜版鍔熻兘
+	private void getOfflineMessage()
+	{
+		SentBody sent = new SentBody();
+		sent.setKey(CIMConstant.RequestKey.CLIENT_OFFLINE_MESSAGE);
+		sent.put("account", this.getIntent().getStringExtra("account"));
+		CIMPushManager.sendRequest(this, sent);
+	}
+	
+	
 	//鏀跺埌娑堟伅
 	@Override
 	public void onMessageReceived(com.farsunset.cim.nio.mutual.Message message) {