Merge pull request #57 from littleKIDex8657503/main

[feature] 
1.修改定时任务查询返回状态字段;2
2..strategy支持设置荣耀ho、鸿蒙华为hoshw;
3.3.settings支持亮…

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,13 @@
 # Release Notes
 
+## 1.0.7.0
+
+### update
+
+* 修改定时任务查询返回状态字段
+* strategy支持设置荣耀ho、鸿蒙华为hoshw
+* settings支持亮屏推送参数active_push、lst
+
 ## 1.0.6.0
 
 ### update

README.md

@@ -22,7 +22,7 @@
 <dependency>
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
-    <version>1.0.6.0</version>
+    <version>1.0.7.0</version>
 </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.6.0</version>
+    <version>1.0.7.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.6.0";
+    String SDK_VERSION = "1.0.7.0";
     /**
      * 预置域名列表
      */

src/main/java/com/getui/push/v2/sdk/dto/req/Settings.java

@@ -48,12 +48,23 @@ public class Settings {
      * 活跃行为的自定义天数，近${activate_filter_day}天活跃/非活跃用户
      */
     private Integer activateFilterDay;
+
     /**
      * @see CommonEnum.ActivateFilterTypeEnum
      * 活跃行为的类型
      */
     private Integer activateFilterType;
 
+    /**
+     * 亮屏推送截止时间，单位毫秒，大于0且小于ttl
+     */
+    private Integer lst;
+
+    /**
+     * 是否亮屏推送，false表示不亮屏推送，true表示亮屏推送
+     */
+    private Boolean activePush;
+
     public Integer getTtl() {
         return ttl;
     }
@@ -134,6 +145,22 @@ public void setActivateFilterType(CommonEnum.ActivateFilterTypeEnum activateFilt
         this.activateFilterType = activateFilterTypeEnum.type;
     }
 
+    public Integer getLst() {
+        return lst;
+    }
+
+    public void setLst(Integer lst) {
+        this.lst = lst;
+    }
+
+    public Boolean getActivePush() {
+        return activePush;
+    }
+
+    public void setActivePush(Boolean activePush) {
+        this.activePush = activePush;
+    }
+
     @Override
     public String toString() {
         return "Settings{" +
@@ -147,6 +174,8 @@ public String toString() {
                 ", needBackup=" + needBackup +
                 ", activateFilterDay=" + activateFilterDay +
                 ", activateFilterType=" + activateFilterType +
+                ", lst=" + lst +
+                ", activePush=" + activePush +
                 '}';
     }
 }

src/main/java/com/getui/push/v2/sdk/dto/req/Strategy.java

@@ -13,6 +13,8 @@ public class Strategy extends HashMap<String, Integer> {
     public final static String st = "st";
     public final static String hx = "hx";
     public final static String hwq = "hwq";
+    public final static String ho = "ho";
+    public final static String hoshw = "hoshw";
 
     public Integer getDef() {
         return super.get(Strategy.def);
@@ -79,19 +81,35 @@ public void setSt(Integer st) {
     }
 
     public Integer getHx() {
-        return (Integer) super.get(Strategy.hx);
+        return super.get(Strategy.hx);
     }
 
     public void setHx(Integer hx) {
         super.put(Strategy.hx, hx);
     }
 
     public Integer getHwq() {
-        return (Integer) super.get(Strategy.hwq);
+        return super.get(Strategy.hwq);
     }
 
     public void setHwq(Integer hwq) {
         super.put(Strategy.hwq, hwq);
     }
 
+    public Integer getHo() {
+        return super.get(Strategy.ho);
+    }
+
+    public void setHo(Integer ho) {
+        super.put(Strategy.ho, ho);
+    }
+
+    public Integer getHoshw() {
+        return super.get(Strategy.hoshw);
+    }
+
+    public void setHoshw(Integer hoshw) {
+        super.put(Strategy.hoshw, hoshw);
+    }
+
 }

src/main/java/com/getui/push/v2/sdk/dto/res/ScheduleTaskDTO.java

@@ -11,9 +11,9 @@ public class ScheduleTaskDTO {
      */
     private String createTime;
     /**
-     * 定时任务状态：success/failed
+     * 定时任务状态：send_success/do_not_send/send_failed/has_delete
      */
-    private String status;
+    private String sendResult;
     /**
      * 透传内容
      */
@@ -31,12 +31,12 @@ public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 
-    public String getStatus() {
-        return status;
+    public String getSendResult() {
+        return sendResult;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setSendResult(String sendResult) {
+        this.sendResult = sendResult;
     }
 
     public String getTransmissionContent() {
@@ -59,7 +59,7 @@ public void setPushTime(String pushTime) {
     public String toString() {
         return "ScheduleTaskDTO{" +
                 "createTime='" + createTime + '\'' +
-                ", status='" + status + '\'' +
+                ", sendResult='" + sendResult + '\'' +
                 ", transmissionContent='" + transmissionContent + '\'' +
                 ", pushTime='" + pushTime + '\'' +
                 '}';