Merge branch 'master' into feature/20210816-xmc

src/test/java/com/kjj/cases/assistant/menu/NoviceGuidance.java

@@ -66,6 +66,7 @@ public class NoviceGuidance implements Authorization {
 
     @Test(description = "进入名片后唤起新手引导",priority = 5)
     public void 进入名片后唤起新手引导(){
+        sleep(2000);
         Response response = network.getResponse(SELLERCARD_CARDGUIDE);
         boolean success = response.jsonPath().getBoolean("success");
         int guideType = response.jsonPath().getInt("data.guideType");

src/test/java/com/kjj/cases/live/anchor/LiveVisitors.java

@@ -290,7 +290,7 @@ public class LiveVisitors implements Authorization
         adminAuth();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-        params.put("confId", this.PushList.get(5).getConfId());
+        params.put("confId", this.PushList.get(4).getConfId());
         Response response = network.postResponse(params, BasicConfig.MOBILE_pasterOn);
         boolean data = response.jsonPath().getBoolean("data");
         System.out.println(data);
@@ -304,13 +304,13 @@ public class LiveVisitors implements Authorization
         ThreadSleepUtils.sleep(1000);
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-        params.put("confId", this.PushList.get(5).getConfId());
+        params.put("confId", this.PushList.get(4).getConfId());
         Response response = network.getResponse(params, BasicConfig.MOBILE_ResourceList);
         List<LiveVisitor> liveVisitors = JsonUtil.parseResponseToListBean(response, LiveVisitor.class);
-        LiveVisitor form = liveVisitors.get(5);
+        LiveVisitor form = liveVisitors.get(4);
         boolean isHasConfPaster=form.isHasConfPaster();
-        System.out.println(isHasConfPaster);
-        Assert.assertTrue(isHasConfPaster, network.message(params, BasicConfig.MOBILE_ResourceList, "贴片上架失败", response.body().asString()));
+        System.out.println(response.body().asString());
+        Assert.assertTrue(isHasConfPaster, network.message(params, BasicConfig.MOBILE_ResourceList, "获取列表失败", response.body().asString()));
     }
 
     @Test(description = "访客获取贴片信息", priority = 19)
@@ -331,7 +331,7 @@ public class LiveVisitors implements Authorization
         adminAuth();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-        params.put("confId", this.PushList.get(5).getConfId());
+        params.put("confId", this.PushList.get(4).getConfId());
         Response response = network.postResponse(params, BasicConfig.MOBILE_pasterOff);
         boolean data = response.jsonPath().getBoolean("data");
         System.out.println(data);

src/test/java/com/kjj/cases/live/liveConfig/SaveLive.java

@@ -1419,6 +1419,7 @@ public class SaveLive implements Authorization {
         Params.put("showAmount",1000);
         Params.put("showMaxAmount",1000);
         Params.put("poolType",1);
+        Params.put("openSceneType",1);
         Params.put("freeNum",1);
         Response response = network.postResponse(Params, BasicConfig.MANAGER_flipWord);
         boolean data = response.jsonPath().getBoolean("data");