From f8bebca93fcaf37a7564b066b0f1b6dc1e7a5551 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 02 三月 2021 18:37:08 +0800
Subject: [PATCH] SolrJ升级
---
src/main/java/com/yeshi/buwan/funtv/FunTVUtil2.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/funtv/FunTVUtil2.java b/src/main/java/com/yeshi/buwan/funtv/FunTVUtil2.java
index 35e3403..94712ed 100644
--- a/src/main/java/com/yeshi/buwan/funtv/FunTVUtil2.java
+++ b/src/main/java/com/yeshi/buwan/funtv/FunTVUtil2.java
@@ -15,6 +15,7 @@
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.TimeUtil;
import com.yeshi.buwan.util.video.VideoConstant;
+import com.yeshi.buwan.vo.AcceptData;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.springframework.orm.hibernate4.HibernateCallback;
@@ -28,7 +29,7 @@
public final static int PLAY_NONE = 0;// 涓嶈兘鎾斁
public final static int PLAY_HTML = 1;// 璺宠浆绉诲姩绔綉椤垫挱鏀�
- public final static int PLAY_SDK = 3;// 鍐呭祵SDK鎾斁
+ public final static int PLAY_SDK = 2;// 鍐呭祵SDK鎾斁
public final static int RESOURCE_ID = 24;
public final static String RESOURCE_NAME = "椋庤.";
@@ -44,14 +45,22 @@
VideoDetailInfo vinfo = new VideoDetailInfo();
vinfo.setExtraId(pv.getId());
vinfo.setName(pv.getName());
- if ("缁艰壓".equalsIgnoreCase(p.getChannel()))
+ if ("缁艰壓".equalsIgnoreCase(p.getChannel())) {
vinfo.setTag(pv.getName());
- else if ("鐢靛奖".equalsIgnoreCase(p.getChannel()))
+ vinfo.setName(p.getName() + " " + pv.getNum());
+ } else if ("鐢靛奖".equalsIgnoreCase(p.getChannel())) {
vinfo.setTag(p.getName());
- else
- vinfo.setTag(pv.getNum());
+ vinfo.setName(p.getName());
+ } else if ("鐢佃鍓�".equalsIgnoreCase(p.getChannel())) {
+ vinfo.setTag(pv.getNum() + "");
+ vinfo.setName(p.getName() + " 绗�" + pv.getNum() + "闆�");
+ } else {
+ vinfo.setTag(pv.getNum() + "");
+ vinfo.setName(p.getName());
+ }
vinfo.setType("funtv");
vinfo.setId(Long.parseLong(pv.getId()));
+
return vinfo;
}
@@ -84,8 +93,8 @@
Comparator<FunTVVideo2> cm = new Comparator<FunTVVideo2>() {
public int compare(FunTVVideo2 o1, FunTVVideo2 o2) {
- int t2 = Integer.parseInt(o2.getNum());
- int t1 = Integer.parseInt(o1.getNum());
+ int t2 = o2.getNum();
+ int t1 = o1.getNum();
return (t2 - t1);// 鍊掑簭鎺掑垪
}
};
@@ -462,12 +471,28 @@
}
- public static int getPlayType(FunTVVideo2 video2) {
- if (video2.getStatus().equalsIgnoreCase("1"))
- return PLAY_HTML;
- else
+ /**
+ * 鑾峰彇鎾斁绫诲瀷
+ *
+ * @param acceptData
+ * @param video2
+ * @return
+ */
+ public static int getPlayType(AcceptData acceptData, FunTVVideo2 video2) {
+ if (video2.getStatus().equalsIgnoreCase("1")) {
+ if (acceptData.getPlatform().equalsIgnoreCase("android") && acceptData.getVersion() >= 100) {
+ return PLAY_SDK;
+ } else {
+ return PLAY_HTML;
+ }
+ } else {
return PLAY_NONE;
+ }
}
+ public void update(int channelId, Date startTime, Date endTime) {
+
+ }
+
}
--
Gitblit v1.8.0