From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/util/factory/IOSPushFactory.java | 145 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 129 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/IOSPushFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/IOSPushFactory.java
index 6697e10..fa7b643 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/IOSPushFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/IOSPushFactory.java
@@ -1,6 +1,8 @@
package com.yeshi.fanli.util.factory;
-import com.yeshi.fanli.controller.admin.PushController;
+import java.io.UnsupportedEncodingException;
+
+import com.yeshi.fanli.dto.push.PushTypeEnum;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -9,21 +11,34 @@
private static JSONObject filterPushContent(JSONObject json) {
if (json != null)
- while (json.toString().getBytes().length > 256) {
- // 棣栧厛鍓婂噺鍐呭锛岀劧鍚庡墛鍑忔爣棰�
- String title = json.optJSONObject("aps").optJSONObject("alert").optString("title");
- String body = json.optJSONObject("aps").optJSONObject("alert").optString("body");
- if (StringUtil.isNullOrEmpty(body) || body.length() < 4) {
- // 鍓婂噺鏍囬
- if (!StringUtil.isNullOrEmpty(title) && title.length() > 6) {
- json.optJSONObject("aps").optJSONObject("alert").put("title",
- title.substring(0, title.length() - 1));
+ try {
+ boolean ischange = false;
+ while (json.toString().getBytes("UTF-8").length > 253) {
+ // 棣栧厛鍓婂噺鍐呭锛岀劧鍚庡墛鍑忔爣棰�
+ String title = json.optJSONObject("aps").optJSONObject("alert").optString("title");
+ String body = json.optJSONObject("aps").optJSONObject("alert").optString("body");
+ if (StringUtil.isNullOrEmpty(body) || body.length() < 4) {
+ // 鍓婂噺鏍囬
+ if (!StringUtil.isNullOrEmpty(title) && title.length() > 6) {
+ json.optJSONObject("aps").optJSONObject("alert").put("title",
+ title.substring(0, title.length() - 1));
+ continue;
+ }
+ } else {
+ ischange = true;
+ json.optJSONObject("aps").optJSONObject("alert").put("body",
+ body.substring(0, body.length() - 1));
continue;
}
- } else {
- json.optJSONObject("aps").optJSONObject("alert").put("body", body.substring(0, body.length() - 1));
- continue;
}
+
+ if (ischange) {
+ String body = json.optJSONObject("aps").optJSONObject("alert").optString("body");
+ json.optJSONObject("aps").optJSONObject("alert").put("body", body + "...");
+ }
+
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
}
return json;
}
@@ -44,10 +59,11 @@
alert.put("badge", "1");
alert.put("sound", "default");
alert.put("url", "http://id=" + auctionId);
- alert.put("type", PushController.GOODS);
+ alert.put("type",PushTypeEnum.goodsdetail.getCode());
JSONObject aps = new JSONObject();
aps.put("alert", alert);
+ //aps.put("badge", 1);
JSONObject json = new JSONObject();
json.put("aps", aps);
return filterPushContent(json);
@@ -66,9 +82,10 @@
alert.put("body", body);
alert.put("badge", "1");
alert.put("sound", "default");
- alert.put("type", PushController.ZNX);
+ alert.put("type", PushTypeEnum.ZNX.getCode());
JSONObject aps = new JSONObject();
aps.put("alert", alert);
+ //aps.put("badge", 1);
JSONObject json = new JSONObject();
json.put("aps", aps);
return filterPushContent(json);
@@ -89,14 +106,110 @@
alert.put("body", body);
alert.put("badge", "1");
alert.put("sound", "default");
- alert.put("type", PushController.URL);
+ alert.put("type",PushTypeEnum.url.getCode());
alert.put("url", shortUrl);
JSONObject aps = new JSONObject();
aps.put("alert", alert);
+ //aps.put("badge", 1);
JSONObject json = new JSONObject();
json.put("aps", aps);
return filterPushContent(json);
}
+ /**
+ * WEEX椤甸潰鎺ㄩ��
+ *
+ * @param shortUrl
+ * @param title
+ * @param body
+ * @return
+ */
+ public static JSONObject createWEEXPush(String shortUrl, String title, String body) {
+ JSONObject alert = new JSONObject();
+ alert.put("title", title);
+ alert.put("body", body);
+ alert.put("badge", "1");
+ alert.put("sound", "default");
+ alert.put("type", PushTypeEnum.weex.getCode());
+ alert.put("url", shortUrl);
+
+ JSONObject aps = new JSONObject();
+ aps.put("alert", alert);
+ //aps.put("badge", 1);
+ JSONObject json = new JSONObject();
+ json.put("aps", aps);
+ return filterPushContent(json);
+ }
+
+ /**
+ * 鐧惧窛缃戦〉鎺ㄩ��
+ *
+ * @param shortUrl
+ * @param title
+ * @param body
+ * @return
+ */
+ public static JSONObject createBaiChuanPush(String shortUrl, String title, String body) {
+ JSONObject alert = new JSONObject();
+ alert.put("title", title);
+ alert.put("body", body);
+ alert.put("badge", "1");
+ alert.put("sound", "default");
+ alert.put("type", PushTypeEnum.baichuan.getCode());
+ alert.put("url", shortUrl);
+
+ JSONObject aps = new JSONObject();
+ aps.put("alert", alert);
+ //aps.put("badge", 1);
+ JSONObject json = new JSONObject();
+ json.put("aps", aps);
+ return filterPushContent(json);
+ }
+
+ /**
+ * 绂忓埄涓績鎺ㄩ��
+ * @param title
+ * @param body
+ * @return
+ */
+ public static JSONObject createWelfarePush( String title, String body) {
+ JSONObject alert = new JSONObject();
+ alert.put("title", title);
+ alert.put("body", body);
+ alert.put("badge", "1");
+ alert.put("sound", "default");
+ alert.put("type", PushTypeEnum.welfare.getCode());
+
+ JSONObject aps = new JSONObject();
+ aps.put("alert", alert);
+ //aps.put("badge", 1);
+ JSONObject json = new JSONObject();
+ json.put("aps", aps);
+ return filterPushContent(json);
+ }
+
+
+ /**
+ * 鐢ㄦ埛绛惧埌
+ * @param title
+ * @param body
+ * @return
+ */
+ public static JSONObject createUserSignInPush( String title, String body) {
+ JSONObject alert = new JSONObject();
+ alert.put("title", title);
+ alert.put("body", body);
+ alert.put("badge", "1");
+ alert.put("sound", "default");
+ alert.put("type", PushTypeEnum.signin.getCode());
+
+ JSONObject aps = new JSONObject();
+ aps.put("alert", alert);
+ //aps.put("badge", 1);
+ JSONObject json = new JSONObject();
+ json.put("aps", aps);
+ return filterPushContent(json);
+ }
+
}
--
Gitblit v1.8.0