Commit 1a20c129 1a20c1299984ea0ccfbe6cd5045ea778b6b8fd6b by 金学艇

supercid和cid从js端获取便于后续更新

专门给福建渠道造个fujian_main_recommend.json
1 parent ec058611
......@@ -380,7 +380,7 @@ cc.Class({
this.getRightRecommendRequest();
return;
}
Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/main_recommend.json", null, null,
Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/fujian_main_recommend.json", null, null,
function (strResponse) {
try {
this._oInit.main_recommend = strResponse;
......@@ -1439,10 +1439,6 @@ cc.Class({
doCurrentFocusTVLinkAction: function (strAction) {
let strTVLink = this._fiCurrentFocus.getTVLink();
//福建测试视频播放功能
if (strTVLink == "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"0\"}}]}") {
strTVLink = "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoDetail\"}}]}";
}
cc.log("tvlink===============" + strTVLink);
// cc.log("tvlink===============" + this._oSceneContext._iPageIndex);
try {
......
......@@ -149,7 +149,7 @@ cc.Class({
//获取节目详情
checkPfbReadyAndInitPage: function () {
var self = this;
Network.ajax("GET", Common.TOPDRAW_API_SERVER + "videoDetail/game_test_detail_list_by_ids.json", null, null,
Network.ajax("GET", Common.TOPDRAW_API_SERVER + "videoDetail/fujian_get_movie_detail.json", null, null,
function (strResponse) {
try {
var oJSONResult = JSON.parse(strResponse);
......@@ -185,8 +185,18 @@ cc.Class({
this.getGatherDetailList(); //获取剧集列表
// this.getPlayURLAndPlay();//先改为从java获取
//将fileCode修改成符合规范的格式
//给String扩展一个replaceAll方法
String.prototype.replaceAll = function (FindText, RepText) {
let regExp = new RegExp(FindText, 'g');
return this.replace(regExp, RepText);
};
if (this._oInit != null) {
this._oInit.fileCode = (this._oInit.fileCode.substring(this._oInit.fileCode.indexOf("_") + 1, this._oInit.fileCode.lastIndexOf("_"))).replaceAll("-", "");
}
cc.log("fileCode| " + this._oInit.fileCode + " | supercid |" + this._oInit.supercid + " | cid | " + this._oInit.cid);
if (cc.sys.isNative) {
jsb.reflection.callStaticMethod("org/cocos2dx/javascript/common/TopdrawSDKWrapper", "getPlayUrl", "(Ljava/lang/String;)V", "getPlayURLAndPlay");
jsb.reflection.callStaticMethod("org/cocos2dx/javascript/common/TopdrawSDKWrapper", "getPlayUrl", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", this._oInit.supercid, this._oInit.cid, "getPlayURLAndPlay");
}
} else {
......@@ -220,7 +230,7 @@ cc.Class({
}
},
getPlayURLAndPlay: function (playUrl, mediaCode) {
getPlayURLAndPlay: function (playUrl) {
try {
cc.log("videoDetail.js -> getPlayURLAndPlay | " + playUrl);
this._ComOperation.initPlayer(64, 56, 564, 317, true, true); //这里采用左右边距对应android坐标 fix jerry
......@@ -228,7 +238,7 @@ cc.Class({
let options = {};
// options.playurl = this._oInit.url;
options.playurl = playUrl;
options.fileCode = mediaCode;
options.fileCode = this._oInit.fileCode;
this._ComOperation.setURL(options); //测试播放地址
} catch (error) {
if (cc.sys.isNative) {
......
......@@ -3,9 +3,12 @@
"count": 1,
"resultSet": [
{
"name": "专注力 (21个亲子游戏)",
"name": "魔法啥拉",
"episode_number": 15,
"current_episode_number": 15,
"fileCode": "file_997b7cb4-573c-4916-b575-4c0bc9476f9b_TS4M1080p",
"supercid": "42dab385e29e4f0f99c3513939815a2c",
"cid": "898abfacb6a34c19b36708ebb43ad044",
"description": "简介:作为人气作品《魔法沙拉》的全新续作,《魔法沙拉2》拥有3个全3个全新的玩法模式:爽快到炸裂的竞速模式,诙谐幽默的娱乐模式3个全以及紧张刺激的挑战模式,都将让您感受到完全不一样......",
"url": "http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4",
"images": {
......
......@@ -64,16 +64,16 @@ public class TopdrawSDKWrapper {
return MelodyApplication.sdk.getUserID();
}
public static void getPlayUrl(final String strJSCallBack) {
public static void getPlayUrl(final String strSupercid, final String strCid, final String strJSCallBack) {
Log.d(TAG, "getPlayUrl start..." + strJSCallBack);
String epgServer = CommonUtils.getServer(_activity) + HTTP_AUTHORIZE;
String token = CommonUtils.getToken(_activity);
String supercid = "42dab385e29e4f0f99c3513939815a2c"; //测试用例 电视剧则使用掐头去尾及"-"的mediaCode,电影或单片使用"-1"
String supercid = strSupercid; //测试用例 电视剧则使用掐头去尾及"-"的mediaCode,电影或单片使用"-1"
String businessType = "1";// 业务类型,1:vod、2:LIVETV。新cp大多是注入点播,此处填1即可
String contentType = "0";// 内容类型,0:视频VOD、1:视频频道、300:节目单。同businessType相似,此处填0即可。
String playType = "1";// 必填,根据demo固定为1,文档未说明该字段
String tid = "-1";// 栏目编号,OTT大屏的cp点播注入不涉及绑定栏目,此处统一填写为-1
String cid = "898abfacb6a34c19b36708ebb43ad044"; //测试用例 电视剧的单集使用掐头去尾及"-"的episodeCode,电影单片使用掐头去尾及"-"的mediaCode
String cid = strCid; //测试用例 电视剧的单集使用掐头去尾及"-"的episodeCode,电影单片使用掐头去尾及"-"的mediaCode
String idflag = "1";// 标识cid和supcid的编号类型,统一传1,标识编号为C2接口的内容code。这个字段必需提供,不提供会导致鉴权失败。
JSONObject mapParams = new JSONObject();
......@@ -103,15 +103,13 @@ public class TopdrawSDKWrapper {
JSONObject joUrl = jaUrls.getJSONObject(0);
if (null != joUrl) {
final String strPlayURL = joUrl.getString("playurl");
// final String mediaCode = joUrl.getString("mediacode");
final String mediaCode = "997b7cb4573c4916b5754c0bc9476f9b";//测试写死
Log.d(TAG, "获取播放链接:" + strPlayURL + " | mediaCode | " + mediaCode);
Log.d(TAG, "获取播放链接:" + strPlayURL);
_activity.runOnGLThread(
new Runnable() {
@Override
public void run() {
Cocos2dxJavascriptJavaBridge.evalString(
"cc.find('Canvas',cc.director.getScene()).getComponent(cc.Topdraw.TVCanvas)." + strJSCallBack + "('" + strPlayURL + "','" + mediaCode + "');"
"cc.find('Canvas',cc.director.getScene()).getComponent(cc.Topdraw.TVCanvas)." + strJSCallBack + "('" + strPlayURL + "');"
);
}
......