Merge branch '20210414bxl' into 'master'

资料

See merge request test-group/kejiji!49

src/test/java/com/kjj/bean/ResourceEditList.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class ResourceEditList {
+    private List<Editlist> list;
+
+    @Data
+    public static class Editlist
+    {
+        private String id;
+        private String name;
+        private int resourceType;
+        private boolean selected;
+    }
+
+    private boolean hasNext;
+}
+

src/test/java/com/kjj/bean/ResourcePushList.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+@Data
+public class ResourcePushList {
+    private String confId;
+    private String resourceImg;
+    private String resourceTitle;
+    private int resourceType;
+    private int pushType;
+    private boolean hasOn;
+    private boolean hasPasterOn;
+    private boolean hasConfPaster;
+}

src/test/java/com/kjj/config/BasicConfig.java

@@ -137,11 +137,16 @@ public class BasicConfig {
 
     //查询资料列表//
     public static final String MOBILE_Resource = MOBILE_HOST + "/clue/resource/list";
+    public static final String MOBILE_ResourceOn = MOBILE_HOST + "/conf/live/push/on";
+    public static final String MOBILE_ResourceOff = MOBILE_HOST + "/conf/live/push/off";
+    public static final String MOBILE_ResourceEditList = MOBILE_HOST + "/conf/pre/resource/list";
+    public static final String MOBILE_ResourceEdit = MOBILE_HOST + "/conf/pre/resource/saveOrUpdate";
+    public static final String MOBILE_ResourceList = MOBILE_HOST + "/conf/live/push/list";
     public static final String MOBILE_Form = MOBILE_HOST + "/clue/resource/form/detail";
     public static final String MOBILE_FormSubmit = MOBILE_HOST + "/clue/resource/form/submit";
     public static final String MOBILE_Link1 = MOBILE_HOST + "/clue/info/interact";
     public static final String MOBILE_Link = MOBILE_HOST + "/kjy/live/user/resource/receive";
-    public static final String MOBILE_ResourceFree = MOBILE_HOST + "/kjy/live/user/resource/findDetailByConfId";
+    public static final String MOBILE_ResourceFindDetailByConfid = MOBILE_HOST + "/kjy/live/user/resource/findDetailByConfId";
     public static final String MOBILE_ResourceTestDetail = MOBILE_HOST + "/clue/resource/test/detail";
     public static final String MOBILE_ResourceTestParticipate = MOBILE_HOST + "/clue/resource/test/participate";
     public static final String MOBILE_ResourceTestSubmit = MOBILE_HOST + "/clue/resource/test/submit";
@@ -155,6 +160,14 @@ public class BasicConfig {
     public static final String MOBILE_MyLotteryCode = MOBILE_HOST + "/kjy/live/lottery/myLotteryCode";
 
 
+
+    //投票
+    public static final String MOBILE_ChoiceCurrentDetail = MOBILE_HOST + "/conf/live/choice/currentDetail";
+    public static final String MOBILE_AddChoice = MOBILE_HOST + "/conf/live/choice/addChoice";
+    public static final String MOBILE_ChoiceGetList = MOBILE_HOST + "/conf/live/choice/getList";
+    public static final String MOBILE_ChoiceSend = MOBILE_HOST + "/conf/live/choice/send";
+    public static final String MOBILE_ChoiceClose = MOBILE_HOST + "/conf/live/choice/close";
+
     //红包//
     public static final String MOBILE_AnchorRedList = MOBILE_HOST + "/conf/live/red/findRedList";
     public static final String MOBILE_FindRedList = MOBILE_HOST + "/clue/red/findRedList";