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/PushUtils.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java b/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java index 6cae398..5afb74e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java @@ -66,6 +66,9 @@ * Constant.systemCommonConfig.getIosBundleId()); */ + if (Constant.IS_TEST) + return 1; + String IOS = IOSPushUtil.allPushIOS(deviceTokenList, info, url, type); LogHelper.userInfo("IOS鐨勬帹閫佹棩蹇楋細" + IOS); pushRecord.setIosPushId(IOS); @@ -84,13 +87,34 @@ * @param json * @return */ - public static int singlePushXiaoMi(MessageInfo info, JSONObject json, PushRecord pushRecord) { + public static int singlePushXiaoMi(MessageInfo info, JSONObject json,List<String> regIds, PushRecord pushRecord) { +// if (Constant.IS_TEST) +// return 1; + + JSONObject mapXm = JSONObject.fromObject(json); + + String android = XiaoMiPushUtil.singlePushAndroidForXM(info, mapXm,regIds, null); + + LogHelper.userInfo("瀹夊崜鎺ㄩ�佹祴璇曪細" + android); + pushRecord.setAndroidPushId(android); + + if (android != null) { + return 1; + } else { + return 4; + } + } + + public static int singlePushXiaoMiByRegisterId(MessageInfo info, JSONObject json, PushRecord pushRecord, + String regId) { if (Constant.IS_TEST) return 1; JSONObject mapXm = JSONObject.fromObject(json); - String android = XiaoMiPushUtil.singlePushAndroidForXM(info, mapXm, null); + List<String> regIdList = new ArrayList<>(); + regIdList.add(regId); + String android = XiaoMiPushUtil.pushBatchAndroidForXM(info, mapXm, regIdList); LogHelper.userInfo("瀹夊崜鎺ㄩ�佹祴璇曪細" + android); pushRecord.setAndroidPushId(android); @@ -113,6 +137,8 @@ */ public static String singlePushIOS(MessageInfo info, PushRecord pushRecord, String url, int type, List<String> deviceTokenList) { + if (Constant.IS_TEST) + return null; if (deviceTokenList != null && deviceTokenList.size() > 0) { for (String deviceToken : deviceTokenList) { if (!StringUtil.isNullOrEmpty(deviceToken)) { -- Gitblit v1.8.0