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 81 additions and 50 deletions
......@@ -106,7 +106,7 @@ cc.Class({
ORDER_EXCEPTION: '网络异常，请重试',
ORDER_ENTER: '请稍后...',
NEWTV_APPID: '4bf34d0e9acf4aa',
NEWTV_APPID: '8e663b3ce392485',
CONTENT_ID: '2019121018210000000001',
//这个值应该动态获取，每次进入应用或每次发起包月订购（按次不支持退订）时记录下来，否则退订会返回“订购关系不存在”
......
......@@ -220,14 +220,15 @@ cc.Class({
}
},
getPlayURLAndPlay: function (playUrl) {
getPlayURLAndPlay: function (playUrl, mediaCode) {
try {
cc.log("videoDetail.js -> getPlayURLAndPlay | "+playUrl);
cc.log("videoDetail.js -> getPlayURLAndPlay | " + playUrl);
this._ComOperation.initPlayer(64, 56, 564, 317, true, true); //这里采用左右边距对应android坐标 fix jerry
// this._ComOperation.initPlayer(0, 0, Common.SCREEN_WIDTH, Common.SCREEN_HEIGHT, true, true); //测试
let options = {};
// options.playurl = this._oInit.url;
options.playurl = playUrl;
options.fileCode = mediaCode;
this._ComOperation.setURL(options); //测试播放地址
} catch (error) {
if (cc.sys.isNative) {
......
......@@ -24,26 +24,19 @@
****************************************************************************/
package org.cocos2dx.javascript;
import org.cocos2dx.javascript.common.HttpClientUtil;
import org.cocos2dx.javascript.common.OBiPluginLoader;
import org.cocos2dx.javascript.common.PluginLoader;
import org.cocos2dx.javascript.component.NativeLogReporterNewTV;
import org.cocos2dx.javascript.component.NewTVSDK;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
import android.app.AlarmManager;
import android.app.AlertDialog;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.content.Intent;
......@@ -56,16 +49,10 @@ import android.view.View;
import android.view.WindowManager;
import android.webkit.CookieManager;
import android.webkit.JavascriptInterface;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.knowyou_jni.single.SDKUtil;
import com.topdraw.forfun_FJYD.R;
import com.topdraw.sdk.ITopdrawResultListener;
import com.topdraw.sdk.ITopdrawSDK;
......@@ -73,14 +60,10 @@ import com.topdraw.sdk.TopdrawSDK;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
import org.cocos2dx.javascript.component.CocosMediaPlayer;
import org.cocos2dx.javascript.common.CommonUtils;
import org.cocos2dx.javascript.common.MelodyApplication;
import org.cocos2dx.javascript.common.TopdrawSDKWrapper;
import org.json.JSONException;
import org.json.JSONObject;
public class AppActivity extends Cocos2dxActivity {
private static String TAG = "AppActivity";
......@@ -190,7 +173,7 @@ public class AppActivity extends Cocos2dxActivity {
TOPDRAW_APPID = appInfo.metaData.getString("TOPDRAW.APPID");
TOPDRAW_APPSECRET = appInfo.metaData.getString("TOPDRAW.APPSECRET");
TOPDRAW_REFER_PATH = TOPDRAW_PLATFORM_SERVER + "/Platform/Logout";
// TopdrawSDK.init(getApplicationContext(), TOPDRAW_PLATFORM, TOPDRAW_PLATFORM_SERVER, TOPDRAW_APPID, TOPDRAW_APPSECRET, initListener);
TopdrawSDK.init(getApplicationContext(), TOPDRAW_PLATFORM, TOPDRAW_PLATFORM_SERVER, TOPDRAW_APPID, TOPDRAW_APPSECRET, initListener);
//移动埋点
APP_KEY = appInfo.metaData.getString("CMCC.APPKEY");
......@@ -259,16 +242,16 @@ public class AppActivity extends Cocos2dxActivity {
nlp.report(88, "1");
unregisterReceiver(receiver);
SDKWrapper.getInstance().onDestroy();
if (baminSDKInited) { //埋点SDK退出
HashMap<Object, Object> params = new HashMap<>();
params.put("APP_NAME", APP_NAME);
params.put("APP_TYPE", APP_TYPE);
params.put("USER_LOGIN", "0");
params.put("USER_ID", USER_ID);
params.put("USER_ORDER", NativeSystem.isAuthenticated ? "已订购" : "未订购");
// if (baminSDKInited) { //埋点SDK退出--
// HashMap<Object, Object> params = new HashMap<>();
// params.put("APP_NAME", APP_NAME);
// params.put("APP_TYPE", APP_TYPE);
// params.put("USER_LOGIN", "0");
// params.put("USER_ID", USER_ID);
// params.put("USER_ORDER", NativeSystem.isAuthenticated ? "已订购" : "未订购");
// SDKUtil.getInstance().ky_trackCustom(params);
// SDKUtil.getInstance().ky_userSignOut(USER_ID);
}
// }
TopdrawSDK.destory(this, null, new ITopdrawResultListener() {
@Override
public void onResult(int i, String s, Object o) {
......@@ -437,7 +420,7 @@ public class AppActivity extends Cocos2dxActivity {
//局方埋点
try {
SDKUtil.isOpenLog = true;
// Log.d(TAG, "埋点APP_KEY: " + APP_KEY);
Log.d(TAG, "埋点USER_ID: " + USER_ID);
int sdkResult = SDKUtil.getInstance().ky_initWithAppKey(AppActivity.this, APP_KEY, //埋点SDK初始化
getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
Log.d(TAG, "sdkResult..." + sdkResult);
......@@ -454,6 +437,7 @@ public class AppActivity extends Cocos2dxActivity {
// } else {
// NativeSystem.isAuthenticated = false;
// }
//USER_ID = MelodyApplication.sdk.getOssUserID();
if (baminSDKInited) { //埋点SDK登录
HashMap<Object, Object> params = new HashMap<>();
params.put("APP_NAME", APP_NAME);
......@@ -461,8 +445,8 @@ public class AppActivity extends Cocos2dxActivity {
params.put("USER_LOGIN", "1");
params.put("USER_ID", USER_ID);
params.put("USER_ORDER", NativeSystem.isAuthenticated ? "已订购" : "未订购");
// SDKUtil.getInstance().ky_trackCustom(params); //先注释。。。。。
// SDKUtil.getInstance().ky_userSignIn(USER_ID);
SDKUtil.getInstance().ky_trackCustom(params); //先注释。。。。。
SDKUtil.getInstance().ky_userSignIn(USER_ID);
}
// }
// });
......
......@@ -94,19 +94,6 @@ public class TopdrawSDKWrapper {
@Override
public void onSuccess(String json) {
Log.d(TAG, "成功获取播放链接 | " + json);
final String testUrl = "http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4";
_activity.runOnGLThread(
new Runnable() {
@Override
public void run() {
Cocos2dxJavascriptJavaBridge.evalString(
"cc.find('Canvas',cc.director.getScene()).getComponent(cc.Topdraw.TVCanvas)." + strJSCallBack + "('" + testUrl + "');"
);
}
}
);
JSONObject joAuthorizeResult = null;
try {
joAuthorizeResult = new JSONObject(json);
......@@ -115,7 +102,21 @@ public class TopdrawSDKWrapper {
if (null != jaUrls && jaUrls.length() > 0) {
JSONObject joUrl = jaUrls.getJSONObject(0);
if (null != joUrl) {
String strPlayURL = joUrl.getString("playurl");
final String strPlayURL = joUrl.getString("playurl");
// final String mediaCode = joUrl.getString("mediacode");
final String mediaCode = "997b7cb4573c4916b5754c0bc9476f9b";//测试写死
Log.d(TAG, "获取播放链接：" + strPlayURL + " | mediaCode | " + mediaCode);
_activity.runOnGLThread(
new Runnable() {
@Override
public void run() {
Cocos2dxJavascriptJavaBridge.evalString(
"cc.find('Canvas',cc.director.getScene()).getComponent(cc.Topdraw.TVCanvas)." + strJSCallBack + "('" + strPlayURL + "','" + mediaCode + "');"
);
}
}
);
}
}
}
......
......@@ -7,6 +7,9 @@ import android.os.Message;
import android.util.Log;
import android.widget.FrameLayout;
import com.knowyou_jni.single.SDKUtil;
import org.cocos2dx.javascript.AppActivity;
import org.cocos2dx.javascript.component.player.AndroidMediaPlayer;
//import com.topdraw.component.player.NewTVMediaPlayer;
//import com.topdraw.component.player.VitamioMediaPlayer;
......@@ -17,6 +20,7 @@ import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
import java.lang.ref.WeakReference;
import java.lang.reflect.Array;
import java.util.HashMap;
public class CocosMediaPlayer {
......@@ -135,7 +139,7 @@ public class CocosMediaPlayer {
}
public static void jsSetPlayURL(String url) {
Log.d(TAG,"jsSetPlayURL start..."+url);
Log.d(TAG, "jsSetPlayURL start..." + url);
mHandler.obtainMessage(JS_EVENT_CALL_SETPLAYURL, url).sendToTarget();
}
......@@ -144,7 +148,7 @@ public class CocosMediaPlayer {
if (null != mp) {
mp.stop();
mp.reset();
MP_STATE=MP_STATE_STOPPED;
MP_STATE = MP_STATE_STOPPED;
mp.setPlayURL(url);
}
}
......@@ -196,9 +200,27 @@ public class CocosMediaPlayer {
if (time > 0) {
mp.seekTo(time);
}
if (AppActivity.baminSDKInited) {
HashMap<Object, Object> params = new HashMap<>();
params.put("APP_NAME", AppActivity.APP_NAME);
params.put("SONG_ID", "mediaCode");
params.put("SONG_NAME", "mediaName");
params.put("SONG_PROGRESS", "0.0");
SDKUtil.getInstance().ky_playStart(params);
}
} else if (MP_STATE == MP_STATE_PAUSED) {
mp.resume();
MP_STATE = MP_STATE_PLAYING;
if (AppActivity.baminSDKInited) {
HashMap<Object, Object> params = new HashMap<>();
params.put("APP_NAME", AppActivity.APP_NAME);
params.put("SONG_ID", "mediaCode");
params.put("SONG_NAME", "mediaName");
params.put("SONG_PROGRESS", "" + Double.valueOf(100.0 * mp.getCurrentPosition() / mp.getDuration()).intValue() / 100.0);
SDKUtil.getInstance().ky_playResume(params);
}
}
}
}
......@@ -211,6 +233,15 @@ public class CocosMediaPlayer {
if (null != mp && MP_STATE == MP_STATE_PLAYING) {
mp.pause();
MP_STATE = MP_STATE_PAUSED;
if (AppActivity.baminSDKInited) {
HashMap<Object, Object> params = new HashMap<>();
params.put("APP_NAME", AppActivity.APP_NAME);
params.put("SONG_ID", "mediaCode"); //这里的值待获取
params.put("SONG_NAME", "mediaName");
params.put("SONG_PROGRESS", "" + Double.valueOf(100.0 * mp.getCurrentPosition() / mp.getDuration()).intValue() / 100.0);
SDKUtil.getInstance().ky_playPause(params);
}
}
}
......@@ -378,6 +409,16 @@ public class CocosMediaPlayer {
private void onCompletion(final Object obj) {
MP_STATE = MP_STATE_STOPPED;
if (AppActivity.baminSDKInited) {
HashMap<Object, Object> params = new HashMap<>();
params.put("APP_NAME", AppActivity.APP_NAME);
params.put("SONG_ID", "mediaCode");
params.put("SONG_NAME", "mediaName");
params.put("SONG_PROGRESS", "1.0");
SDKUtil.getInstance().ky_playEnd(params);
}
runOnGlThread(new Runnable() {
@Override
public void run() {
......
......@@ -50,6 +50,7 @@ public class NewTVMediaPlayer implements IMediaPlayer {
@Override
public void setInfo(String info) {
try {
Log.d("NewTVMediaPlayer", "setInfo..." + info);
jsonInfo = new JSONObject(info);
} catch (JSONException e) {
e.printStackTrace();
......@@ -58,17 +59,20 @@ public class NewTVMediaPlayer implements IMediaPlayer {
@Override
public void prepare() {
Log.d("NewTVMediaPlayer", "prepare...");
handler.obtainMessage(CocosMediaPlayer.MP_EVENT_ON_PREPARED).sendToTarget();
}
@Override
public void prepareAsync() {
Log.d("NewTVMediaPlayer", "prepareAsync...");
handler.obtainMessage(CocosMediaPlayer.MP_EVENT_ON_PREPARED).sendToTarget();
}
@Override
public void start() {
try {
Log.d("NewTVMediaPlayer", "start..." + jsonInfo.getString("fileCode"));
info.setApp_id(jsonInfo.getString("appId"));
info.setCheckType("program");
info.setPlayUrl(jsonInfo.getString("playURL"));
......@@ -100,7 +104,7 @@ public class NewTVMediaPlayer implements IMediaPlayer {
public void seekTo(int time) {
if (null != mp) {
// if (time > 0) { //这里可能是造成快进快退进度条闪跳回几秒的原因 fix jerry
mp.seekTo(time);
mp.seekTo(time);
// }
}
}
......@@ -123,7 +127,7 @@ public class NewTVMediaPlayer implements IMediaPlayer {
@Override
public void stop() {
if (null != mp) {
Log.d("NewTVMediaPlayer","stop...");
Log.d("NewTVMediaPlayer", "stop...");
mp.release();
mp.quit();
mp = null;
......