Browse Source

推送语句指定点击动作

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@380 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 years ago
parent
commit
719212c95a

+ 3 - 2
src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -59,7 +59,8 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 				if (order.getVendUserUU() != null) {
 				if (order.getVendUserUU() != null) {
 					// Android
 					// Android
 					XingePusher.pushSingleAccountAndroid(order.getVendUserUU().toString(), "新增一条客户采购变更单-", "单号:"
 					XingePusher.pushSingleAccountAndroid(order.getVendUserUU().toString(), "新增一条客户采购变更单-", "单号:"
-							+ orderItem.getOrderChange().getCode() + ",客户:" + order.getEnterprise().getEnName());
+							+ orderItem.getOrderChange().getCode() + ",客户:" + order.getEnterprise().getEnName(),
+							"com.sas.mobile.activity.PurchaseChangeActivity");
 					// IOS
 					// IOS
 					XingePusher.pushSingleAccountIOS(order.getVendUserUU().toString(), "新增一条客户采购变更单-" + "单号:"
 					XingePusher.pushSingleAccountIOS(order.getVendUserUU().toString(), "新增一条客户采购变更单-" + "单号:"
 							+ orderItem.getOrderChange().getCode() + ",客户:" + order.getEnterprise().getEnName());
 							+ orderItem.getOrderChange().getCode() + ",客户:" + order.getEnterprise().getEnName());
@@ -197,7 +198,7 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 		if (order.getUserUU() != null) {
 		if (order.getUserUU() != null) {
 			// Android
 			// Android
 			XingePusher.pushSingleAccountAndroid(order.getUserUU().toString(), "新增采购变更单回复", "单号:" + order.getCode() + ",供应商:"
 			XingePusher.pushSingleAccountAndroid(order.getUserUU().toString(), "新增采购变更单回复", "单号:" + order.getCode() + ",供应商:"
-					+ enterpriseDao.findOne(order.getVendUU()).getEnName());
+					+ enterpriseDao.findOne(order.getVendUU()).getEnName(), "com.sas.mobile.activity.PurchaseChangeActivity");
 			// IOS
 			// IOS
 			XingePusher.pushSingleAccountIOS(order.getUserUU().toString(), "新增采购变更单回复" + "单号:" + order.getCode() + ",供应商:"
 			XingePusher.pushSingleAccountIOS(order.getUserUU().toString(), "新增采购变更单回复" + "单号:" + order.getCode() + ",供应商:"
 					+ enterpriseDao.findOne(order.getVendUU()).getEnName());
 					+ enterpriseDao.findOne(order.getVendUU()).getEnName());

+ 3 - 2
src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -65,7 +65,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 				if (orderItem.getOrder().getVendUserUU() != null) {
 				if (orderItem.getOrder().getVendUserUU() != null) {
 					// Android
 					// Android
 					XingePusher.pushSingleAccountAndroid(orderItem.getOrder().getVendUserUU().toString(), "新增一条客户采购单", "单号:"
 					XingePusher.pushSingleAccountAndroid(orderItem.getOrder().getVendUserUU().toString(), "新增一条客户采购单", "单号:"
-							+ orderItem.getOrder().getCode() + ",客户:" + orderItem.getOrder().getEnterprise().getEnName());
+							+ orderItem.getOrder().getCode() + ",客户:" + orderItem.getOrder().getEnterprise().getEnName(),
+							"com.sas.mobile.activity.PurchaseActivity");
 					// IOS
 					// IOS
 					XingePusher.pushSingleAccountIOS(orderItem.getOrder().getVendUserUU().toString(), "新增一条客户采购单-" + "单号:"
 					XingePusher.pushSingleAccountIOS(orderItem.getOrder().getVendUserUU().toString(), "新增一条客户采购单-" + "单号:"
 							+ orderItem.getOrder().getCode() + ",客户:" + orderItem.getOrder().getEnterprise().getEnName());
 							+ orderItem.getOrder().getCode() + ",客户:" + orderItem.getOrder().getEnterprise().getEnName());
@@ -139,7 +140,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		if (order.getUserUU() != null) {
 		if (order.getUserUU() != null) {
 			// Android
 			// Android
 			XingePusher.pushSingleAccountAndroid(order.getUserUU().toString(), "新增采购单回复", "单号:" + order.getCode() + ",供应商:"
 			XingePusher.pushSingleAccountAndroid(order.getUserUU().toString(), "新增采购单回复", "单号:" + order.getCode() + ",供应商:"
-					+ enterpriseDao.findOne(order.getVendUU()).getEnName());
+					+ enterpriseDao.findOne(order.getVendUU()).getEnName(), "com.sas.mobile.activity.PurchaseActivity");
 			// IOS
 			// IOS
 			XingePusher.pushSingleAccountIOS(order.getUserUU().toString(), "新增采购单回复" + "单号:" + order.getCode() + ",供应商:"
 			XingePusher.pushSingleAccountIOS(order.getUserUU().toString(), "新增采购单回复" + "单号:" + order.getCode() + ",供应商:"
 					+ enterpriseDao.findOne(order.getVendUU()).getEnName());
 					+ enterpriseDao.findOne(order.getVendUU()).getEnName());

+ 14 - 16
src/main/java/com/uas/platform/b2b/support/XingePusher.java

@@ -1,10 +1,8 @@
 package com.uas.platform.b2b.support;
 package com.uas.platform.b2b.support;
 
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.json.JSONObject;
 import org.json.JSONObject;
 
 
+import com.tencent.xinge.ClickAction;
 import com.tencent.xinge.Message;
 import com.tencent.xinge.Message;
 import com.tencent.xinge.MessageIOS;
 import com.tencent.xinge.MessageIOS;
 import com.tencent.xinge.TimeInterval;
 import com.tencent.xinge.TimeInterval;
@@ -23,18 +21,23 @@ public class XingePusher {
 	 * @param account 接受者账号(UU号)
 	 * @param account 接受者账号(UU号)
 	 * @param tittle 推送消息的标题
 	 * @param tittle 推送消息的标题
 	 * @param content 推送消息的内容
 	 * @param content 推送消息的内容
+	 * @param activity 消息点击之后跳转的页面,null或""为默认跳转至主页
 	 * @return
 	 * @return
 	 */
 	 */
-	public static JSONObject pushSingleAccountAndroid(String account, String tittle, String content) {
-		XingeApp xinge = new XingeApp(2100046094, "5805cd8bf93ea5405c98b3a6e81e29b3");
+	public static JSONObject pushSingleAccountAndroid(String account, String tittle, String content, String activity) {
+		XingeApp xinge = new XingeApp(2100092639, "8dac43ec796c73748fe464ce8d65351e");
 		Message message = new Message();
 		Message message = new Message();
 		message.setExpireTime(86400);
 		message.setExpireTime(86400);
 		message.setTitle(tittle);//推送信息标题
 		message.setTitle(tittle);//推送信息标题
 		message.setContent(content);//推送信息内容(第二行)
 		message.setContent(content);//推送信息内容(第二行)
 		message.setType(Message.TYPE_MESSAGE);
 		message.setType(Message.TYPE_MESSAGE);
-		JSONObject ret;
-		ret = xinge.pushSingleAccount(0, account, message);//发送给当前的帐套
-		return (ret);
+		if(activity != null && !activity.equals("")){
+			ClickAction clickAction = new ClickAction();
+			clickAction.setActivity(activity);
+			message.setAction(clickAction);
+		}
+		JSONObject obj = xinge.pushSingleAccount(0, account, message);//发送给当前的帐套
+		return obj;
 	};
 	};
 	
 	
 	/**
 	/**
@@ -44,6 +47,7 @@ public class XingePusher {
 	 * @return
 	 * @return
 	 */
 	 */
 	public static JSONObject pushSingleAccountIOS(String account, String alert) {
 	public static JSONObject pushSingleAccountIOS(String account, String alert) {
+		XingeApp xinge = new XingeApp(2200088576L, "cdd9696ae38aaeaf766f3c457440d970");
 		MessageIOS message = new MessageIOS();
 		MessageIOS message = new MessageIOS();
 		message.setExpireTime(86400);
 		message.setExpireTime(86400);
 		message.setAlert(alert);
 		message.setAlert(alert);
@@ -51,14 +55,8 @@ public class XingePusher {
 		message.setSound("beep.wav");
 		message.setSound("beep.wav");
 		TimeInterval acceptTime1 = new TimeInterval(0,0,23,59);
 		TimeInterval acceptTime1 = new TimeInterval(0,0,23,59);
 		message.addAcceptTime(acceptTime1);
 		message.addAcceptTime(acceptTime1);
-		Map<String, Object> custom = new HashMap<String, Object>();
-		custom.put("key1", "value1");
-		custom.put("key2", 2);
-		message.setCustom(custom);
-		XingeApp xinge = new XingeApp(2200088576L, "cdd9696ae38aaeaf766f3c457440d970");
-		JSONObject ret;
-		ret = xinge.pushSingleAccount(0, account, message, XingeApp.IOSENV_DEV);
-		return ret;
+		JSONObject obj = xinge.pushSingleAccount(0, account, message, XingeApp.IOSENV_DEV);
+		return obj;
 	};
 	};
 
 
 }
 }