Merge pull request #51 from xelloss00x/main

[update] 鸿蒙在线支持传参want

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,11 @@
 # Release Notes
 
+## 1.0.2.0
+
+### update
+
+* 鸿蒙离线支持传参want
+
 ## 1.0.1.0
 
 ### update

README.md

@@ -22,7 +22,7 @@
 <dependency>
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
-    <version>1.0.1.0</version>
+    <version>1.0.2.0</version>
 </dependency>
 ```
 
@@ -127,6 +127,18 @@ public class TestPushApi {
         alert.setBody("ios body");
         /*设置ios厂商参数结束，更多参数请查看文档或对象源码*/
 
+        /*配置鸿蒙厂商参数*/
+        HarmonyDTO harmonyDTO = new HarmonyDTO();
+        pushChannel.setHarmony(harmonyDTO);
+        HarmonyNotification harmonyNotification = new HarmonyNotification();
+        harmonyDTO.setNotification(harmonyNotification);
+        harmonyNotification.setTitle("鸿蒙厂商title");
+        harmonyNotification.setBody("鸿蒙厂商body");
+        harmonyNotification.setCategory("MARKETING");
+        harmonyNotification.setClickType("want");
+        harmonyNotification.setWant("{\"deviceId\":\"\",\"bundleName\":\"com.getui.push\",\"abilityName\":\"TestAbility\",\"uri\":\"https://www.test.com:8080/push/test\",\"action\":\"com.test.action\",\"parameters\":{\"name\":\"Getui\",\"age\":12}}");
+        /*配置鸿蒙厂商参数结束，更多参数请查看文档或对象源码*/
+
         /*设置接收人信息*/
         Audience audience = new Audience();
         pushDTO.setAudience(audience);

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.1.0</version>
+    <version>1.0.2.0</version>
     <url>https://github.com/GetuiLaboratory/getui-pushapi-java-client-v2</url>
     <name>Getui Push API Java Client</name>
     <description>Getui's officially supported Java client library for accessing Getui APIs.</description>

src/main/java/com/getui/push/v2/sdk/core/Configs.java

@@ -13,7 +13,7 @@ public interface Configs {
 
     String HEADER_DOMAIN_HASH_KEY = "domainHash";
     String HEADER_OPEN_STABLE_DOMAIN = "openStableDomain";
-    String SDK_VERSION = "1.0.1.0";
+    String SDK_VERSION = "1.0.2.0";
     /**
      * 预置域名列表
      */

src/main/java/com/getui/push/v2/sdk/dto/req/message/harmony/HarmonyNotification.java

@@ -25,19 +25,11 @@ public class HarmonyNotification {
      */
     @SerializedName("click_type")
     private String clickType;
-
-    /**
-     * click_type为want时，action和uri必须填一个，点击通知打开应用特定页面
-     */
-    private String action;
     /**
-     * click_type为want时，action和uri必须填一个，点击通知打开应用特定页面
+     * 鸿蒙平台点击动作 <br><br/>
+     * 示例：{"deviceId":"","bundleName":"com.getui.push","abilityName":"TestAbility","uri":"https://www.test.com:8080/push/test","action":"com.test.action","parameters":{"name":"Getui","age":12}}
      */
-    private String uri;
-    /**
-     * 点击通知加附加消息，长度 ≤ 3072
-     */
-    private String payload;
+    private String want;
 
     public String getTitle() {
         return title;
@@ -71,28 +63,12 @@ public void setClickType(String clickType) {
         this.clickType = clickType;
     }
 
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public String getPayload() {
-        return payload;
+    public String getWant() {
+        return want;
     }
 
-    public void setPayload(String payload) {
-        this.payload = payload;
+    public void setWant(String want) {
+        this.want = want;
     }
 
     @Override
@@ -102,9 +78,7 @@ public String toString() {
                 ", body='" + body + '\'' +
                 ", category='" + category + '\'' +
                 ", clickType='" + clickType + '\'' +
-                ", action='" + action + '\'' +
-                ", uri='" + uri + '\'' +
-                ", payload='" + payload + '\'' +
+                ", want='" + want + '\'' +
                 '}';
     }
 }

src/test/java/com/getui/push/v2/sdk/api/PushApiTest.java

@@ -11,6 +11,8 @@
 import com.getui.push.v2.sdk.dto.req.message.PushMessage;
 import com.getui.push.v2.sdk.dto.req.message.android.AndroidDTO;
 import com.getui.push.v2.sdk.dto.req.message.android.GTNotification;
+import com.getui.push.v2.sdk.dto.req.message.harmony.HarmonyDTO;
+import com.getui.push.v2.sdk.dto.req.message.harmony.HarmonyNotification;
 import com.getui.push.v2.sdk.dto.res.ScheduleTaskDTO;
 import com.getui.push.v2.sdk.dto.req.message.android.ThirdNotification;
 import com.getui.push.v2.sdk.dto.req.message.android.Ups;
@@ -246,6 +248,16 @@ private PushDTO<Audience> pushDTO() {
         pushChannel.setIos(iosDTO);
         pushDTO.setPushChannel(pushChannel);
 
+        HarmonyDTO harmonyDTO = new HarmonyDTO();
+        pushChannel.setHarmony(harmonyDTO);
+        HarmonyNotification harmonyNotification = new HarmonyNotification();
+        harmonyDTO.setNotification(harmonyNotification);
+        harmonyNotification.setTitle("title-" + System.currentTimeMillis());
+        harmonyNotification.setBody("content");
+        harmonyNotification.setCategory("MARKETING");
+        harmonyNotification.setClickType("want");
+        harmonyNotification.setWant("{\"deviceId\":\"\",\"bundleName\":\"com.getui.push\",\"abilityName\":\"TestAbility\",\"uri\":\"https://www.test.com:8080/push/test\",\"action\":\"com.test.action\",\"parameters\":{\"name\":\"Getui\",\"age\":12}}");
+
         return pushDTO;
     }