From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/push/HWPushUtil.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/push/HWPushUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/push/HWPushUtil.java
index 875412b..a0d5e96 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/push/HWPushUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/push/HWPushUtil.java
@@ -21,7 +21,7 @@
import com.alibaba.fastjson.JSONObject;
import com.yeshi.fanli.entity.config.push.HWPushConfig;
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -72,7 +72,7 @@
try {
return String.format(
- "intent://flq/selfbuyandreductionactivity?data=%s#Intent;scheme=banliapp;launchFlags=0x4000000;end",
+ "intent://flq/hmpush?data=%s#Intent;scheme=banliapp;launchFlags=0x4000000;end",
URLDecoder.decode(data.toString(), "UTF-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
@@ -214,6 +214,23 @@
e.printStackTrace();
}
}
+
+
+ public static void pushUserSignInNotification(List<String> deviceTokens, String title, String content) throws PushException {
+ String activity = Constant.systemCommonConfig.getAndroidBaseactivityName() + ".ui.goldtask.GoldTaskActivity";
+ String intent = getIntent("signin", activity, null, null, null);
+ if (intent == null)
+ return;
+
+ try {
+ String result = sendPushHWMessageForIntent(deviceTokens, title, content, intent);
+ net.sf.json.JSONObject data = net.sf.json.JSONObject.fromObject(result);
+ if (!"success".equalsIgnoreCase(data.optString("msg")))
+ throw new PushException(2, result);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
/**
* 鎺ㄩ�佽澶囨秷鎭�
--
Gitblit v1.8.0