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
12218b03
...
12218b035268d47522eda63b16161ca92896ebe5
authored
2020-04-01 15:32:14 +0800
by
金学艇
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
1.修改了下游戏分类页的小问题和视频详情页的界面
1 parent
f7f54032
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
13 deletions
assets/Script/common/TVCanvas.js
assets/resources/Prefab/pfbMovieDetailEpisodeCell.prefab
assets/resources/Prefab/pfbMovieDetailNaviCell.prefab
assets/resources/data_template/main_recommend.json
assets/resources/data_template/movie_detail_list_by_media.json
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/topdraw/melody/MelodyApplication.java
assets/Script/common/TVCanvas.js
View file @
12218b0
...
...
@@ -974,7 +974,7 @@ cc.Topdraw.TVCanvas =
this
.
_fiBeforeDetainBox
=
this
.
_fiCurrentFocus
;
this
.
_fiBackend
=
fiBackend
;
this
.
_iSceneStatus
=
1
;
this
.
_cFocus
.
flyFocus
(
this
.
_fiCurrentFocus
,
this
.
_aFocusTargets
[
1
][
'system_c
onfirm
_btn'
].
getComponent
(
FocusInfo
),
Common
.
MOVE_DIRECTION_UP
,
this
.
_fFocusScaleFactor
,
null
);
this
.
_cFocus
.
flyFocus
(
this
.
_fiCurrentFocus
,
this
.
_aFocusTargets
[
1
][
'system_c
ancel
_btn'
].
getComponent
(
FocusInfo
),
Common
.
MOVE_DIRECTION_UP
,
this
.
_fFocusScaleFactor
,
null
);
this
.
_bIsLoadingPfbSystemPrompt
=
false
;
}
catch
(
error
)
{
cc
.
log
(
"Business Exception:Get showDetainBox..."
+
error
);
...
...
assets/resources/Prefab/pfbMovieDetailEpisodeCell.prefab
View file @
12218b0
...
...
@@ -301,12 +301,12 @@
"_prefab": {
"__id__": 8
},
"_opacity":
10
0,
"_opacity":
3
0,
"_color": {
"__type__": "cc.Color",
"r":
0
,
"g":
0
,
"b":
0
,
"r":
255
,
"g":
255
,
"b":
255
,
"a": 255
},
"_contentSize": {
...
...
assets/resources/Prefab/pfbMovieDetailNaviCell.prefab
View file @
12218b0
...
...
@@ -105,7 +105,7 @@
"_prefab": {
"__id__": 4
},
"_opacity":
255
,
"_opacity":
30
,
"_color": {
"__type__": "cc.Color",
"r": 255,
...
...
@@ -172,10 +172,16 @@
"__id__": 2
},
"_enabled": true,
"_materials": [],
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_spriteFrame": {
"__uuid__": "0422cbf9-d228-4b63-9983-4cf68191ccf1"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
...
...
assets/resources/data_template/main_recommend.json
View file @
12218b0
...
...
@@ -379,25 +379,29 @@
{
"name"
:
"Subject1"
,
"imageURL"
:
"upload/image/main/block7_1.png"
,
"tvlink"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneVideoDetail
\"
}}]}"
,
"tvlink2"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneVideoDetail
\"
}}]}"
,
"tvlink"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneGameCategory
\"
,
\"
currentIndex
\"
:
\"
0
\"
}}]}"
,
"code"
:
"promotionItem_e432ac2d-c1f3-4d44-a42b-7000971affa1"
},
{
"name"
:
"Subject2"
,
"imageURL"
:
"upload/image/main/block7_2.png"
,
"tvlink"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneVideoPlayer
\"
,
\"
name
\"
:
\"
TED
\"
,
\"
url
\"
:
\"
http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4
\"
}}]}"
,
"tvlink"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneGameCategory
\"
,
\"
currentIndex
\"
:
\"
1
\"
}}]}"
,
"tvlink2"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneVideoPlayer
\"
,
\"
name
\"
:
\"
TED
\"
,
\"
url
\"
:
\"
http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4
\"
}}]}"
,
"code"
:
"promotionItem_f90b7ff3-1f36-4019-9e77-cef871902343"
},
{
"name"
:
"Subject3"
,
"imageURL"
:
"upload/image/main/block7_3.png"
,
"tvlink"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneVideoPlayer
\"
,
\"
name
\"
:
\"
TED
\"
,
\"
url
\"
:
\"
http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4
\"
}}]}"
,
"tvlink"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneGameCategory
\"
,
\"
currentIndex
\"
:
\"
2
\"
}}]}"
,
"tvlink2"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneVideoPlayer
\"
,
\"
name
\"
:
\"
TED
\"
,
\"
url
\"
:
\"
http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4
\"
}}]}"
,
"code"
:
"promotionItem_e29b33e4-8954-4ef9-a6fc-0d844c909c67"
},
{
"name"
:
"Subject4"
,
"imageURL"
:
"upload/image/main/block7_4.png"
,
"tvlink"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneVideoPlayer
\"
,
\"
name
\"
:
\"
TED
\"
,
\"
url
\"
:
\"
http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4
\"
}}]}"
,
"tvlink"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneGameCategory
\"
,
\"
currentIndex
\"
:
\"
3
\"
}}]}"
,
"tvlink2"
:
"{
\"
click
\"
:[{
\"
action
\"
:
\"
ChangeScene
\"
,
\"
parameters
\"
:{
\"
sceneName
\"
:
\"
sceneVideoPlayer
\"
,
\"
name
\"
:
\"
TED
\"
,
\"
url
\"
:
\"
http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4
\"
}}]}"
,
"code"
:
"promotionItem_57aea4b3-7716-4FGRACWGVRTee32"
}
]
...
...
assets/resources/data_template/movie_detail_list_by_media.json
View file @
12218b0
This diff is collapsed.
Click to expand it.
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/topdraw/melody/MelodyApplication.java
View file @
12218b0
...
...
@@ -25,7 +25,7 @@ public class MelodyApplication extends TopdrawApplication {
public
static
boolean
authResult
=
false
;
private
static
MelodyApplication
app
;
public
static
String
TOPDRAW_API_PATH
=
"http://demo.cloud.api.findfun.topdraw.cn:38081/findfun"
;
;;
private
Handler
mHandler
=
new
Handler
();
@Override
...
...
Please
register
or
sign in
to post a comment