Commit 1a20c129 1a20c1299984ea0ccfbe6cd5045ea778b6b8fd6b by 金学艇

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

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