Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
apk_product
/
ForFun
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Commit
4a8de896
...
4a8de896ff5021067c9d2dc1f103e03816bbe560
authored
2020-04-16 20:46:21 +0800
by
金学艇
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
注释打印日志的方法和allowbackup风险,解决安全漏洞审查
1 parent
676bd9de
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
83 additions
and
89 deletions
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/CommonUtils.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/HttpClientUtil.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/MelodyApplication.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/OBiPluginLoader.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/PluginLoader.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/TopdrawSDKWrapper.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/CocosMediaPlayer.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/NativeLogReporterNewTV.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/NewTVSDK.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/player/AndroidMediaPlayer.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/player/NewTVMediaPlayer.java
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml
View file @
4a8de89
...
...
@@ -31,7 +31,7 @@
<application
android:name=
"org.cocos2dx.javascript.common.MelodyApplication"
android:allowBackup=
"
tru
e"
android:allowBackup=
"
fals
e"
android:icon=
"@mipmap/icon"
android:label=
"@string/app_name"
>
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java
View file @
4a8de89
...
...
@@ -44,7 +44,6 @@ import android.content.Intent;
import
android.content.res.Configuration
;
import
android.os.Handler
;
import
android.provider.Settings
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.WindowManager
;
...
...
@@ -258,7 +257,7 @@ public class AppActivity extends Cocos2dxActivity {
@Override
protected
void
onStart
()
{
Log
.
d
(
"AppActivity"
,
"onStart()...."
);
//
Log.d("AppActivity", "onStart()....");
SDKWrapper
.
getInstance
().
onStart
();
super
.
onStart
();
}
...
...
@@ -273,12 +272,12 @@ public class AppActivity extends Cocos2dxActivity {
// 当资源加载好了之后要删除之前创建的imageView
// 否则一直会在界面上显示的;-)
public
static
void
removeLaunchImage
()
{
Log
.
i
(
"test loading"
,
"removeLaunchImage"
);
//
Log.i("test loading", "removeLaunchImage");
mUIHandler
.
post
(
new
Runnable
()
{
@Override
public
void
run
()
{
if
(
img
!=
null
)
{
Log
.
i
(
"test loading"
,
"removeLaunchImage222"
);
//
Log.i("test loading", "removeLaunchImage222");
img
.
setVisibility
(
View
.
GONE
);
}
}
...
...
@@ -299,27 +298,27 @@ public class AppActivity extends Cocos2dxActivity {
//打出场景日志 Info
public
static
void
logInSceneI
(
String
strLog
)
{
Log
.
i
(
"logInSceneI"
,
strLog
);
//
Log.i("logInSceneI", strLog);
}
//打出场景日志 Warn
public
static
void
logInSceneW
(
String
strLog
)
{
Log
.
w
(
"logInSceneW"
,
strLog
);
//
Log.w("logInSceneW", strLog);
}
//打出场景日志 Error
public
static
void
logInSceneE
(
String
strLog
)
{
Log
.
e
(
"logInSceneE"
,
strLog
);
//
Log.e("logInSceneE", strLog);
}
private
ITopdrawResultListener
initListener
=
new
ITopdrawResultListener
()
{
@Override
public
void
onResult
(
int
result
,
String
msg
,
Object
obj
)
{
Log
.
d
(
TAG
,
"onResult "
+
result
+
" "
+
msg
+
" "
+
obj
);
//-1020 init topdraw sdk error null
//
Log.d(TAG, "onResult " + result + " " + msg + " " + obj);//-1020 init topdraw sdk error null
if
(
0
==
result
)
{
MelodyApplication
.
sdk
=
(
ITopdrawSDK
)
obj
;
USER_ID
=
MelodyApplication
.
sdk
.
getOssUserID
();
Log
.
d
(
TAG
,
"USER_ID..."
+
MelodyApplication
.
sdk
.
getOssUserID
());
//15280011369
//
Log.d(TAG, "USER_ID..." + MelodyApplication.sdk.getOssUserID());//15280011369
CookieManager
.
getInstance
().
setCookie
(
TOPDRAW_PLATFORM_SERVER
,
"appId="
+
TOPDRAW_APPID
);
CookieManager
.
getInstance
().
setCookie
(
TOPDRAW_PLATFORM_SERVER
,
"userId="
+
MelodyApplication
.
sdk
.
getUserID
());
...
...
@@ -338,12 +337,12 @@ public class AppActivity extends Cocos2dxActivity {
//局方埋点
try
{
SDKUtil
.
isOpenLog
=
true
;
Log
.
d
(
TAG
,
"埋点USER_ID: "
+
USER_ID
);
//
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
);
//
Log.d(TAG, "sdkResult..." + sdkResult);
baminSDKInited
=
(
sdkResult
==
0
);
Log
.
d
(
TAG
,
"埋点数据:"
+
baminSDKInited
);
//
Log.d(TAG, "埋点数据:" + baminSDKInited);
// Map<String, Object> params = new HashMap<>();
// params.put("appId", TOPDRAW_APPID);
// params.put("userId", MelodyApplication.sdk.getUserID());
...
...
@@ -396,7 +395,7 @@ public class AppActivity extends Cocos2dxActivity {
@Override
protected
void
onPause
()
{
Log
.
d
(
"AppActivity"
,
"onPause()...."
);
//
Log.d("AppActivity", "onPause()....");
// mRLSingleColor.setVisibility(View.VISIBLE); //放到启动游戏时显示
// setTheme(android.R.style.Theme_NoDisplay);
super
.
onPause
();
...
...
@@ -405,14 +404,14 @@ public class AppActivity extends Cocos2dxActivity {
@Override
protected
void
onStop
()
{
Log
.
d
(
"AppActivity"
,
"onStop()...."
);
//
Log.d("AppActivity", "onStop()....");
super
.
onStop
();
SDKWrapper
.
getInstance
().
onStop
();
}
@Override
protected
void
onDestroy
()
{
Log
.
d
(
"AppActivity"
,
"onDestroy()...."
);
//
Log.d("AppActivity", "onDestroy()....");
unregisterReceiver
(
receiver
);
super
.
onDestroy
();
SDKWrapper
.
getInstance
().
onDestroy
();
...
...
@@ -420,7 +419,7 @@ public class AppActivity extends Cocos2dxActivity {
@Override
protected
void
onResume
()
{
Log
.
d
(
"AppActivity"
,
"onResume()...."
);
//
Log.d("AppActivity", "onResume()....");
super
.
onResume
();
SDKWrapper
.
getInstance
().
onResume
();
mRLSingleColor
.
setVisibility
(
View
.
GONE
);
...
...
@@ -429,7 +428,7 @@ public class AppActivity extends Cocos2dxActivity {
//退出游戏发送探针
if
(
gameStart
&&
mGameName
!=
null
)
{
Log
.
d
(
TAG
,
"onResume->退出游戏| "
+
mGameName
);
//
Log.d(TAG, "onResume->退出游戏| " + mGameName);
HashMap
<
Object
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"APP_NAME"
,
APP_NAME
);
params
.
put
(
"GAME_ID"
,
""
);
//game_id暂时没有值
...
...
@@ -440,7 +439,7 @@ public class AppActivity extends Cocos2dxActivity {
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
Log
.
d
(
TAG
,
"onResume->发送探针"
);
//
Log.d(TAG, "onResume->发送探针");
runOnGLThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
...
...
@@ -460,7 +459,7 @@ public class AppActivity extends Cocos2dxActivity {
* @param gameName
*/
public
static
void
onKYSendData
(
String
gameName
)
{
Log
.
d
(
TAG
,
"onStartGame->启动游戏| "
+
gameName
);
//
Log.d(TAG, "onStartGame->启动游戏| " + gameName);
gameStart
=
true
;
mGameName
=
gameName
;
HashMap
<
Object
,
Object
>
params
=
new
HashMap
<>();
...
...
@@ -471,7 +470,7 @@ public class AppActivity extends Cocos2dxActivity {
}
public
static
void
onExitApp
()
{
Log
.
d
(
TAG
,
"onExitApp..."
);
//
Log.d(TAG, "onExitApp...");
//未来SDK退出
NativeLogReporterNewTV
nlp
=
NativeLogReporterNewTV
.
getInstance
(
getContext
(),
null
);
nlp
.
report
(
88
,
"1"
);
...
...
@@ -488,7 +487,7 @@ public class AppActivity extends Cocos2dxActivity {
TopdrawSDK
.
destory
(
getContext
(),
null
,
new
ITopdrawResultListener
()
{
@Override
public
void
onResult
(
int
i
,
String
s
,
Object
o
)
{
Log
.
d
(
TAG
,
"destory "
+
i
+
" "
+
s
);
//
Log.d(TAG, "destory " + i + " " + s);
try
{
if
(
baminSDKInited
)
{
SDKUtil
.
getInstance
().
ky_quit
();
//这里考虑延迟几秒销毁,否则无法触发
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/CommonUtils.java
View file @
4a8de89
...
...
@@ -133,7 +133,7 @@ public class CommonUtils {
//检查网络
public
static
void
checkNetwork
(
final
Context
context
)
{
Log
.
d
(
TAG
,
"网络链接:"
+
CommonUtils
.
isNetworkAvalible
(
context
));
//
Log.d(TAG, "网络链接:" + CommonUtils.isNetworkAvalible(context));
if
(!
CommonUtils
.
isNetworkAvalible
(
context
))
{
TextView
msg
=
new
TextView
(
context
);
msg
.
setText
(
" 当前未连接网络,请设置网络后登陆!"
);
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/HttpClientUtil.java
View file @
4a8de89
...
...
@@ -73,7 +73,7 @@ public class HttpClientUtil {
baos
.
write
(
bytes
,
0
,
readLen
);
}
String
result
=
baos
.
toString
();
Log
.
i
(
TAG
,
" result:"
+
result
);
//
Log.i(TAG, " result:" + result);
message
=
result
;
isSuccess
=
true
;
...
...
@@ -156,7 +156,7 @@ public class HttpClientUtil {
baos
.
write
(
bytes
,
0
,
readLen
);
}
String
backStr
=
baos
.
toString
();
Log
.
i
(
TAG
,
"请求成功 backStr:"
+
backStr
);
//
Log.i(TAG, "请求成功 backStr:" + backStr);
message
=
backStr
;
isSuccess
=
true
;
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/MelodyApplication.java
View file @
4a8de89
...
...
@@ -31,7 +31,7 @@ public class MelodyApplication extends TopdrawApplication {
* @return true:如果处理了该异常信息;否则返回false.
*/
private
boolean
handleException
(
Throwable
ex
)
{
Log
.
d
(
TAG
,
"uncaughtException"
);
//
Log.d(TAG, "uncaughtException");
if
(
ex
==
null
)
{
return
false
;
}
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/OBiPluginLoader.java
View file @
4a8de89
...
...
@@ -56,18 +56,18 @@ public class OBiPluginLoader {
if
(
dirPackage
.
exists
())
{
String
path
=
null
;
File
[]
files
=
dirPackage
.
listFiles
();
Log
.
d
(
"OBiPluginLoader"
,
"files length..."
+
files
.
length
);
//
Log.d("OBiPluginLoader", "files length..." + files.length);
if
(
null
!=
files
&&
files
.
length
>
0
)
{
for
(
int
i
=
0
;
i
<
files
.
length
;
i
++)
{
File
file
=
files
[
i
];
Log
.
d
(
"OBiPluginLoader"
,
"file name..."
+
file
.
getName
());
//
Log.d("OBiPluginLoader", "file name..." + file.getName());
boolean
flag
=
false
;
if
(
null
!=
file
)
{
String
name
=
file
.
getName
();
flag
=
Pattern
.
matches
(
"\\S+\\.apk"
,
name
);
if
(
flag
)
{
path
=
file
.
getAbsolutePath
();
Log
.
d
(
"OBiPluginLoader"
,
"软件位置:"
+
path
);
//
Log.d("OBiPluginLoader", "软件位置:" + path);
break
;
}
}
...
...
@@ -105,7 +105,7 @@ public class OBiPluginLoader {
}
if
(!
dirPackage
.
exists
())
{
dirPackage
.
mkdir
();
Log
.
d
(
"OBiPluginLoader"
,
"创建目录"
+
dirPackage
);
//
Log.d("OBiPluginLoader", "创建目录" + dirPackage);
final
File
fileTempOK
=
new
File
(
dirPackage
,
fileName
);
final
OnResultListener
rl
=
new
OnResultListener
()
{
@Override
...
...
@@ -130,18 +130,18 @@ public class OBiPluginLoader {
}
else
{
String
path
=
null
;
File
[]
files
=
dirPackage
.
listFiles
();
Log
.
d
(
"OBiPluginLoader"
,
"files length..."
+
files
.
length
);
//
Log.d("OBiPluginLoader", "files length..." + files.length);
if
(
null
!=
files
&&
files
.
length
>
0
)
{
for
(
int
i
=
0
;
i
<
files
.
length
;
i
++)
{
File
file
=
files
[
i
];
Log
.
d
(
"OBiPluginLoader"
,
"file name..."
+
file
.
getName
());
//
Log.d("OBiPluginLoader", "file name..." + file.getName());
boolean
flag
=
false
;
if
(
null
!=
file
)
{
String
name
=
file
.
getName
();
flag
=
Pattern
.
matches
(
"\\S+\\.apk"
,
name
);
if
(
flag
)
{
path
=
file
.
getAbsolutePath
();
Log
.
d
(
"OBiPluginLoader"
,
"软件位置:"
+
path
);
//
Log.d("OBiPluginLoader", "软件位置:" + path);
break
;
}
}
...
...
@@ -177,7 +177,7 @@ public class OBiPluginLoader {
}
public
void
downloadApk
(
String
downloadURL
,
final
File
file
,
OnResultListener
rlistener
,
OnProgressListener
plistener
)
{
Log
.
d
(
"OBiPluginLoader"
,
"downloadApk start.."
);
//
Log.d("OBiPluginLoader", "downloadApk start..");
downloadURL
=
this
.
path
;
try
{
if
(
file
.
exists
()
&&
file
.
isFile
())
{
...
...
@@ -195,7 +195,7 @@ public class OBiPluginLoader {
url
=
server
+
downloadURL
;
}
URL
u
=
new
URL
(
url
);
Log
.
d
(
"OBiPluginLoader"
,
"downloadAPK url: "
+
url
);
//
Log.d("OBiPluginLoader", "downloadAPK url: " + url);
conn
=
(
HttpURLConnection
)
u
.
openConnection
();
conn
.
setRequestMethod
(
"GET"
);
conn
.
setConnectTimeout
(
5000
);
...
...
@@ -204,7 +204,7 @@ public class OBiPluginLoader {
conn
.
connect
();
if
(
200
==
conn
.
getResponseCode
())
{
String
cl
=
conn
.
getHeaderField
(
"content-length"
);
Log
.
d
(
"OBiPluginLoader"
,
"下载文件大小"
+
cl
);
//
Log.d("OBiPluginLoader", "下载文件大小" + cl);
long
totalSize
=
0
;
try
{
totalSize
=
Long
.
valueOf
(
cl
);
...
...
@@ -254,7 +254,7 @@ public class OBiPluginLoader {
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
Log
.
d
(
"OBiPluginLoader"
,
"downloadAPK flag: "
+
flag
);
//
Log.d("OBiPluginLoader", "downloadAPK flag: " + flag);
if
(
null
!=
rlistener
)
{
if
(
flag
)
{
rlistener
.
onResult
(
0
,
"download success"
);
...
...
@@ -291,7 +291,7 @@ public class OBiPluginLoader {
}
public
void
closeDownloadApk
()
{
Log
.
d
(
"OBiPluginLoader"
,
"目录是否存在:"
+
dirPackage
.
exists
());
//
Log.d("OBiPluginLoader", "目录是否存在:" + dirPackage.exists());
if
(
fTemp
.
exists
()
&&
fTemp
.
isFile
())
{
fTemp
.
delete
();
}
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/PluginLoader.java
View file @
4a8de89
...
...
@@ -124,7 +124,7 @@ public class PluginLoader {
File
dirPackage
=
new
File
(
dirPlugin
,
packageName
);
if
(!
dirPackage
.
exists
())
{
dirPackage
.
mkdir
();
Log
.
d
(
"PluginLoader"
,
"创建目录"
+
dirPackage
);
//
Log.d("PluginLoader", "创建目录" + dirPackage);
OnResultListener
rl
=
new
OnResultListener
()
{
@Override
public
void
onResult
(
int
i
,
String
msg
)
{
...
...
@@ -168,7 +168,7 @@ public class PluginLoader {
}
private
void
check
(
final
OnResultListener
rListener
,
final
OnProgressListener
plistener
,
File
filePlugin
)
{
Log
.
d
(
"PluginLoader"
,
"check start.."
);
//
Log.d("PluginLoader", "check start..");
boolean
needCheckUpdate
=
false
;
final
File
[]
filePlugins
;
if
(
null
!=
filePlugin
)
{
...
...
@@ -191,7 +191,7 @@ public class PluginLoader {
}
private
void
checkUpdate
(
final
OnResultListener
rListener
,
final
OnProgressListener
plistener
,
File
...
filePlugins
)
{
Log
.
d
(
"PluginLoader"
,
"checkUpdate start.."
);
//
Log.d("PluginLoader", "checkUpdate start..");
int
i
=
0
;
while
(
i
<
3
)
{
boolean
getResponse
=
false
;
...
...
@@ -216,7 +216,7 @@ public class PluginLoader {
baos
.
write
(
buffer
,
0
,
len
);
}
result
=
baos
.
toString
(
"UTF-8"
);
Log
.
d
(
"PluginLoader"
,
"result== "
+
result
);
//
Log.d("PluginLoader", "result== " + result);
}
getResponse
=
true
;
}
catch
(
Exception
e
)
{
...
...
@@ -274,7 +274,7 @@ public class PluginLoader {
e
.
printStackTrace
();
}
}
Log
.
d
(
"PluginLoader"
,
"getInfo=="
+
getInfo
);
//
Log.d("PluginLoader", "getInfo==" + getInfo);
if
(
getInfo
&&
null
!=
listPlugins
)
{
for
(
int
j
=
0
;
j
<
listPlugins
.
size
();
j
++)
{
Map
<
String
,
String
>
mapPlugin
=
listPlugins
.
get
(
j
);
...
...
@@ -294,7 +294,7 @@ public class PluginLoader {
}
}
}
Log
.
d
(
"PluginLoader"
,
"needCheck== "
+
needCheck
);
//
Log.d("PluginLoader", "needCheck== " + needCheck);
if
(
needCheck
&&
null
!=
mapPlugin
)
{
String
packageName
=
mapPlugin
.
get
(
"packageName"
);
String
url
=
mapPlugin
.
get
(
"url"
);
...
...
@@ -312,7 +312,7 @@ public class PluginLoader {
}
}
boolean
needDownload
=
false
;
Log
.
d
(
"PluginLoader"
,
"fileName=="
+
fileName
);
//
Log.d("PluginLoader", "fileName==" + fileName);
if
(
null
!=
fileName
)
{
final
File
file
=
new
File
(
dirPackageName
,
fileName
);
File
fileTemp
=
new
File
(
dirPackageName
,
fileName
+
"_temp"
);
...
...
@@ -345,7 +345,7 @@ public class PluginLoader {
if
(
fileTemp
.
exists
()
&&
fileTemp
.
isFile
())
{
fileTemp
.
delete
();
}
Log
.
d
(
"PluginLoader"
,
"needDownload"
);
//
Log.d("PluginLoader", "needDownload");
if
(
needDownload
)
{
OnResultListener
rl
=
new
OnResultListener
()
{
@Override
...
...
@@ -396,7 +396,7 @@ public class PluginLoader {
}
public
void
downloadApk
(
final
String
downloadURL
,
final
File
file
,
OnResultListener
rlistener
,
OnProgressListener
plistener
)
{
Log
.
d
(
"PluginLoader"
,
"downloadApk start.."
);
//
Log.d("PluginLoader", "downloadApk start..");
BufferedInputStream
bis
=
null
;
FileOutputStream
fos
=
null
;
try
{
...
...
@@ -415,7 +415,7 @@ public class PluginLoader {
url
=
server
+
downloadURL
;
}
URL
u
=
new
URL
(
url
);
Log
.
d
(
"PluginLoader"
,
"downloadAPK url: "
+
url
);
//
Log.d("PluginLoader", "downloadAPK url: " + url);
HttpURLConnection
conn
=
(
HttpURLConnection
)
u
.
openConnection
();
conn
.
setRequestMethod
(
"GET"
);
conn
.
setConnectTimeout
(
5000
);
...
...
@@ -466,7 +466,7 @@ public class PluginLoader {
fos
.
write
(
buffer
,
0
,
len
);
}
boolean
flag
=
f
.
renameTo
(
file
);
Log
.
d
(
"PluginLoader"
,
"downloadAPK flag: "
+
flag
);
//
Log.d("PluginLoader", "downloadAPK flag: " + flag);
if
(
null
!=
rlistener
)
{
if
(
flag
)
{
rlistener
.
onResult
(
0
,
"download success"
);
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/common/TopdrawSDKWrapper.java
View file @
4a8de89
...
...
@@ -7,7 +7,6 @@ import android.content.pm.PackageInfo;
import
android.content.pm.PackageManager
;
import
android.net.Uri
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.view.View
;
import
android.widget.ProgressBar
;
import
android.widget.RelativeLayout
;
...
...
@@ -48,7 +47,7 @@ public class TopdrawSDKWrapper {
}
public
static
void
init
(
Context
context
)
{
Log
.
i
(
TAG
,
"init in TopdrawSDKWrapper.java:"
);
//
Log.i(TAG, "init in TopdrawSDKWrapper.java:");
try
{
TopdrawSDKWrapper
.
_activity
=
(
AppActivity
)
context
;
}
catch
(
Exception
e
)
{
...
...
@@ -65,7 +64,7 @@ public class TopdrawSDKWrapper {
}
public
static
void
getPlayUrl
(
final
String
strSupercid
,
final
String
strCid
,
final
String
strJSCallBack
)
{
Log
.
d
(
TAG
,
"getPlayUrl start..."
+
strJSCallBack
);
//
Log.d(TAG, "getPlayUrl start..." + strJSCallBack);
String
epgServer
=
CommonUtils
.
getServer
(
_activity
)
+
HTTP_AUTHORIZE
;
String
token
=
CommonUtils
.
getToken
(
_activity
);
String
supercid
=
strSupercid
;
//测试用例 电视剧则使用掐头去尾及"-"的mediaCode,电影或单片使用"-1"
...
...
@@ -89,11 +88,11 @@ public class TopdrawSDKWrapper {
e
.
printStackTrace
();
}
Log
.
d
(
TAG
,
"token | "
+
CommonUtils
.
getToken
(
_activity
)
+
" server| "
+
CommonUtils
.
getServer
(
_activity
));
//
Log.d(TAG, "token | " + CommonUtils.getToken(_activity) + " server| " + CommonUtils.getServer(_activity));
HttpClientUtil
.
post
(
epgServer
,
mapParams
.
toString
(),
token
,
new
HttpClientUtil
.
OnRequestCallBack
()
{
@Override
public
void
onSuccess
(
String
json
)
{
Log
.
d
(
TAG
,
"成功获取播放链接 | "
+
json
);
//
Log.d(TAG, "成功获取播放链接 | " + json);
JSONObject
joAuthorizeResult
=
null
;
try
{
joAuthorizeResult
=
new
JSONObject
(
json
);
...
...
@@ -103,7 +102,7 @@ public class TopdrawSDKWrapper {
JSONObject
joUrl
=
jaUrls
.
getJSONObject
(
0
);
if
(
null
!=
joUrl
)
{
final
String
strPlayURL
=
joUrl
.
getString
(
"playurl"
);
Log
.
d
(
TAG
,
"获取播放链接:"
+
strPlayURL
);
//
Log.d(TAG, "获取播放链接:" + strPlayURL);
_activity
.
runOnGLThread
(
new
Runnable
()
{
@Override
...
...
@@ -125,7 +124,7 @@ public class TopdrawSDKWrapper {
@Override
public
void
onError
(
String
errorMsg
)
{
Log
.
d
(
TAG
,
"获取播放链接失败| "
+
errorMsg
);
//
Log.d(TAG, "获取播放链接失败| " + errorMsg);
}
});
}
...
...
@@ -148,7 +147,7 @@ public class TopdrawSDKWrapper {
}
public
static
void
startGame
(
String
apkName
,
final
String
strJSCallBack
)
{
Log
.
d
(
TAG
,
"TopdrawSDKWrapper starGame start..."
+
apkName
);
//
Log.d(TAG, "TopdrawSDKWrapper starGame start..." + apkName);
final
View
singleColorView
=
_activity
.
getSingleColorView
();
View
view
=
_activity
.
getProgressBarView
();
...
...
@@ -242,8 +241,8 @@ public class TopdrawSDKWrapper {
}
public
static
void
startOBiGame
(
String
downloadUrl
,
final
String
apkName
,
String
claName
,
final
String
strJSCallBack
)
{
Log
.
d
(
TAG
,
"TopdrawSDKWrapper starObiGame start..."
+
apkName
+
" downloadUrl: "
+
downloadUrl
+
" className "
+
claName
);
Log
.
d
(
TAG
,
"pluginLoaded..."
+
pluginLoaded
);
//
Log.d(TAG, "TopdrawSDKWrapper starObiGame start..." + apkName + " downloadUrl: " + downloadUrl + " className " + claName);
//
Log.d(TAG, "pluginLoaded..." + pluginLoaded);
if
(
pluginLoaded
)
{
return
;
}
...
...
@@ -255,7 +254,7 @@ public class TopdrawSDKWrapper {
@Override
public
void
onResult
(
int
i
,
final
String
msg
)
{
if
(
0
==
i
)
{
Log
.
d
(
TAG
,
"准备成功,准备启动。。。"
);
//
Log.d(TAG, "准备成功,准备启动。。。");
pluginLoaded
=
false
;
if
(!
isApkInstalled
(
_activity
,
apkName
))
{
startInstall
(
_activity
,
msg
);
...
...
@@ -290,7 +289,7 @@ public class TopdrawSDKWrapper {
if
(
pluginLoaded
)
//TODO,解决部分下载游戏安装游戏后退出,就进不去的问题
pluginLoaded
=
false
;
final
int
pg
=
Double
.
valueOf
(
d
).
intValue
();
Log
.
d
(
TAG
,
"奥比游戏下载进度:"
+
pg
);
//
Log.d(TAG, "奥比游戏下载进度:" + pg);
_activity
.
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
...
...
@@ -322,7 +321,7 @@ public class TopdrawSDKWrapper {
}
public
static
void
closeDownloadObiApk
()
{
Log
.
d
(
TAG
,
"取消下载。。。"
);
//
Log.d(TAG, "取消下载。。。");
OBiPluginLoader
.
getInstance
().
closeDownloadApk
();
}
...
...
@@ -352,7 +351,7 @@ public class TopdrawSDKWrapper {
* @param path 文件的路径
*/
public
static
void
startInstall
(
Context
context
,
String
path
)
{
Log
.
d
(
TAG
,
"安装的包路径。。。"
+
path
);
//
Log.d(TAG, "安装的包路径。。。" + path);
//修改安装包权限
// String cmd="chmod 777 "+path;
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/CocosMediaPlayer.java
View file @
4a8de89
...
...
@@ -4,7 +4,6 @@ import android.app.Activity;
import
android.content.Context
;
import
android.os.Handler
;
import
android.os.Message
;
import
android.util.Log
;
import
android.widget.FrameLayout
;
import
com.knowyou_jni.single.SDKUtil
;
...
...
@@ -139,7 +138,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
();
}
...
...
@@ -252,7 +251,7 @@ public class CocosMediaPlayer {
private
void
seekTo
(
Object
obj
)
{
int
time
=
(
int
)
obj
;
if
(
null
!=
mp
&&
(
MP_STATE
==
MP_STATE_PLAYING
||
MP_STATE
==
MP_STATE_PAUSED
))
{
Log
.
d
(
TAG
,
"seekTo....."
+
time
);
//
Log.d(TAG, "seekTo....." + time);
mp
.
seekTo
(
time
*
1000
);
}
}
...
...
@@ -309,7 +308,7 @@ public class CocosMediaPlayer {
private
void
reset
()
{
if
(
null
!=
mp
&&
MP_STATE
==
MP_STATE_STOPPED
)
{
Log
.
d
(
TAG
,
"reset....."
);
//
Log.d(TAG, "reset.....");
mp
.
reset
();
MP_STATE
=
MP_STATE_IDLE
;
}
...
...
@@ -378,7 +377,7 @@ public class CocosMediaPlayer {
}
private
void
onInfo
(
final
Object
obj
)
{
Log
.
d
(
TAG
,
"onInfo start..."
+
getParam
(
obj
));
//
Log.d(TAG, "onInfo start..." + getParam(obj));
runOnGlThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
...
...
@@ -388,7 +387,7 @@ public class CocosMediaPlayer {
}
private
void
onPrepared
(
final
Object
obj
)
{
Log
.
d
(
TAG
,
"onPrepared..."
+
getParam
(
obj
));
//
Log.d(TAG, "onPrepared..." + getParam(obj));
MP_STATE
=
MP_STATE_PREPARED
;
runOnGlThread
(
new
Runnable
()
{
@Override
...
...
@@ -428,7 +427,7 @@ public class CocosMediaPlayer {
}
private
void
onError
(
final
Object
obj
)
{
Log
.
d
(
TAG
,
"onError start..."
+
getParam
(
obj
));
//
Log.d(TAG, "onError start..." + getParam(obj));
runOnGlThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/NativeLogReporterNewTV.java
View file @
4a8de89
package
org
.
cocos2dx
.
javascript
.
component
;
import
android.content.Context
;
import
android.util.Log
;
import
android.webkit.JavascriptInterface
;
import
tv.icntv.logsdk.logSDK
;
...
...
@@ -22,7 +21,7 @@ public class NativeLogReporterNewTV {
}
public
static
NativeLogReporterNewTV
getInstance
(
Context
context
,
logSDK
sdk
)
{
Log
.
d
(
TAG
,
"初始化LogReporter..."
+
instance
);
//
Log.d(TAG, "初始化LogReporter..." + instance);
if
(
null
==
instance
)
{
instance
=
new
NativeLogReporterNewTV
(
context
,
sdk
);
}
...
...
@@ -31,7 +30,7 @@ public class NativeLogReporterNewTV {
public
static
void
report
(
int
i
,
String
msg
)
{
if
(
null
!=
sdk
)
{
Log
.
d
(
TAG
,
"log report | "
+
i
+
" "
+
msg
);
//
Log.d(TAG, "log report | " + i + " " + msg);
sdk
.
logUpload
(
i
,
null
!=
msg
?
msg
:
""
);
}
}
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/NewTVSDK.java
View file @
4a8de89
...
...
@@ -5,7 +5,6 @@ import android.content.pm.ApplicationInfo;
import
android.content.pm.PackageInfo
;
import
android.content.pm.PackageManager
;
import
android.os.Handler
;
import
android.util.Log
;
import
android.view.WindowManager
;
import
android.widget.FrameLayout
;
import
android.widget.Toast
;
...
...
@@ -68,7 +67,7 @@ public class NewTVSDK {
// String newTVAppSecret = "ec695c7b7371db8dbd84a6d01e4c66a9";
boolean
flag
=
sdk
.
sdkInit
(
loginSDK
.
TYPE_COMMON
,
newTVChannelCode
,
newTVAppkey
,
newTVAppSecret
,
context
);
//初始化是成功的
String
retDeviceLogin
=
sdk
.
deviceLogin
();
Log
.
d
(
"NewTVSDK"
,
flag
+
" init->deviceLogin..."
+
sdk
.
toString
());
//
Log.d("NewTVSDK", flag+" init->deviceLogin..." + sdk.toString());
logSDK
logsdk
;
AdSDK
adsdk
=
null
;
ADFrameLayout
adfl
=
null
;
...
...
@@ -76,7 +75,7 @@ public class NewTVSDK {
if
(
"1"
.
equals
(
retDeviceLogin
)
||
"766"
.
equals
(
retDeviceLogin
)
||
"777"
.
equals
(
retDeviceLogin
)
||
"891"
.
equals
(
retDeviceLogin
))
{
StringBuffer
sbDeviceID
=
new
StringBuffer
();
int
retDeviceID
=
sdk
.
getDeviceID
(
sbDeviceID
);
Log
.
d
(
TAG
,
"init->deviceID"
+
sbDeviceID
.
toString
());
//
Log.d(TAG,"init->deviceID"+sbDeviceID.toString());
if
(
0
==
retDeviceID
)
{
StringBuffer
sbLogServer
=
new
StringBuffer
();
int
getLogServer
=
sdk
.
getServerAddress
(
"USER_LOG"
,
sbLogServer
);
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/player/AndroidMediaPlayer.java
View file @
4a8de89
...
...
@@ -41,7 +41,7 @@ public class AndroidMediaPlayer implements IMediaPlayer {
@Override
public
void
setArea
(
int
x
,
int
y
,
int
w
,
int
h
)
{
Log
.
d
(
TAG
,
"x="
+
x
+
" y="
+
y
);
//
Log.d(TAG, "x=" + x + " y=" + y);
FrameLayout
.
LayoutParams
flp
=
new
FrameLayout
.
LayoutParams
(
w
,
h
);
flp
.
leftMargin
=
x
;
flp
.
topMargin
=
y
;
...
...
@@ -50,7 +50,7 @@ public class AndroidMediaPlayer implements IMediaPlayer {
@Override
public
void
setPlayURL
(
String
url
)
{
Log
.
d
(
"AndroidMediaPlayer:"
,
url
);
//
Log.d("AndroidMediaPlayer:", url);
if
(
null
!=
mp
)
{
try
{
mp
.
setDataSource
(
url
);
...
...
@@ -80,7 +80,7 @@ public class AndroidMediaPlayer implements IMediaPlayer {
public
void
prepareAsync
()
{
if
(
null
!=
mp
)
{
try
{
Log
.
d
(
TAG
,
"异步准备监听"
);
//
Log.d(TAG, "异步准备监听");
mp
.
prepareAsync
();
}
catch
(
IllegalStateException
e
)
{
e
.
printStackTrace
();
...
...
@@ -131,7 +131,7 @@ public class AndroidMediaPlayer implements IMediaPlayer {
@Override
public
void
setVolume
(
float
leftVolume
,
float
rightVolume
)
{
if
(
null
!=
mp
)
{
Log
.
d
(
"AndroidMediaPlayer"
,
"setVolume"
+
leftVolume
+
"--"
+
rightVolume
);
//
Log.d("AndroidMediaPlayer", "setVolume" + leftVolume + "--" + rightVolume);
mp
.
setVolume
(
leftVolume
,
rightVolume
);
}
}
...
...
@@ -146,7 +146,7 @@ public class AndroidMediaPlayer implements IMediaPlayer {
@Override
public
void
reset
()
{
if
(
null
!=
mp
)
{
Log
.
d
(
"AndroidMediaPlayer"
,
"reset..."
);
//
Log.d("AndroidMediaPlayer", "reset...");
mp
.
reset
();
}
}
...
...
@@ -173,7 +173,7 @@ public class AndroidMediaPlayer implements IMediaPlayer {
int
currentPosition
=
0
;
if
(
null
!=
mp
)
{
currentPosition
=
mp
.
getCurrentPosition
();
Log
.
d
(
"AndroidMediaPlayer"
,
"getCurrentPosition......."
+
currentPosition
);
//
Log.d("AndroidMediaPlayer", "getCurrentPosition......." + currentPosition);
}
return
currentPosition
;
}
...
...
@@ -218,7 +218,7 @@ public class AndroidMediaPlayer implements IMediaPlayer {
private
MediaPlayer
.
OnPreparedListener
onPreparedListener
=
new
MediaPlayer
.
OnPreparedListener
()
{
@Override
public
void
onPrepared
(
MediaPlayer
player
)
{
Log
.
d
(
TAG
,
"播放器准备完成"
);
//
Log.d(TAG, "播放器准备完成");
handler
.
obtainMessage
(
CocosMediaPlayer
.
MP_EVENT_ON_PREPARED
).
sendToTarget
();
}
};
...
...
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/component/player/NewTVMediaPlayer.java
View file @
4a8de89
...
...
@@ -3,7 +3,6 @@ package org.cocos2dx.javascript.component.player;
import
android.content.Context
;
import
android.media.AudioManager
;
import
android.os.Handler
;
import
android.util.Log
;
import
android.widget.FrameLayout
;
import
org.cocos2dx.javascript.component.CocosMediaPlayer
;
...
...
@@ -50,7 +49,7 @@ public class NewTVMediaPlayer implements IMediaPlayer {
@Override
public
void
setInfo
(
String
info
)
{
try
{
Log
.
d
(
"NewTVMediaPlayer"
,
"setInfo..."
+
info
);
//
Log.d("NewTVMediaPlayer", "setInfo..." + info);
jsonInfo
=
new
JSONObject
(
info
);
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
...
...
@@ -59,20 +58,20 @@ public class NewTVMediaPlayer implements IMediaPlayer {
@Override
public
void
prepare
()
{
Log
.
d
(
"NewTVMediaPlayer"
,
"prepare..."
);
//
Log.d("NewTVMediaPlayer", "prepare...");
handler
.
obtainMessage
(
CocosMediaPlayer
.
MP_EVENT_ON_PREPARED
).
sendToTarget
();
}
@Override
public
void
prepareAsync
()
{
Log
.
d
(
"NewTVMediaPlayer"
,
"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"
));
//
Log.d("NewTVMediaPlayer", "start..." + jsonInfo.getString("fileCode"));
info
.
setApp_id
(
jsonInfo
.
getString
(
"appId"
));
info
.
setCheckType
(
"program"
);
info
.
setPlayUrl
(
jsonInfo
.
getString
(
"playURL"
));
...
...
@@ -127,7 +126,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
;
...
...
Please
register
or
sign in
to post a comment