Merge remote-tracking branch 'origin/master'

翁力
2 parents 669a5441 e7d4aeb2
Showing 3 changed files with 70 additions and 14 deletions
8.直播云/1.1 获取直播活动信息接口.md
8.直播云/1.2 获取flash直播URL接口.md
8.直播云/1.9 获取H5直播URL接口.md
@@ -26,7 +26,7 @@ HTTP GET
 | :----------- | :------: | :------: | :------: |  
 | errorCode | int | true   | 错误类型号   |  
 | message| string | true   | 错误类型 |
-| activityid| string | true   | 活动ID，确保SP下的唯一性 |
+| activityId| string | true   | 活动ID，确保SP下的唯一性 |
 | activityname | string | true   | 活动名称  |  
 | activitystatus | int | true   | 活动状态，0：未开始 ／1：已开始 ／3：已结束 ／4 已下线，默认为0 |
 | isHorizontalScreen | int | true   | 屏幕方向，0：垂直即竖屏 ／1：水平即横屏 ，默认为1 ｜
@@ -66,31 +66,31 @@ HTTP GET
         “extensions”：“”，
         “activityCategory”：“”，
         "mp4_url_rate1":""，
-        "mp4_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayBySWF?channelID=xinyingshi&rate=2&sp_id=iqhpk8pl19"，
+        "mp4_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayBySWF?channelID=xinyingshi&sp_id=iqhpk8pl19"，
         "mp4_url_rate3":""，
         "mp4_url_rate4":""，
         "hls_url_rate1":""，
-        "hls_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplay?channelID=xinyingshi&rate=2&sp_id=iqhpk8pl19"，
+        "hls_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayByH5?channelID=xinyingshi&sp_id=iqhpk8pl19"，
         "hls_url_rate3":""，
         "hls_url_rate4":""，
         "extViews"［
             ｛
                     "mp4_url_rate1":""，
-                    "mp4_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayBySWF?channelID=xinyingshi_m1&rate=2&sp_id=iqhpk8pl19"，
+                    "mp4_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayBySWF?channelID=xinyingshi&sp_id=iqhpk8pl19"，
                     "mp4_url_rate3":""，
                     "mp4_url_rate4":""，
                     "hls_url_rate1":""，
-                    "hls_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplay?channelID=xinyingshi_m1&rate=2&sp_id=iqhpk8pl19"，
+                    "hls_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayByH5?channelID=xinyingshi&sp_id=iqhpk8pl19"，
                     "hls_url_rate3":""，
                     "hls_url_rate4":""      
             ｝,
             ｛
                     "mp4_url_rate1":""，
-                    "mp4_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayBySWF?channelID=xinyingshi_m2&rate=2&sp_id=iqhpk8pl19"，
+                    "mp4_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayBySWF?channelID=xinyingshi&sp_id=iqhpk8pl19"，
                     "mp4_url_rate3":""，
                     "mp4_url_rate4":""，
                     "hls_url_rate1":""，
-                    "hls_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplay?channelID=xinyingshi_m2&rate=2&sp_id=iqhpk8pl19"，
+                    "hls_url_rate2":"http://api.cnlive.com/open/api3/play/IPS/liveplayByH5?channelID=xinyingshi&sp_id=iqhpk8pl19"，
                     "hls_url_rate3":""，
                     "hls_url_rate4":""      
             ｝        
@@ -102,11 +102,11 @@ HTTP GET
 ``` java
-public String getPlayInfo() {
+public Object getPlayInfo() {
 			String result = "";
 			Map params = new HashMap<>();
 			params.put("sp_id", "iqhpk8pl19");
-			params.put("customID", "d849bb4277be42799df3ffc21654d949");
+			params.put("activityId", "d849bb4277be42799df3ffc21654d949");
 			params.put("timestamp", System.currentTimeMillis()/1000+"");
 			String url = OpenUtil.buildURL("http://api.cnlive.com/open/api2/zbsc/getLiveActivityPlayInfo", params, "672db30805f848f59ec3728f8347a4a0");
 			HttpURLConnection connection;
@@ -136,7 +136,7 @@ public String getPlayInfo() {
 			if(BaseUtil.notBlank(result)) {
 				JSONObject resultJson = JSONObject.parseObject(result);
-			    return resultJson.getJSONObject("data").getString("hls_url_rate2");
+			    return resultJson;
 			}
 			return "";
 ### 获取RTMP直播播放URL接口 
 -----
-#### URL: http://api.cnlive.com/open/api2/play/IPS/liveplayBySWF
+#### URL: http://api.cnlive.com/open/api3/play/IPS/liveplayBySWF
 -----
-#### 接口说明: 返回RTMP／FLV直播播放地址 （供 swf或 PC页面 调用）  
+#### 接口说明: 接口返回json，json数据(location属性)包含RTMP／FLV直播播放地址 （供 swf或 PC页面 调用）  
 -----
 #### 请求方式: HTTP GET  
 -----
@@ -18,5 +18,58 @@
 | retry | int | false | 重试次数，在0~4之间累加 |
 | rate | int |  false | 1-流畅，2-标清，3-高清，4-超清，不传为2，EPG接口会返回实际的码流路数－－标清为必须项|
+#### 返回结果
-#### 页面播放DEMO:
 \ No newline at end of file
+| 参数名 | 参数类型 | 必选 | 参数说明 |  
+| :----------- | :------: | :------: | :------: |  
+| errorCode | string | true   | 错误码：0 成功   |  
+| errorMessage| string | true   | 错误类型描述 |
+| location| string | true   | 直播流地址 |
+
+```json
+    {
+        "errorCode":"0",
+        "errorMessage":"成功",
+        "location":"rtmp://wsrtmp4.live.cnlive.com/cdn/xinyingshi?wsSecret=a1b8ee5edd76fc8c80eda08cc03bec10&wsTime=57982548"
+   }
+```
+#### java示例：
+
+``` java
+    public String getFlashLive() {
+		String result = "";
+		String mp4Url = "http://api.cnlive.com/open/api3/play/IPS/liveplayBySWF?channelID=xinyingshi&sp_id=iqhpk8pl19";
+		try {
+			URL requestUrl = new URL(mp4Url);
+			connection = (HttpURLConnection)requestUrl.openConnection();
+			connection.setRequestMethod("GET");
+			connection.setDoInput(true);
+			connection.setDoOutput(true);
+			connection.connect();//连接
+			
+			//获得返回值
+			if(connection.getResponseCode() == HttpURLConnection.HTTP_OK){
+				InputStream in = connection.getInputStream();
+				String currentLine = "";
+				if(in != null){
+					BufferedReader br = new BufferedReader(new InputStreamReader(in,"utf-8"));
+					while((currentLine = br.readLine()) != null){
+						result += currentLine;
+					}
+					br.close();
+				}
+			}
+		}catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		if(BaseUtil.notBlank(result)) {
+			resultJson = JSONObject.parseObject(result);
+			return resultJson.getString("location");
+		}
+
+		return "";
+	}
+```
+
+### [页面DEMO](http://open.cnlive.com/demo/live/flash_live_demo.html)
 \ No newline at end of file
@@ -16,4 +16,7 @@
 | uuid| string | false   | 用户标识（uuid_时间戳)，不传为0 |
 | sid| string | false   | 用户ID，不传为0 |  
 | retry | int | false | 重试次数，从0开始，不断累加，不传为0 |
-| rate | int |  false | 1-流畅，2-标清，3-高清，4-超清，不传为2，EPG接口会返回实际的码流路数－－标清为必须项|
 \ No newline at end of file
+| rate | int |  false | 1-流畅，2-标清，3-高清，4-超清，不传为2，EPG接口会返回实际的码流路数－－标清为必须项|
+
+
+### [页面DEMO](http://open.cnlive.com/demo/live/h5_live_demo.html)
 \ No newline at end of file