From 345586e91139dfa6ed8a9c3741e1eab32997ab92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E7=84=B1?= <thelongcode@163.com>
Date: Mon, 10 Jun 2019 21:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ifish7/mq/push/AliyunPushApi.java |  5 ++++-
 .../com/ifish7/mq/push/AliyunPushApiTest.java  | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ifish7/mq/push/AliyunPushApi.java b/src/main/java/com/ifish7/mq/push/AliyunPushApi.java
index 5ff58c2..85988b4 100644
--- a/src/main/java/com/ifish7/mq/push/AliyunPushApi.java
+++ b/src/main/java/com/ifish7/mq/push/AliyunPushApi.java
@@ -98,7 +98,10 @@ public class AliyunPushApi {
             //android通知设置
             pushRequest.setAndroidOpenType("APPLICATION");
             pushRequest.setAndroidNotifyType("BOTH");
-//            pushRequest.setAndroidNotificationChannel("1");
+            pushRequest.setAndroidPopupActivity("PopupPushActivity");
+            pushRequest.setAndroidPopupTitle(pushList.getPushTitle());
+            pushRequest.setAndroidPopupBody(pushList.getPushContext());
+            pushRequest.setAndroidRemind(true);
 
             try {
                 PushResponse response = client.getAcsResponse(pushRequest);
diff --git a/src/test/java/com/ifish7/mq/push/AliyunPushApiTest.java b/src/test/java/com/ifish7/mq/push/AliyunPushApiTest.java
index 98fa447..5abf23b 100644
--- a/src/test/java/com/ifish7/mq/push/AliyunPushApiTest.java
+++ b/src/test/java/com/ifish7/mq/push/AliyunPushApiTest.java
@@ -27,7 +27,7 @@ public class AliyunPushApiTest {
         IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", "LTAIfZaosFH5IWlD", "dvlE8eFii31BcGb8HzkGz3eSaJ6Y94");
         DefaultAcsClient client = new DefaultAcsClient(profile);
         PushRequest pushRequest = new PushRequest();
-        pushRequest.setAppKey(26007228l);
+        pushRequest.setAppKey(26023230l);
         pushRequest.setSysProtocol(ProtocolType.HTTPS);
         pushRequest.setSysMethod(MethodType.POST);
         pushRequest.setStoreOffline(true);
@@ -45,19 +45,27 @@ public class AliyunPushApiTest {
         pushRequest.setAcceptFormat(FormatType.JSON);
         //根据Target来设定，多个值使用逗号分隔
         //此处应该查询出用户所对应的deviceId ★★★★★
-        pushRequest.setTargetValue("97e7cbda2a5d40b0af79b5f9aa49ddd3");
+        pushRequest.setTargetValue("8b42082f3fd9447f9c662804f10ab142");
         //推送类型
         pushRequest.setPushType("NOTICE");
         //推送设备类型
-        pushRequest.setDeviceType("iOS");
+        pushRequest.setDeviceType("ANDROID");
         // 消息的标题
-        pushRequest.setTitle("温度报警");
+        pushRequest.setTitle("小米推送测试");
         // 消息的内容
-        pushRequest.setBody("[温度报警]你的水族箱\"鱼缸1234\"在2019-04-10 23:40:00,温度达到29℃,已高于28℃,请及时查看!");
+        pushRequest.setBody("小米推送测试");
 
         // 推送配置: Android
         pushRequest.setAndroidNotifyType("BOTH");//通知的提醒方式 "VIBRATE" : 震动 "SOUND" : 声音 "BOTH" : 声音和震动 NONE : 静音
         pushRequest.setAndroidOpenType("APPLICATION"); //点击通知后动作 "APPLICATION" : 打开应用 "ACTIVITY" : 打开AndroidActivity "URL" : 打开URL "NONE" : 无跳转
+
+        //android通知设置
+        pushRequest.setAndroidOpenType("APPLICATION");
+        pushRequest.setAndroidNotifyType("BOTH");
+        pushRequest.setAndroidPopupActivity("PopupPushActivity");
+        pushRequest.setAndroidPopupTitle("小米推送测试");
+        pushRequest.setAndroidPopupBody("小米推送测试");
+        pushRequest.setAndroidRemind(true);
         // 指定notificaitonchannel id
 //        pushRequest.setAndroidNotificationChannel("1");
         try {