修改 app播放

刘基城
1 parent d256d569
Showing 7 changed files with 35 additions and 103 deletions
.classpath
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.wst.common.component
.settings/org.eclipse.wst.common.project.facet.core.xml
src/main/java/com/cnlive/mz/live/action/LiveAction.java
target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -24,9 +24,9 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.6
@@ -3,15 +3,20 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources/i18n"/>
         <dependent-module archiveName="cnlive_live_model-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_live_model/cnlive_live_model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="cnlive_ks3-1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_ks3/cnlive_ks3">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="smart-plugin-job-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-job/smart-plugin-job">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
             <dependency-type>uses</dependency-type>
         </dependent-module>
@@ -3,5 +3,5 @@
   <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="1.1"/>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="1.6"/>
 </faceted-project>
@@ -15,10 +15,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.smart4j.framework.dao.bean.Pager;
@@ -29,6 +27,7 @@ import org.smart4j.framework.mvc.annotation.Request;
 import org.smart4j.framework.mvc.bean.Multipart;
 import org.smart4j.framework.mvc.bean.Multiparts;
 import org.smart4j.framework.mvc.bean.Params;
+import org.smart4j.framework.mvc.bean.Redirect;
 import org.smart4j.framework.mvc.bean.Result;
 import org.smart4j.framework.mvc.bean.ResultBean;
 import org.smart4j.framework.mvc.bean.View;
@@ -40,7 +39,6 @@ import com.cnlive.mz.live.common.LiveUtils;
 import com.cnlive.mz.live.entity.TChannel;
 import com.cnlive.mz.live.entity.TLive;
 import com.cnlive.mz.live.entity.TRoom;
-import com.cnlive.mz.live.rest.BaseUtil;
 import com.cnlive.mz.live.service.TCheckService;
 import com.cnlive.mz.live.service.TLiveService;
 import com.cnlive.mz.live.service.TRoomService;
@@ -188,11 +186,11 @@ public class LiveAction {
 		String activityId = params.getString("activityId");
 		int isHorizontalScreen = params.getInt("isHorizontalScreen");
 		String channelID = params.getString("channelId");
+		Map<String, Object> map = new HashMap<String, Object>();
 		if (StringUtils.isNotEmpty(appId) && StringUtils.isNotEmpty(activityId) && StringUtils.isNotEmpty(channelID)
 				&& StringUtils.isNotEmpty("" + isHorizontalScreen)) {
 			TLive tLive = tLiveService.selectByParams(appId, activityId);
 			if (tLive != null) {
-				Map<String, Object> map = new HashMap<String, Object>();
 				map.put("location", "");
 				rb.setData(map);
 				rb.setErrorCode("500");
@@ -203,17 +201,15 @@ public class LiveAction {
 				boolean flag = tLiveService.addAcitvity(params);
 				TLive tlive = tLiveService.selectByParams(appId, activityId);
 				if (flag) {
-					Map<String, Object> map = new HashMap<String, Object>();
-					map.put("location",com.cnlive.mz.live.common.Constants.KS_HOST_UP_RTMP + channelID + "?vdoid=" + activityId);
+					map.put("location", com.cnlive.mz.live.common.Constants.KS_HOST_UP_RTMP + channelID + "?vdoid=" + activityId);
 					rb.setData(map);
 					rb.setErrorCode("0");
 					rb.setErrorMessage("创建活动成功");
 					log.info("创建活动成功");
 					// 通知cms直播
-					 boolean success = tLiveService.startLive(tlive);
+					boolean success = tLiveService.startLive(tlive);
 					return rb;
 				} else {
-					Map<String, Object> map = new HashMap<String, Object>();
 					map.put("location", "");
 					rb.setData(map);
 					rb.setErrorCode("500");
@@ -223,7 +219,6 @@ public class LiveAction {
 				}
 			}
 		} else {
-			Map<String, Object> map = new HashMap<String, Object>();
 			map.put("location", "");
 			rb.setData(map);
 			rb.setErrorCode("500");
@@ -231,7 +226,6 @@ public class LiveAction {
 			log.error("参数不正确");
 			return rb;
 		}
-
 	}
 	/**
@@ -342,7 +336,6 @@ public class LiveAction {
 				rb.setErrorMessage("获取活动列表成功");
 				return rb;
 			}
-
 		}
 	}
@@ -421,50 +414,24 @@ public class LiveAction {
 	 * 1.8 获取APP直播URL接口.md
 	 * 
 	 * @param params
-	 * @return
+	 * @return 302 跳转播放地址
 	 */
 	@Request.Get("/live/epg/play/app")
-	public ResultBean appURL(Params params) throws IOException {
-		HttpServletResponse response = DataContext.getResponse();
-		ResultBean rb = new ResultBean();
+	public Redirect appURL(Params params) throws IOException {
+		log.info(params);
+		Redirect r = new Redirect();
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
-		Map<String, Object> map = new HashMap<String, Object>();
-		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
-			map.put("location", "");
-			rb.setData(map);
-			rb.setErrorCode("500");
-			rb.setErrorMessage("启动app活动失败");
-			return rb;
+		TLive tLive = tLiveService.selectByParams(appId, activityid);
+		TChannel tchannel = tLiveService.selectChannel(tLive.getRelation_id());
+		if (tchannel != null) {
+			// pgc直播
+			r.setRedirectUrl("http://ips.cnlive.com/IPS/liveplayByAPP.action?appId=" + appId + "&channelID=" + tLive.getRelation_id());
 		} else {
-			TLive tLive = tLiveService.selectByParams(appId, activityid);
-			if (tLive == null) {
-				map.put("location", "");
-				rb.setData(map);
-				rb.setErrorCode("500");
-				rb.setErrorMessage("启动app活动失败,活动对象为空");
-				return rb;
-			} else {
-				TChannel tchannel = tLiveService.selectChannel(tLive.getRelation_id());
-				if (tchannel != null) {
-					// 请求到app.......
-					redirect(response, "http://ips.cnlive.com/IPS/liveplayByAPP.action?appId=" + appId + "&channelID="
-							+ tLive.getRelation_id());
-					map.put("location", "");
-					rb.setData(map);
-					rb.setErrorCode("0");
-					rb.setErrorMessage("302重定向到app");
-					return rb;
-				} else {
-					map.put("location", tLive.getLive_url());
-					rb.setData(map);
-					rb.setErrorCode("0");
-					rb.setErrorMessage("启动app活动成功");
-					return rb;
-				}
-			}
+			// ugc直播
+			r.setRedirectUrl(tLive.getLive_url());
 		}
-
+		return r;
 	}
 	/**
@@ -498,8 +465,7 @@ public class LiveAction {
 				TChannel tchannel = tLiveService.selectChannel(tLive.getRelation_id());
 				if (tchannel != null) {
 					// 重定向到h5.......
-					redirect(response, "http://ips.cnlive.com/IPS/liveplayByH5?appId=" + appId + "&channelID="
-							+ tLive.getRelation_id());
+					redirect(response, "http://ips.cnlive.com/IPS/liveplayByH5?appId=" + appId + "&channelID=" + tLive.getRelation_id());
 					map.put("location", "");
 					rb.setData(map);
 					rb.setErrorCode("0");
@@ -550,49 +516,17 @@ public class LiveAction {
 				rb.setErrorCode("0");
 				if (tchannel != null) {
 					// 302重定向到swf.......
-					redirect(response, "http://ips.cnlive.com/IPS/liveplayBySWF.action?appId=" + appId + "&channelID="
-							+ tLive.getRelation_id());
+					redirect(response, "http://ips.cnlive.com/IPS/liveplayBySWF.action?appId=" + appId + "&channelID=" + tLive.getRelation_id());
 					map.put("location", "");
 					rb.setErrorMessage("302重定向到swf");
 					return rb;
 				} else {
-
 					map.put("location", tLive.getLive_url());
 					rb.setErrorMessage("启动swf活动成功");
 					return rb;
 				}
 			}
 		}
-
-	}
-
-	/**
-	 * 2.1 获取推流直播播放地址.md
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@Request.Get("/live/epg/play")
-	public ResultBean startLiveActivity(Params params) {
-		ResultBean rb = new ResultBean();
-		String appId = params.getString("appId");
-		String activityid = params.getString("activityId");
-		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
-			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("location", "");
-			rb.setData(map);
-			rb.setErrorCode("500");
-			rb.setErrorMessage("启动活动失败");
-			return rb;
-		} else {
-			TLive tLive = tLiveService.selectByParams(appId, activityid);
-			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("location", tLive.getLive_url());
-			rb.setData(map);
-			rb.setErrorCode("0");
-			rb.setErrorMessage("启动活动成功");
-			return rb;
-		}
 	}
 	@Request.Post("/live/epg/error500")
@@ -617,12 +551,6 @@ public class LiveAction {
 		}
 	}
-	@Request.Get("/live/epg/302")
-	public void red302() {
-		HttpServletResponse response = DataContext.getResponse();
-		redirect(response, "http://ips.cnlive.com/IPS/liveplayBySWF.action?activityId=12345");
-	}
-
 	public static void main(String[] args) {
 		/*
@@ -644,8 +572,7 @@ public class LiveAction {
 		 * "http://bc.cnlive.com/live/epg/startActivity?appId=123&activityId=234"
 		 * ); System.out.println(aa);
 		 */
-		String aa = HttpReq
-				.getRequestWidthResult("http://bc.cnlive.com/live/epg/startActivity?appId=123&activityId=234");
+		String aa = HttpReq.getRequestWidthResult("http://bc.cnlive.com/live/epg/startActivity?appId=123&activityId=234");
 		System.out.println(aa);
 	}
 }
 \ No newline at end of file
 Manifest-Version: 1.0
-Build-Jdk: 1.7.0_13
-Built-By: Administrator
+Build-Jdk: 1.7.0_79
+Built-By: adm
 Created-By: Maven Integration for Eclipse
 #Generated by Maven Integration for Eclipse
-#Sat Aug 20 18:14:13 CST 2016
+#Sat Aug 20 22:58:05 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web
-m2e.projectLocation=C\:\\Users\\Administrator\\git\\cnlive_live_web
+m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
 artifactId=cnlive_live_web