Skip to content

apk_product / ForFun

Go to a project
Toggle navigation
Toggle navigation pinning
Commit ec058611 ec058611c2d4a905c31f377a18b8942b167b7fe1 by 金学艇
Options

修正了未来播放器的APPID（之前日志是无审计记录），终于能播放了

1 parent 10304d19
Inline Side-by-side
Showing 6 changed files with 78 additions and 47 deletions
...@@ -106,7 +106,7 @@ cc.Class({ ...@@ -106,7 +106,7 @@ cc.Class({
106 ORDER_EXCEPTION: '网络异常，请重试', 106 ORDER_EXCEPTION: '网络异常，请重试',
107 ORDER_ENTER: '请稍后...', 107 ORDER_ENTER: '请稍后...',
108 108
109 NEWTV_APPID: '4bf34d0e9acf4aa', 109 NEWTV_APPID: '8e663b3ce392485',
110 CONTENT_ID: '2019121018210000000001', 110 CONTENT_ID: '2019121018210000000001',
111 111
112 //这个值应该动态获取，每次进入应用或每次发起包月订购（按次不支持退订）时记录下来，否则退订会返回“订购关系不存在” 112 //这个值应该动态获取，每次进入应用或每次发起包月订购（按次不支持退订）时记录下来，否则退订会返回“订购关系不存在”
......
...@@ -220,14 +220,15 @@ cc.Class({ ...@@ -220,14 +220,15 @@ cc.Class({
220 } 220 }
221 }, 221 },
222 222
223 getPlayURLAndPlay: function (playUrl) { 223 getPlayURLAndPlay: function (playUrl, mediaCode) {
224 try { 224 try {
225 cc.log("videoDetail.js -> getPlayURLAndPlay | "+playUrl); 225 cc.log("videoDetail.js -> getPlayURLAndPlay | " + playUrl);
226 this._ComOperation.initPlayer(64, 56, 564, 317, true, true); //这里采用左右边距对应android坐标 fix jerry 226 this._ComOperation.initPlayer(64, 56, 564, 317, true, true); //这里采用左右边距对应android坐标 fix jerry
227 // this._ComOperation.initPlayer(0, 0, Common.SCREEN_WIDTH, Common.SCREEN_HEIGHT, true, true); //测试 227 // this._ComOperation.initPlayer(0, 0, Common.SCREEN_WIDTH, Common.SCREEN_HEIGHT, true, true); //测试
228 let options = {}; 228 let options = {};
229 // options.playurl = this._oInit.url; 229 // options.playurl = this._oInit.url;
230 options.playurl = playUrl; 230 options.playurl = playUrl;
231 options.fileCode = mediaCode;
231 this._ComOperation.setURL(options); //测试播放地址 232 this._ComOperation.setURL(options); //测试播放地址
232 } catch (error) { 233 } catch (error) {
233 if (cc.sys.isNative) { 234 if (cc.sys.isNative) {
......
...@@ -24,26 +24,19 @@ ...@@ -24,26 +24,19 @@
24 ****************************************************************************/ 24 ****************************************************************************/
25 package org.cocos2dx.javascript; 25 package org.cocos2dx.javascript;
26 26
27 import org.cocos2dx.javascript.common.HttpClientUtil;
28 import org.cocos2dx.javascript.common.OBiPluginLoader; 27 import org.cocos2dx.javascript.common.OBiPluginLoader;
29 import org.cocos2dx.javascript.common.PluginLoader; 28 import org.cocos2dx.javascript.common.PluginLoader;
30 import org.cocos2dx.javascript.component.NativeLogReporterNewTV; 29 import org.cocos2dx.javascript.component.NativeLogReporterNewTV;
31 import org.cocos2dx.javascript.component.NewTVSDK; 30 import org.cocos2dx.javascript.component.NewTVSDK;
32 import org.cocos2dx.lib.Cocos2dxActivity; 31 import org.cocos2dx.lib.Cocos2dxActivity;
33 import org.cocos2dx.lib.Cocos2dxGLSurfaceView; 32 import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
34
35 import android.app.AlarmManager;
36 import android.app.AlertDialog; 33 import android.app.AlertDialog;
37 import android.app.PendingIntent;
38 import android.content.BroadcastReceiver; 34 import android.content.BroadcastReceiver;
39 import android.content.Context; 35 import android.content.Context;
40 import android.content.DialogInterface; 36 import android.content.DialogInterface;
41 import android.content.IntentFilter; 37 import android.content.IntentFilter;
42 import android.content.pm.ApplicationInfo; 38 import android.content.pm.ApplicationInfo;
43 import android.content.pm.PackageInfo;
44 import android.content.pm.PackageManager; 39 import android.content.pm.PackageManager;
45 import android.database.Cursor;
46 import android.net.Uri;
47 import android.os.Bundle; 40 import android.os.Bundle;
48 41
49 import android.content.Intent; 42 import android.content.Intent;
...@@ -56,16 +49,10 @@ import android.view.View; ...@@ -56,16 +49,10 @@ import android.view.View;
56 import android.view.WindowManager; 49 import android.view.WindowManager;
57 import android.webkit.CookieManager; 50 import android.webkit.CookieManager;
58 import android.webkit.JavascriptInterface; 51 import android.webkit.JavascriptInterface;
59 import android.webkit.WebView;
60 import android.webkit.WebViewClient;
61 import android.widget.FrameLayout;
62 import android.widget.ImageView; 52 import android.widget.ImageView;
63 import android.widget.RelativeLayout; 53 import android.widget.RelativeLayout;
64 import android.widget.TextView; 54 import android.widget.TextView;
65 import android.widget.Toast;
66
67 import com.knowyou_jni.single.SDKUtil; 55 import com.knowyou_jni.single.SDKUtil;
68
69 import com.topdraw.forfun_FJYD.R; 56 import com.topdraw.forfun_FJYD.R;
70 import com.topdraw.sdk.ITopdrawResultListener; 57 import com.topdraw.sdk.ITopdrawResultListener;
71 import com.topdraw.sdk.ITopdrawSDK; 58 import com.topdraw.sdk.ITopdrawSDK;
...@@ -73,14 +60,10 @@ import com.topdraw.sdk.TopdrawSDK; ...@@ -73,14 +60,10 @@ import com.topdraw.sdk.TopdrawSDK;
73 60
74 import java.net.URLEncoder; 61 import java.net.URLEncoder;
75 import java.util.HashMap; 62 import java.util.HashMap;
76 import java.util.Map;
77
78 import org.cocos2dx.javascript.component.CocosMediaPlayer; 63 import org.cocos2dx.javascript.component.CocosMediaPlayer;
79 import org.cocos2dx.javascript.common.CommonUtils; 64 import org.cocos2dx.javascript.common.CommonUtils;
80 import org.cocos2dx.javascript.common.MelodyApplication; 65 import org.cocos2dx.javascript.common.MelodyApplication;
81 import org.cocos2dx.javascript.common.TopdrawSDKWrapper; 66 import org.cocos2dx.javascript.common.TopdrawSDKWrapper;
82 import org.json.JSONException;
83 import org.json.JSONObject;
84 67
85 public class AppActivity extends Cocos2dxActivity { 68 public class AppActivity extends Cocos2dxActivity {
86 private static String TAG = "AppActivity"; 69 private static String TAG = "AppActivity";
...@@ -190,7 +173,7 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -190,7 +173,7 @@ public class AppActivity extends Cocos2dxActivity {
190 TOPDRAW_APPID = appInfo.metaData.getString("TOPDRAW.APPID"); 173 TOPDRAW_APPID = appInfo.metaData.getString("TOPDRAW.APPID");
191 TOPDRAW_APPSECRET = appInfo.metaData.getString("TOPDRAW.APPSECRET"); 174 TOPDRAW_APPSECRET = appInfo.metaData.getString("TOPDRAW.APPSECRET");
192 TOPDRAW_REFER_PATH = TOPDRAW_PLATFORM_SERVER + "/Platform/Logout"; 175 TOPDRAW_REFER_PATH = TOPDRAW_PLATFORM_SERVER + "/Platform/Logout";
193 // TopdrawSDK.init(getApplicationContext(), TOPDRAW_PLATFORM, TOPDRAW_PLATFORM_SERVER, TOPDRAW_APPID, TOPDRAW_APPSECRET, initListener); 176 TopdrawSDK.init(getApplicationContext(), TOPDRAW_PLATFORM, TOPDRAW_PLATFORM_SERVER, TOPDRAW_APPID, TOPDRAW_APPSECRET, initListener);
194 177
195 //移动埋点 178 //移动埋点
196 APP_KEY = appInfo.metaData.getString("CMCC.APPKEY"); 179 APP_KEY = appInfo.metaData.getString("CMCC.APPKEY");
...@@ -259,16 +242,16 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -259,16 +242,16 @@ public class AppActivity extends Cocos2dxActivity {
259 nlp.report(88, "1"); 242 nlp.report(88, "1");
260 unregisterReceiver(receiver); 243 unregisterReceiver(receiver);
261 SDKWrapper.getInstance().onDestroy(); 244 SDKWrapper.getInstance().onDestroy();
262 if (baminSDKInited) { //埋点SDK退出 245 // if (baminSDKInited) { //埋点SDK退出--
263 HashMap<Object, Object> params = new HashMap<>(); 246 // HashMap<Object, Object> params = new HashMap<>();
264 params.put("APP_NAME", APP_NAME); 247 // params.put("APP_NAME", APP_NAME);
265 params.put("APP_TYPE", APP_TYPE); 248 // params.put("APP_TYPE", APP_TYPE);
266 params.put("USER_LOGIN", "0"); 249 // params.put("USER_LOGIN", "0");
267 params.put("USER_ID", USER_ID); 250 // params.put("USER_ID", USER_ID);
268 params.put("USER_ORDER", NativeSystem.isAuthenticated ? "已订购" : "未订购"); 251 // params.put("USER_ORDER", NativeSystem.isAuthenticated ? "已订购" : "未订购");
269 // SDKUtil.getInstance().ky_trackCustom(params); 252 // SDKUtil.getInstance().ky_trackCustom(params);
270 // SDKUtil.getInstance().ky_userSignOut(USER_ID); 253 // SDKUtil.getInstance().ky_userSignOut(USER_ID);
271 } 254 // }
272 TopdrawSDK.destory(this, null, new ITopdrawResultListener() { 255 TopdrawSDK.destory(this, null, new ITopdrawResultListener() {
273 @Override 256 @Override
274 public void onResult(int i, String s, Object o) { 257 public void onResult(int i, String s, Object o) {
...@@ -437,7 +420,7 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -437,7 +420,7 @@ public class AppActivity extends Cocos2dxActivity {
437 //局方埋点 420 //局方埋点
438 try { 421 try {
439 SDKUtil.isOpenLog = true; 422 SDKUtil.isOpenLog = true;
440 // Log.d(TAG, "埋点APP_KEY: " + APP_KEY); 423 Log.d(TAG, "埋点USER_ID: " + USER_ID);
441 int sdkResult = SDKUtil.getInstance().ky_initWithAppKey(AppActivity.this, APP_KEY, //埋点SDK初始化 424 int sdkResult = SDKUtil.getInstance().ky_initWithAppKey(AppActivity.this, APP_KEY, //埋点SDK初始化
442 getPackageManager().getPackageInfo(getPackageName(), 0).versionName); 425 getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
443 Log.d(TAG, "sdkResult..." + sdkResult); 426 Log.d(TAG, "sdkResult..." + sdkResult);
...@@ -454,6 +437,7 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -454,6 +437,7 @@ public class AppActivity extends Cocos2dxActivity {
454 // } else { 437 // } else {
455 // NativeSystem.isAuthenticated = false; 438 // NativeSystem.isAuthenticated = false;
456 // } 439 // }
440 //USER_ID = MelodyApplication.sdk.getOssUserID();
457 if (baminSDKInited) { //埋点SDK登录 441 if (baminSDKInited) { //埋点SDK登录
458 HashMap<Object, Object> params = new HashMap<>(); 442 HashMap<Object, Object> params = new HashMap<>();
459 params.put("APP_NAME", APP_NAME); 443 params.put("APP_NAME", APP_NAME);
...@@ -461,8 +445,8 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -461,8 +445,8 @@ public class AppActivity extends Cocos2dxActivity {
461 params.put("USER_LOGIN", "1"); 445 params.put("USER_LOGIN", "1");
462 params.put("USER_ID", USER_ID); 446 params.put("USER_ID", USER_ID);
463 params.put("USER_ORDER", NativeSystem.isAuthenticated ? "已订购" : "未订购"); 447 params.put("USER_ORDER", NativeSystem.isAuthenticated ? "已订购" : "未订购");
464 // SDKUtil.getInstance().ky_trackCustom(params); //先注释。。。。。 448 SDKUtil.getInstance().ky_trackCustom(params); //先注释。。。。。
465 // SDKUtil.getInstance().ky_userSignIn(USER_ID); 449 SDKUtil.getInstance().ky_userSignIn(USER_ID);
466 } 450 }
467 // } 451 // }
468 // }); 452 // });
......
...@@ -94,28 +94,29 @@ public class TopdrawSDKWrapper { ...@@ -94,28 +94,29 @@ public class TopdrawSDKWrapper {
94 @Override 94 @Override
95 public void onSuccess(String json) { 95 public void onSuccess(String json) {
96 Log.d(TAG, "成功获取播放链接 | " + json); 96 Log.d(TAG, "成功获取播放链接 | " + json);
97 final String testUrl = "http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4"; 97 JSONObject joAuthorizeResult = null;
98 try {
99 joAuthorizeResult = new JSONObject(json);
100 if (null != joAuthorizeResult && "0".equals(joAuthorizeResult.getString("returncode"))) {
101 JSONArray jaUrls = joAuthorizeResult.getJSONArray("urls");
102 if (null != jaUrls && jaUrls.length() > 0) {
103 JSONObject joUrl = jaUrls.getJSONObject(0);
104 if (null != joUrl) {
105 final String strPlayURL = joUrl.getString("playurl");
106 // final String mediaCode = joUrl.getString("mediacode");
107 final String mediaCode = "997b7cb4573c4916b5754c0bc9476f9b";//测试写死
108 Log.d(TAG, "获取播放链接：" + strPlayURL + " | mediaCode | " + mediaCode);
98 _activity.runOnGLThread( 109 _activity.runOnGLThread(
99 new Runnable() { 110 new Runnable() {
100 @Override 111 @Override
101 public void run() { 112 public void run() {
102 Cocos2dxJavascriptJavaBridge.evalString( 113 Cocos2dxJavascriptJavaBridge.evalString(
103 "cc.find('Canvas',cc.director.getScene()).getComponent(cc.Topdraw.TVCanvas)." + strJSCallBack + "('" + testUrl + "');" 114 "cc.find('Canvas',cc.director.getScene()).getComponent(cc.Topdraw.TVCanvas)." + strJSCallBack + "('" + strPlayURL + "','" + mediaCode + "');"
104 ); 115 );
105 } 116 }
106 117
107 } 118 }
108 ); 119 );
109
110 JSONObject joAuthorizeResult = null;
111 try {
112 joAuthorizeResult = new JSONObject(json);
113 if (null != joAuthorizeResult && "0".equals(joAuthorizeResult.getString("returncode"))) {
114 JSONArray jaUrls = joAuthorizeResult.getJSONArray("urls");
115 if (null != jaUrls && jaUrls.length() > 0) {
116 JSONObject joUrl = jaUrls.getJSONObject(0);
117 if (null != joUrl) {
118 String strPlayURL = joUrl.getString("playurl");
119 } 120 }
120 } 121 }
121 } 122 }
......
...@@ -7,6 +7,9 @@ import android.os.Message; ...@@ -7,6 +7,9 @@ import android.os.Message;
7 import android.util.Log; 7 import android.util.Log;
8 import android.widget.FrameLayout; 8 import android.widget.FrameLayout;
9 9
10 import com.knowyou_jni.single.SDKUtil;
11
12 import org.cocos2dx.javascript.AppActivity;
10 import org.cocos2dx.javascript.component.player.AndroidMediaPlayer; 13 import org.cocos2dx.javascript.component.player.AndroidMediaPlayer;
11 //import com.topdraw.component.player.NewTVMediaPlayer; 14 //import com.topdraw.component.player.NewTVMediaPlayer;
12 //import com.topdraw.component.player.VitamioMediaPlayer; 15 //import com.topdraw.component.player.VitamioMediaPlayer;
...@@ -17,6 +20,7 @@ import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge; ...@@ -17,6 +20,7 @@ import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
17 20
18 import java.lang.ref.WeakReference; 21 import java.lang.ref.WeakReference;
19 import java.lang.reflect.Array; 22 import java.lang.reflect.Array;
23 import java.util.HashMap;
20 24
21 public class CocosMediaPlayer { 25 public class CocosMediaPlayer {
22 26
...@@ -135,7 +139,7 @@ public class CocosMediaPlayer { ...@@ -135,7 +139,7 @@ public class CocosMediaPlayer {
135 } 139 }
136 140
137 public static void jsSetPlayURL(String url) { 141 public static void jsSetPlayURL(String url) {
138 Log.d(TAG,"jsSetPlayURL start..."+url); 142 Log.d(TAG, "jsSetPlayURL start..." + url);
139 mHandler.obtainMessage(JS_EVENT_CALL_SETPLAYURL, url).sendToTarget(); 143 mHandler.obtainMessage(JS_EVENT_CALL_SETPLAYURL, url).sendToTarget();
140 } 144 }
141 145
...@@ -144,7 +148,7 @@ public class CocosMediaPlayer { ...@@ -144,7 +148,7 @@ public class CocosMediaPlayer {
144 if (null != mp) { 148 if (null != mp) {
145 mp.stop(); 149 mp.stop();
146 mp.reset(); 150 mp.reset();
147 MP_STATE=MP_STATE_STOPPED; 151 MP_STATE = MP_STATE_STOPPED;
148 mp.setPlayURL(url); 152 mp.setPlayURL(url);
149 } 153 }
150 } 154 }
...@@ -196,9 +200,27 @@ public class CocosMediaPlayer { ...@@ -196,9 +200,27 @@ public class CocosMediaPlayer {
196 if (time > 0) { 200 if (time > 0) {
197 mp.seekTo(time); 201 mp.seekTo(time);
198 } 202 }
203
204 if (AppActivity.baminSDKInited) {
205 HashMap<Object, Object> params = new HashMap<>();
206 params.put("APP_NAME", AppActivity.APP_NAME);
207 params.put("SONG_ID", "mediaCode");
208 params.put("SONG_NAME", "mediaName");
209 params.put("SONG_PROGRESS", "0.0");
210 SDKUtil.getInstance().ky_playStart(params);
211 }
199 } else if (MP_STATE == MP_STATE_PAUSED) { 212 } else if (MP_STATE == MP_STATE_PAUSED) {
200 mp.resume(); 213 mp.resume();
201 MP_STATE = MP_STATE_PLAYING; 214 MP_STATE = MP_STATE_PLAYING;
215
216 if (AppActivity.baminSDKInited) {
217 HashMap<Object, Object> params = new HashMap<>();
218 params.put("APP_NAME", AppActivity.APP_NAME);
219 params.put("SONG_ID", "mediaCode");
220 params.put("SONG_NAME", "mediaName");
221 params.put("SONG_PROGRESS", "" + Double.valueOf(100.0 * mp.getCurrentPosition() / mp.getDuration()).intValue() / 100.0);
222 SDKUtil.getInstance().ky_playResume(params);
223 }
202 } 224 }
203 } 225 }
204 } 226 }
...@@ -211,6 +233,15 @@ public class CocosMediaPlayer { ...@@ -211,6 +233,15 @@ public class CocosMediaPlayer {
211 if (null != mp && MP_STATE == MP_STATE_PLAYING) { 233 if (null != mp && MP_STATE == MP_STATE_PLAYING) {
212 mp.pause(); 234 mp.pause();
213 MP_STATE = MP_STATE_PAUSED; 235 MP_STATE = MP_STATE_PAUSED;
236
237 if (AppActivity.baminSDKInited) {
238 HashMap<Object, Object> params = new HashMap<>();
239 params.put("APP_NAME", AppActivity.APP_NAME);
240 params.put("SONG_ID", "mediaCode"); //这里的值待获取
241 params.put("SONG_NAME", "mediaName");
242 params.put("SONG_PROGRESS", "" + Double.valueOf(100.0 * mp.getCurrentPosition() / mp.getDuration()).intValue() / 100.0);
243 SDKUtil.getInstance().ky_playPause(params);
244 }
214 } 245 }
215 } 246 }
216 247
...@@ -378,6 +409,16 @@ public class CocosMediaPlayer { ...@@ -378,6 +409,16 @@ public class CocosMediaPlayer {
378 409
379 private void onCompletion(final Object obj) { 410 private void onCompletion(final Object obj) {
380 MP_STATE = MP_STATE_STOPPED; 411 MP_STATE = MP_STATE_STOPPED;
412
413 if (AppActivity.baminSDKInited) {
414 HashMap<Object, Object> params = new HashMap<>();
415 params.put("APP_NAME", AppActivity.APP_NAME);
416 params.put("SONG_ID", "mediaCode");
417 params.put("SONG_NAME", "mediaName");
418 params.put("SONG_PROGRESS", "1.0");
419 SDKUtil.getInstance().ky_playEnd(params);
420 }
421
381 runOnGlThread(new Runnable() { 422 runOnGlThread(new Runnable() {
382 @Override 423 @Override
383 public void run() { 424 public void run() {
......
...@@ -50,6 +50,7 @@ public class NewTVMediaPlayer implements IMediaPlayer { ...@@ -50,6 +50,7 @@ public class NewTVMediaPlayer implements IMediaPlayer {
50 @Override 50 @Override
51 public void setInfo(String info) { 51 public void setInfo(String info) {
52 try { 52 try {
53 Log.d("NewTVMediaPlayer", "setInfo..." + info);
53 jsonInfo = new JSONObject(info); 54 jsonInfo = new JSONObject(info);
54 } catch (JSONException e) { 55 } catch (JSONException e) {
55 e.printStackTrace(); 56 e.printStackTrace();
...@@ -58,17 +59,20 @@ public class NewTVMediaPlayer implements IMediaPlayer { ...@@ -58,17 +59,20 @@ public class NewTVMediaPlayer implements IMediaPlayer {
58 59
59 @Override 60 @Override
60 public void prepare() { 61 public void prepare() {
62 Log.d("NewTVMediaPlayer", "prepare...");
61 handler.obtainMessage(CocosMediaPlayer.MP_EVENT_ON_PREPARED).sendToTarget(); 63 handler.obtainMessage(CocosMediaPlayer.MP_EVENT_ON_PREPARED).sendToTarget();
62 } 64 }
63 65
64 @Override 66 @Override
65 public void prepareAsync() { 67 public void prepareAsync() {
68 Log.d("NewTVMediaPlayer", "prepareAsync...");
66 handler.obtainMessage(CocosMediaPlayer.MP_EVENT_ON_PREPARED).sendToTarget(); 69 handler.obtainMessage(CocosMediaPlayer.MP_EVENT_ON_PREPARED).sendToTarget();
67 } 70 }
68 71
69 @Override 72 @Override
70 public void start() { 73 public void start() {
71 try { 74 try {
75 Log.d("NewTVMediaPlayer", "start..." + jsonInfo.getString("fileCode"));
72 info.setApp_id(jsonInfo.getString("appId")); 76 info.setApp_id(jsonInfo.getString("appId"));
73 info.setCheckType("program"); 77 info.setCheckType("program");
74 info.setPlayUrl(jsonInfo.getString("playURL")); 78 info.setPlayUrl(jsonInfo.getString("playURL"));
...@@ -123,7 +127,7 @@ public class NewTVMediaPlayer implements IMediaPlayer { ...@@ -123,7 +127,7 @@ public class NewTVMediaPlayer implements IMediaPlayer {
123 @Override 127 @Override
124 public void stop() { 128 public void stop() {
125 if (null != mp) { 129 if (null != mp) {
126 Log.d("NewTVMediaPlayer","stop..."); 130 Log.d("NewTVMediaPlayer", "stop...");
127 mp.release(); 131 mp.release();
128 mp.quit(); 132 mp.quit();
129 mp = null; 133 mp = null;
......