From b2e7e9ed88acb0e0ea50571ae028199926b7d262 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 15:34:29 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
index 596840d..3c48baa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
@@ -142,10 +142,16 @@
* @param webUrl
* @param versionCodeList
*/
- private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl, Long goodsId,
- List<Integer> versionCodeList) throws PushException {
+ private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl,
+ Long goodsId, List<Integer> versionCodeList) throws PushException {
int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
List<Integer> newVersionList = getVersionCodeList(versionCodeList);
+ // 1.6.5鍚庡紑濮嬫帹閫�
+ for (int i = 0; i < newVersionList.size(); i++) {
+ if (newVersionList.get(i) < 47)
+ newVersionList.remove(i--);
+ }
+
if (uid == null || uid == 0) {
long deviceCount = deviceTokenHWService.countDeviceToken(newVersionList);
int page = (int) (deviceCount % 100 == 0 ? deviceCount / 100 : deviceCount / 100 + 1);
@@ -157,27 +163,27 @@
for (DeviceTokenHW token : hwDeviceList)
tokenList.add(token.getDeviceToken());
try {
- if (type==PushTypeEnum.goodsdetail) {// 鍟嗗搧璇︽儏
+ if (type == PushTypeEnum.goodsdetail) {// 鍟嗗搧璇︽儏
if (goodsId == null)
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushGoods(tokenList, title, content, 1, goodsId);
- } else if (type==PushTypeEnum.url) {// 閾炬帴
+ } else if (type == PushTypeEnum.url) {// 閾炬帴
if (StringUtil.isNullOrEmpty(webUrl))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushUrl(tokenList, title, content, webUrl);
- } else if (type==PushTypeEnum.ZNX) {// 绔欏唴淇�
+ } else if (type == PushTypeEnum.ZNX) {// 绔欏唴淇�
HWPushUtil.pushZNX(tokenList, title, content);
- } else if (type==PushTypeEnum.weex) {// weex
+ } else if (type == PushTypeEnum.weex) {// weex
if (StringUtil.isNullOrEmpty(url))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushWEEX(tokenList, title, content, url);
- } else if (type==PushTypeEnum.baichuan) {// 鐧惧窛閾炬帴
+ } else if (type == PushTypeEnum.baichuan) {// 鐧惧窛閾炬帴
if (StringUtil.isNullOrEmpty(webUrl))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);
- } else if (type==PushTypeEnum.welfare) {// 绂忓埄涓績
+ } else if (type == PushTypeEnum.welfare) {// 绂忓埄涓績
HWPushUtil.pushWelfareCenter(tokenList, title, content);
- }else if (type==PushTypeEnum.signin) {// 绛惧埌
+ } else if (type == PushTypeEnum.signin) {// 绛惧埌
HWPushUtil.pushUserSignInNotification(tokenList, title, content);
}
} catch (Exception e) {
@@ -198,27 +204,27 @@
return;
try {
- if (type==PushTypeEnum.goodsdetail) {// 鍟嗗搧璇︽儏
+ if (type == PushTypeEnum.goodsdetail) {// 鍟嗗搧璇︽儏
if (goodsId == null)
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushGoods(tokenList, title, content, 1, goodsId);
- } else if (type==PushTypeEnum.url) {// 閾炬帴
+ } else if (type == PushTypeEnum.url) {// 閾炬帴
if (StringUtil.isNullOrEmpty(webUrl))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushUrl(tokenList, title, content, webUrl);
- } else if (type==PushTypeEnum.ZNX) {// 绔欏唴淇�
+ } else if (type == PushTypeEnum.ZNX) {// 绔欏唴淇�
HWPushUtil.pushZNX(tokenList, title, content);
- } else if (type==PushTypeEnum.weex) {// weex
+ } else if (type == PushTypeEnum.weex) {// weex
if (StringUtil.isNullOrEmpty(url))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushWEEX(tokenList, title, content, url);
- } else if (type==PushTypeEnum.baichuan) {// 鐧惧窛閾炬帴
+ } else if (type == PushTypeEnum.baichuan) {// 鐧惧窛閾炬帴
if (StringUtil.isNullOrEmpty(webUrl))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);
- } else if (type==PushTypeEnum.welfare) {// 绂忓埄涓績
+ } else if (type == PushTypeEnum.welfare) {// 绂忓埄涓績
HWPushUtil.pushWelfareCenter(tokenList, title, content);
- } else if (type==PushTypeEnum.signin) {// 绛惧埌
+ } else if (type == PushTypeEnum.signin) {// 绛惧埌
HWPushUtil.pushUserSignInNotification(tokenList, title, content);
}
} catch (Exception e) {
--
Gitblit v1.8.0