From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播
---
src/main/java/com/yeshi/buwan/controller/api/GoldCornController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/api/GoldCornController.java b/src/main/java/com/yeshi/buwan/controller/api/GoldCornController.java
index 652b62e..d57008e 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/GoldCornController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/GoldCornController.java
@@ -14,9 +14,12 @@
import com.yeshi.buwan.domain.goldcorn.GoldCornTaskActionDetail;
import com.yeshi.buwan.domain.jump.JumpDetail;
import com.yeshi.buwan.domain.jump.JumpTypeEnum;
+import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.dto.goldcorn.SignInGoldCornDateData;
import com.yeshi.buwan.exception.goldcorn.SignInException;
import com.yeshi.buwan.exception.user.LoginUserException;
+import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.service.inter.goldcorn.GoldCornTaskActionDetailService;
import com.yeshi.buwan.service.inter.goldcorn.SignInService;
import com.yeshi.buwan.service.inter.system.SystemConfigService;
@@ -28,6 +31,7 @@
import com.yeshi.buwan.vo.goldcorn.GoldCornTaskVO;
import com.yeshi.buwan.vo.goldcorn.SignInInfoVO;
import net.sf.json.JSONObject;
+import org.apache.solr.common.params.ConfigSetParams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
@@ -55,6 +59,9 @@
@Resource
private GoldCornTaskActionDetailService goldCornTaskActionDetailService;
+
+ @Resource
+ private DetailSystemConfigService configService;
/**
@@ -109,11 +116,10 @@
st += h + "灏忔椂";
}
if (m != 0 || h > 0)
- st += m + "鍒�";
- if (s > 0)
+ st += m + "鍒嗛挓";
+ if (s > 0 && st.length() == 0)
st += s + "绉�";
- return JsonUtil.loadFalseJson(String.format("璇风瓑寰� %s 鍚庡啀鍋氫换鍔�", st));
-
+ return JsonUtil.loadFalseJson(String.format("璇�%s鍚庡啀璇�", st));
}
}
@@ -128,9 +134,10 @@
jsonObject.put("goldCorn", goldCorn);
return JsonUtil.loadTrueJson(jsonObject.toString());
} catch (LoginUserException e) {
- return JsonUtil.loadFalseJson("绛惧埌鍑洪敊");
+ return JsonUtil.loadFalseJson("绛惧埌鍑洪敊,璇风◢鍚庡啀璇�");
} catch (SignInException e) {
e.printStackTrace();
+ logger.error("绛惧埌鍑洪敊锛�", e);
return JsonUtil.loadFalseJson(e.getMessage());
}
@@ -148,11 +155,19 @@
SignInInfoVO.SignInConfig config = new SignInInfoVO.SignInConfig();
config.setRecordUrl(systemConfigService.getConfigValueByKeyCache("goldCornRecordUrl"));
config.setRuleUrl(systemConfigService.getConfigValueByKeyCache("goldCornRuleUrl"));
+
+ String action = systemConfigService.getConfigValueByKeyCache("useGoldCornAction");
+ JSONObject actionJSON = JSONObject.fromObject(action);
+ Gson gson = new Gson();
+ config.setUserJump(gson.fromJson(actionJSON.optJSONObject("jumpDetail").toString(), JumpDetail.class));
+ config.setUserJumpParams(actionJSON.optString("params"));
+
signInInfo.setSignInConfig(config);
signInInfo.setCanSignIn(!signInService.isTodaySignIned(loginUid, new Date()));
return JsonUtil.loadTrueJson(new Gson().toJson(signInInfo));
} catch (Exception e) {
e.printStackTrace();
+ logger.error("鑾峰彇绛惧埌淇℃伅寮傚父锛�", e);
}
return JsonUtil.loadFalseJson("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
@@ -202,8 +217,8 @@
voList.add(new GoldCornCouponVideoVO("https://r1.ykimg.com/058400005FA60E6A14187C0791817503?x-oss-process=image/resize,w_290/interlace,1/quality,Q_80", jumpDetail, params.toString().replace("\"", "\\" + "\"")));
voList.add(new GoldCornCouponVideoVO("https://r1.ykimg.com/058400005F2BA59B6AEB660E907A2B99?x-oss-process=image/resize,w_290/interlace,1/quality,Q_80", jumpDetail, params.toString().replace("\"", "\\" + "\"")));
voList.add(new GoldCornCouponVideoVO("https://r1.ykimg.com/052700005DC9247B1B769182B50A8C21?x-oss-process=image/resize,w_290/interlace,1/quality,Q_80", jumpDetail, params.toString().replace("\"", "\\" + "\"")));
- if (voList.size() < 3)
- voList.clear();
+// if (voList.size() < 3)
+ voList.clear();
JSONObject data = new JSONObject();
data.put("list", new Gson().toJson(voList));
data.put("count", voList.size());
@@ -217,7 +232,28 @@
List<GoldCornTaskVO> voList = new ArrayList<>();
try {
//鐧诲綍
- List<GoldCornGetSource> list = goldCornManager.listGetCornSource(1, 20);
+ List<GoldCornGetSource> list1 = goldCornManager.listGetCornSource(1, 20);
+
+ List<GoldCornGetSource> list = new ArrayList<>();
+ list.addAll(list1);
+
+ //鍒犻櫎鍗庝负娓犻亾鐨勭湅婵�鍔辫棰戜换鍔�
+ if (acceptData.getChannel().equalsIgnoreCase("huawei")) {
+ if (list != null && list.size() > 0)
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getSourceCode().equalsIgnoreCase(CodeCornGetSourceType.watchRewardAd.name())) {
+ //鍗庝负鏄惁姝ｅ湪涓婄嚎
+ DetailSystemConfig onLiningVersionInfo = configService.getConfigByKey("ad_hw_online_version_info", new DetailSystem("44"), 1);
+ JSONObject onLiningVersionInfoJson = JSONObject.fromObject(onLiningVersionInfo.getValue());
+ int onLiningVersionCode = onLiningVersionInfoJson.optInt("versionCode");
+ if (acceptData.getVersion() >= onLiningVersionCode) {
+ list.remove(i);
+ break;
+ }
+ }
+ }
+ }
+
List<String> sourceCodes = new ArrayList<>();
for (GoldCornGetSource source : list) {
--
Gitblit v1.8.0