update sceneRecommend and ...
Showing
37 changed files
with
121 additions
and
120 deletions
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
... | @@ -113,8 +113,9 @@ cc.Class({ | ... | @@ -113,8 +113,9 @@ cc.Class({ |
113 | this.volumeValue.node.height = this._iVolumeContainerHeight * (iCurrentVolume / this._iMaxVolume);//更新声音进度条 | 113 | this.volumeValue.node.height = this._iVolumeContainerHeight * (iCurrentVolume / this._iMaxVolume);//更新声音进度条 |
114 | } | 114 | } |
115 | this.videoPlay.remoteURL = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; //测试播放器 | 115 | this.videoPlay.remoteURL = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; //测试播放器 |
116 | // this.videoPlay.remoteURL = "http://vjs.zencdn.net/v/oceans.mp4"; | ||
116 | 117 | ||
117 | cc.log("------------------------------->"+cc.find("TopCanvas/VideoPlayer", this.node)); | 118 | // cc.log("------------------------------->"+cc.find("TopCanvas/VideoPlayer", this.node)); |
118 | cc.find("VideoPlayer", this.node).on('ready-to-play', function (event) { | 119 | cc.find("VideoPlayer", this.node).on('ready-to-play', function (event) { |
119 | this.videoPlay.play(); | 120 | this.videoPlay.play(); |
120 | 121 | ||
... | @@ -128,11 +129,11 @@ cc.Class({ | ... | @@ -128,11 +129,11 @@ cc.Class({ |
128 | this.scheduleOnce(this.playContainerCallback, 5); | 129 | this.scheduleOnce(this.playContainerCallback, 5); |
129 | }, this); | 130 | }, this); |
130 | 131 | ||
132 | this.initFocus(); | ||
131 | this.getProgramRequest(); | 133 | this.getProgramRequest(); |
132 | this.getDefaultCollectRequest(); //获取收藏Id | 134 | this.getDefaultCollectRequest(); //获取收藏Id |
133 | this.getMediaCollectionRequest(); //该片是否收藏过 | 135 | this.getMediaCollectionRequest(); //该片是否收藏过 |
134 | this.getEpisodeRequest(); | 136 | this.getEpisodeRequest(); |
135 | this.initFocus(); | ||
136 | this.playTheSong(); //获取播放地址 | 137 | this.playTheSong(); //获取播放地址 |
137 | }, | 138 | }, |
138 | 139 | ||
... | @@ -172,7 +173,7 @@ cc.Class({ | ... | @@ -172,7 +173,7 @@ cc.Class({ |
172 | this.durationText.string = Utils.formatSecond2Minute(this.videoPlay.currentTime); //将秒转化为分 | 173 | this.durationText.string = Utils.formatSecond2Minute(this.videoPlay.currentTime); //将秒转化为分 |
173 | this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime);//实时更新进度 | 174 | this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime);//实时更新进度 |
174 | // this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), | 175 | // this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), |
175 | // this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(),Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去 | 176 | // this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(),Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去 |
176 | }, | 177 | }, |
177 | 178 | ||
178 | //获取节目名称 | 179 | //获取节目名称 |
... | @@ -586,7 +587,7 @@ cc.Class({ | ... | @@ -586,7 +587,7 @@ cc.Class({ |
586 | this._cFocus.init('focusContainer', this, | 587 | this._cFocus.init('focusContainer', this, |
587 | this.playOrPauseIcon.getComponent(FocusInfo), | 588 | this.playOrPauseIcon.getComponent(FocusInfo), |
588 | Common.SCREEN_WIDTH, Common.SCREEN_HEIGHT, 6, 4, 1.0); | 589 | Common.SCREEN_WIDTH, Common.SCREEN_HEIGHT, 6, 4, 1.0); |
589 | this._cFocus.hide(); //所有焦点都是隐藏的 | 590 | // this._cFocus.hide(); //所有焦点都是隐藏的 |
590 | }, | 591 | }, |
591 | 592 | ||
592 | keyDownDirection: function (Direct) { | 593 | keyDownDirection: function (Direct) { |
... | @@ -628,57 +629,57 @@ cc.Class({ | ... | @@ -628,57 +629,57 @@ cc.Class({ |
628 | switch (event.keyCode) { | 629 | switch (event.keyCode) { |
629 | case cc.macro.KEY.up: | 630 | case cc.macro.KEY.up: |
630 | case Common.ANDROID_KEY.up: | 631 | case Common.ANDROID_KEY.up: |
631 | if (0 == this._fiCurrentFocus.node.name.indexOf('VolumeIcon')) { //测试声音【0,1】 | 632 | // if (0 == this._fiCurrentFocus.node.name.indexOf('VolumeIcon')) { //测试声音【0,1】 |
632 | var currentVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "raiseVolume", "()I"); | 633 | // var currentVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "raiseVolume", "()I"); |
633 | if (this.volumeValue.node.height < this._iVolumeContainerHeight) {//播放器声音会出现0.99999999 | 634 | // if (this.volumeValue.node.height < this._iVolumeContainerHeight) {//播放器声音会出现0.99999999 |
634 | this.volumeValue.node.height = this._iVolumeContainerHeight * (currentVolume / this._iMaxVolume);//更新声音进度条 | 635 | // this.volumeValue.node.height = this._iVolumeContainerHeight * (currentVolume / this._iMaxVolume);//更新声音进度条 |
635 | this.unschedule(this.volumeControlCallback); | 636 | // this.unschedule(this.volumeControlCallback); |
636 | this.volumeControl.opacity = 255; | 637 | // this.volumeControl.opacity = 255; |
637 | this.scheduleOnce(this.volumeControlCallback, 3); | 638 | // this.scheduleOnce(this.volumeControlCallback, 3); |
638 | // this.videoPlay.volume = Math.ceil((this.videoPlay.volume + 0.1) * 10) / 10; | 639 | // // this.videoPlay.volume = Math.ceil((this.videoPlay.volume + 0.1) * 10) / 10; |
639 | 640 | ||
640 | // this.volumeValue.node.height = this._iVolumeContainerHeight * this.videoPlay.volume; | 641 | // // this.volumeValue.node.height = this._iVolumeContainerHeight * this.videoPlay.volume; |
641 | } | 642 | // } |
642 | return; //焦点框上上下下不允许跳到其他地方 | 643 | // return; //焦点框上上下下不允许跳到其他地方 |
643 | } | 644 | // } |
644 | this.keyDownDirection(Common.MOVE_DIRECTION_UP); | 645 | this.keyDownDirection(Common.MOVE_DIRECTION_UP); |
645 | break; | 646 | break; |
646 | case cc.macro.KEY.right: | 647 | case cc.macro.KEY.right: |
647 | case Common.ANDROID_KEY.right: | 648 | case Common.ANDROID_KEY.right: |
648 | if (0 == this._fiCurrentFocus.node.name.indexOf('ProgressBarIcon')) { //测试快进 | 649 | // if (0 == this._fiCurrentFocus.node.name.indexOf('ProgressBarIcon')) { //测试快进 |
649 | this.videoPlay.currentTime += this._iPlayProgressStep; | 650 | // this.videoPlay.currentTime += this._iPlayProgressStep; |
650 | this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime); | 651 | // this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime); |
651 | this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), | 652 | // this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), |
652 | this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去 | 653 | // this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去 |
653 | return; | 654 | // return; |
654 | } | 655 | // } |
655 | this.keyDownDirection(Common.MOVE_DIRECTION_RIGHT); | 656 | this.keyDownDirection(Common.MOVE_DIRECTION_RIGHT); |
656 | break; | 657 | break; |
657 | case cc.macro.KEY.down: | 658 | case cc.macro.KEY.down: |
658 | case Common.ANDROID_KEY.down: | 659 | case Common.ANDROID_KEY.down: |
659 | if (0 == this._fiCurrentFocus.node.name.indexOf('VolumeIcon')) { //测试声音【0,1】 | 660 | // if (0 == this._fiCurrentFocus.node.name.indexOf('VolumeIcon')) { //测试声音【0,1】 |
660 | var currentVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "lowerVolume", "()I"); | 661 | // var currentVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "lowerVolume", "()I"); |
661 | if (this.volumeValue.node.height > 0) { | 662 | // if (this.volumeValue.node.height > 0) { |
662 | this.volumeValue.node.height = this._iVolumeContainerHeight * (currentVolume / this._iMaxVolume);//更新声音进度条 | 663 | // this.volumeValue.node.height = this._iVolumeContainerHeight * (currentVolume / this._iMaxVolume);//更新声音进度条 |
663 | this.unschedule(this.volumeControlCallback); | 664 | // this.unschedule(this.volumeControlCallback); |
664 | this.volumeControl.opacity = 255; | 665 | // this.volumeControl.opacity = 255; |
665 | this.scheduleOnce(this.volumeControlCallback, 3); | 666 | // this.scheduleOnce(this.volumeControlCallback, 3); |
666 | this.videoPlay.volume = Math.floor((this.videoPlay.volume - 0.1) * 10) / 10; | 667 | // this.videoPlay.volume = Math.floor((this.videoPlay.volume - 0.1) * 10) / 10; |
667 | // this.volumeValue.node.height = this._iVolumeContainerHeight * this.videoPlay.volume; | 668 | // // this.volumeValue.node.height = this._iVolumeContainerHeight * this.videoPlay.volume; |
668 | return; | 669 | // return; |
669 | } | 670 | // } |
670 | } | 671 | // } |
671 | this.keyDownDirection(Common.MOVE_DIRECTION_DOWN); | 672 | this.keyDownDirection(Common.MOVE_DIRECTION_DOWN); |
672 | break; | 673 | break; |
673 | case cc.macro.KEY.left: | 674 | case cc.macro.KEY.left: |
674 | case Common.ANDROID_KEY.left: | 675 | case Common.ANDROID_KEY.left: |
675 | if (0 == this._fiCurrentFocus.node.name.indexOf('ProgressBarIcon')) { //测试快进 | 676 | // if (0 == this._fiCurrentFocus.node.name.indexOf('ProgressBarIcon')) { //测试快进 |
676 | this.videoPlay.currentTime -= this._iPlayProgressStep; | 677 | // this.videoPlay.currentTime -= this._iPlayProgressStep; |
677 | this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime); | 678 | // this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime); |
678 | this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), | 679 | // this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), |
679 | this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去 | 680 | // this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去 |
680 | return; | 681 | // return; |
681 | } | 682 | // } |
682 | this.keyDownDirection(Common.MOVE_DIRECTION_LEFT); | 683 | this.keyDownDirection(Common.MOVE_DIRECTION_LEFT); |
683 | break; | 684 | break; |
684 | case cc.macro.KEY.enter: | 685 | case cc.macro.KEY.enter: | ... | ... |
... | @@ -353,6 +353,10 @@ cc.Class({ | ... | @@ -353,6 +353,10 @@ cc.Class({ |
353 | fiHotUpdateBtn.init('',false,null,null,1.0); | 353 | fiHotUpdateBtn.init('',false,null,null,1.0); |
354 | this._aFocusTargets[1]['hot_update_btn']=cc.find('update/update_panel/update_btn',this.node); | 354 | this._aFocusTargets[1]['hot_update_btn']=cc.find('update/update_panel/update_btn',this.node); |
355 | 355 | ||
356 | let fiCloseBtn=cc.find('update/update_panel/close_btn',this.node).addComponent(FocusInfo); //热更新按钮 | ||
357 | fiCloseBtn.init('',false,null,null,1.0); | ||
358 | this._aFocusTargets[1]['hot_close_btn']=cc.find('update/update_panel/close_btn',this.node); | ||
359 | |||
356 | var nodeInitFocus = cc.find(this._oSceneContext.focusPath, this.node); | 360 | var nodeInitFocus = cc.find(this._oSceneContext.focusPath, this.node); |
357 | // cc.log("初始化 "+nodeInitFocus.name); | 361 | // cc.log("初始化 "+nodeInitFocus.name); |
358 | var nodeFocus = new cc.Node('nodeFocus'); | 362 | var nodeFocus = new cc.Node('nodeFocus'); |
... | @@ -548,7 +552,7 @@ cc.Class({ | ... | @@ -548,7 +552,7 @@ cc.Class({ |
548 | case cc.macro.KEY.enter: | 552 | case cc.macro.KEY.enter: |
549 | case cc.macro.KEY.space: | 553 | case cc.macro.KEY.space: |
550 | case Common.ANDROID_KEY.enter: | 554 | case Common.ANDROID_KEY.enter: |
551 | if (0 == this._fiCurrentFocus.node.name.indexOf('close')) { | 555 | if (0 == this._fiCurrentFocus.node.name.indexOf('close') || 0 == this._fiCurrentFocus.node.name.indexOf('close_btn')) { |
552 | this._iSceneStatus=0; | 556 | this._iSceneStatus=0; |
553 | cc.find("update", this.node).active = false; //关闭更新面板 | 557 | cc.find("update", this.node).active = false; //关闭更新面板 |
554 | let fiAfterNode=cc.find(this._oSceneContext.focusPath,this.node).getComponent(FocusInfo); //热更新按钮 | 558 | let fiAfterNode=cc.find(this._oSceneContext.focusPath,this.node).getComponent(FocusInfo); //热更新按钮 |
... | @@ -743,6 +747,13 @@ cc.Class({ | ... | @@ -743,6 +747,13 @@ cc.Class({ |
743 | }, | 747 | }, |
744 | 748 | ||
745 | hotUpdate: function () { | 749 | hotUpdate: function () { |
750 | //隐藏更新说明,显示更新进度条 | ||
751 | cc.find("update/update_panel/infoLabel", this.node).active = false; | ||
752 | cc.find("update/update_panel/update_info", this.node).active = false; | ||
753 | cc.find("update/update_panel/ProgressLabel", this.node).active = true; | ||
754 | cc.find("update/update_panel/fileProgress", this.node).active = true; | ||
755 | cc.find("update/update_panel/filep", this.node).active = true; | ||
756 | |||
746 | if (this._am && !this._updating) { | 757 | if (this._am && !this._updating) { |
747 | this._am.setEventCallback(this.updateCb.bind(this)); | 758 | this._am.setEventCallback(this.updateCb.bind(this)); |
748 | 759 | ... | ... |
This diff is collapsed.
Click to expand it.
1 | {"packageUrl":"http://x9niiz.natappfree.cc/remote-assets/","remoteManifestUrl":"http://x9niiz.natappfree.cc/remote-assets/project.manifest","remoteVersionUrl":"http://x9niiz.natappfree.cc/remote-assets/version.manifest","version":"1.0.0"} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | {"packageUrl":"http://knciwu.natappfree.cc/remote-assets/","remoteManifestUrl":"http://knciwu.natappfree.cc/remote-assets/project.manifest","remoteVersionUrl":"http://knciwu.natappfree.cc/remote-assets/version.manifest","version":"1.0.0"} | ||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -2,6 +2,6 @@ | ... | @@ -2,6 +2,6 @@ |
2 | "engine_version": "2.0.10", | 2 | "engine_version": "2.0.10", |
3 | "has_native": true, | 3 | "has_native": true, |
4 | "project_type": "js", | 4 | "project_type": "js", |
5 | "projectName": "fuse_apk", | 5 | "projectName": "super_child", |
6 | "packageName": "org.cocos2d.helloworld" | 6 | "packageName": "org.cocos2d.helloworld" |
7 | } | 7 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
This diff is collapsed.
Click to expand it.
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
3 | android:layout_width="wrap_content" | 3 | android:layout_width="match_parent" |
4 | android:layout_height="wrap_content"> | 4 | android:layout_height="match_parent"> |
5 | 5 | ||
6 | <ProgressBar | 6 | <ProgressBar |
7 | android:id="@+id/pb_progress" | 7 | android:id="@+id/pb_progress" |
8 | style="@android:style/Widget.ProgressBar.Horizontal" | 8 | style="@android:style/Widget.ProgressBar.Horizontal" |
9 | android:layout_width="150dp" | 9 | android:layout_width="150dp" |
10 | android:layout_height="20dp" | 10 | android:layout_height="20dp" |
11 | android:layout_gravity="end|bottom" | 11 | android:layout_alignParentBottom="true" |
12 | android:layout_alignParentRight="true" | ||
12 | android:layout_marginEnd="5dp" | 13 | android:layout_marginEnd="5dp" |
13 | android:layout_marginRight="5dp" | 14 | android:layout_marginRight="5dp" |
14 | android:layout_marginBottom="20dp" | 15 | android:layout_marginBottom="20dp" |
15 | android:visibility="invisible" /> | 16 | android:visibility="invisible" /> |
16 | |||
17 | |||
18 | </RelativeLayout> | 17 | </RelativeLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -34,6 +34,7 @@ import android.os.Bundle; | ... | @@ -34,6 +34,7 @@ import android.os.Bundle; |
34 | import android.content.Intent; | 34 | import android.content.Intent; |
35 | import android.content.res.Configuration; | 35 | import android.content.res.Configuration; |
36 | import android.util.Log; | 36 | import android.util.Log; |
37 | import android.view.LayoutInflater; | ||
37 | import android.view.View; | 38 | import android.view.View; |
38 | import android.widget.ProgressBar; | 39 | import android.widget.ProgressBar; |
39 | import android.widget.Toast; | 40 | import android.widget.Toast; |
... | @@ -41,12 +42,15 @@ import android.widget.Toast; | ... | @@ -41,12 +42,15 @@ import android.widget.Toast; |
41 | public class AppActivity extends Cocos2dxActivity { | 42 | public class AppActivity extends Cocos2dxActivity { |
42 | private static final String TAG="AppActivity"; | 43 | private static final String TAG="AppActivity"; |
43 | private static AppActivity _activity; | 44 | private static AppActivity _activity; |
44 | static ProgressBar pb_progress; | 45 | private static View view=null; |
45 | @Override | 46 | @Override |
46 | protected void onCreate(Bundle savedInstanceState) { | 47 | protected void onCreate(Bundle savedInstanceState) { |
47 | super.onCreate(savedInstanceState); | 48 | super.onCreate(savedInstanceState); |
49 | |||
50 | view= LayoutInflater.from(this).inflate(R.layout.activity_main,null); | ||
51 | mFrameLayout.addView(view); | ||
52 | |||
48 | // setContentView(R.layout.activity_main); | 53 | // setContentView(R.layout.activity_main); |
49 | pb_progress=findViewById(R.id.pb_progress); | ||
50 | _activity=this; | 54 | _activity=this; |
51 | // Workaround in https://stackoverflow.com/questions/16283079/re-launch-of-activity-on-home-button-but-only-the-first-time/16447508 | 55 | // Workaround in https://stackoverflow.com/questions/16283079/re-launch-of-activity-on-home-button-but-only-the-first-time/16447508 |
52 | if (!isTaskRoot()) { | 56 | if (!isTaskRoot()) { |
... | @@ -151,6 +155,10 @@ public class AppActivity extends Cocos2dxActivity { | ... | @@ -151,6 +155,10 @@ public class AppActivity extends Cocos2dxActivity { |
151 | super.onStart(); | 155 | super.onStart(); |
152 | } | 156 | } |
153 | 157 | ||
158 | public View getProgressBarView(){ | ||
159 | return view; | ||
160 | } | ||
161 | |||
154 | public static void startGame(int i,String apkName,final String strJSCallBack){ | 162 | public static void startGame(int i,String apkName,final String strJSCallBack){ |
155 | Log.d(TAG,"AppActivity starGame start..."+apkName); | 163 | Log.d(TAG,"AppActivity starGame start..."+apkName); |
156 | // if (pluginLoaded) { | 164 | // if (pluginLoaded) { | ... | ... |
... | @@ -33,6 +33,7 @@ public class MyApplication extends TopdrawApplication { | ... | @@ -33,6 +33,7 @@ public class MyApplication extends TopdrawApplication { |
33 | TopdrawSDK.init(context,initListener); | 33 | TopdrawSDK.init(context,initListener); |
34 | 34 | ||
35 | PluginLoader.getInstance().init(getApplicationContext(), mHandler, TOPDRAW_API_PATH, "/plugin/plugin.json"); | 35 | PluginLoader.getInstance().init(getApplicationContext(), mHandler, TOPDRAW_API_PATH, "/plugin/plugin.json"); |
36 | PluginLoader.getInstance().start(); | ||
36 | } | 37 | } |
37 | 38 | ||
38 | public static Context getAppContext() { return context; } | 39 | public static Context getAppContext() { return context; } | ... | ... |
... | @@ -48,8 +48,9 @@ public class TopdrawSDKWrapper { | ... | @@ -48,8 +48,9 @@ public class TopdrawSDKWrapper { |
48 | public static void startGame(int i,String apkName,final String strJSCallBack){ | 48 | public static void startGame(int i,String apkName,final String strJSCallBack){ |
49 | Log.d(TAG,"TopdrawSDKWrapper starGame start..."+apkName); | 49 | Log.d(TAG,"TopdrawSDKWrapper starGame start..."+apkName); |
50 | 50 | ||
51 | View view= LayoutInflater.from(_activity).inflate(R.layout.activity_main,null); | 51 | View view=_activity.getProgressBarView(); |
52 | pb_progress=view.findViewById(R.id.pb_progress); | 52 | pb_progress=view.findViewById(R.id.pb_progress); |
53 | |||
53 | if (pluginLoaded) { | 54 | if (pluginLoaded) { |
54 | return; | 55 | return; |
55 | } | 56 | } | ... | ... |
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <module external.linked.project.id=":fuse_apk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4"> | 2 | <module external.linked.project.id=":super_child" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4"> |
3 | <component name="FacetManager"> | 3 | <component name="FacetManager"> |
4 | <facet type="android-gradle" name="Android-Gradle"> | 4 | <facet type="android-gradle" name="Android-Gradle"> |
5 | <configuration> | 5 | <configuration> |
6 | <option name="GRADLE_PROJECT_PATH" value=":fuse_apk" /> | 6 | <option name="GRADLE_PROJECT_PATH" value=":super_child" /> |
7 | </configuration> | 7 | </configuration> |
8 | </facet> | 8 | </facet> |
9 | <facet type="native-android-gradle" name="Native-Android-Gradle"> | 9 | <facet type="native-android-gradle" name="Native-Android-Gradle"> | ... | ... |
1 | include ':libcocos2dx' | 1 | include ':libcocos2dx' |
2 | project(':libcocos2dx').projectDir = new File('D:/CocosCreator_2.0.10/resources/cocos2d-x/cocos/platform/android/libcocos2dx') | 2 | project(':libcocos2dx').projectDir = new File('D:/CocosCreator_2.0.10/resources/cocos2d-x/cocos/platform/android/libcocos2dx') |
3 | include ':fuse_apk' | 3 | include ':super_child' |
4 | project(':fuse_apk').projectDir = new File(settingsDir, 'app') | 4 | project(':super_child').projectDir = new File(settingsDir, 'app') | ... | ... |
... | @@ -135,7 +135,7 @@ | ... | @@ -135,7 +135,7 @@ |
135 | 4D697BD91CBD301C00A5AF29 /* libjs_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs_static.a; path = "D:\CocosCreator_2.0.10\resources\cocos2d-x/external/ios/libs/libjs_static.a"; sourceTree = "<absolute>"; }; | 135 | 4D697BD91CBD301C00A5AF29 /* libjs_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs_static.a; path = "D:\CocosCreator_2.0.10\resources\cocos2d-x/external/ios/libs/libjs_static.a"; sourceTree = "<absolute>"; }; |
136 | 4D697BDC1CBD303100A5AF29 /* libjs_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs_static.a; path = "D:\CocosCreator_2.0.10\resources\cocos2d-x/external/mac/libs/libjs_static.a"; sourceTree = "<absolute>"; }; | 136 | 4D697BDC1CBD303100A5AF29 /* libjs_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjs_static.a; path = "D:\CocosCreator_2.0.10\resources\cocos2d-x/external/mac/libs/libjs_static.a"; sourceTree = "<absolute>"; }; |
137 | 502380DB17EBB88200990C9B /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; | 137 | 502380DB17EBB88200990C9B /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; |
138 | 509D4AAA17EBB24E00697056 /* fuse_apk-desktop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "fuse_apk-desktop.app"; sourceTree = BUILT_PRODUCTS_DIR; }; | 138 | 509D4AAA17EBB24E00697056 /* super_child-desktop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "super_child-desktop.app"; sourceTree = BUILT_PRODUCTS_DIR; }; |
139 | 509D4AAB17EBB2AB00697056 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = ios/AppController.h; sourceTree = "<group>"; }; | 139 | 509D4AAB17EBB2AB00697056 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = ios/AppController.h; sourceTree = "<group>"; }; |
140 | 509D4AAC17EBB2AB00697056 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppController.mm; path = ios/AppController.mm; sourceTree = "<group>"; }; | 140 | 509D4AAC17EBB2AB00697056 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppController.mm; path = ios/AppController.mm; sourceTree = "<group>"; }; |
141 | 509D4AB717EBB2AB00697056 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ios/Info.plist; sourceTree = "<group>"; }; | 141 | 509D4AB717EBB2AB00697056 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ios/Info.plist; sourceTree = "<group>"; }; |
... | @@ -149,7 +149,7 @@ | ... | @@ -149,7 +149,7 @@ |
149 | 509D4AE617EBB81800697056 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; | 149 | 509D4AE617EBB81800697056 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; |
150 | 509D4AE817EBB82000697056 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; | 150 | 509D4AE817EBB82000697056 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; |
151 | 509D4AEA17EBB82600697056 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; | 151 | 509D4AEA17EBB82600697056 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; |
152 | A922753D1517C094001B78AA /* fuse_apk-mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "fuse_apk-mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; }; | 152 | A922753D1517C094001B78AA /* super_child-mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "super_child-mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; }; |
153 | A92275411517C094001B78AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; | 153 | A92275411517C094001B78AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; |
154 | A92275431517C094001B78AA /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; | 154 | A92275431517C094001B78AA /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; |
155 | A92275451517C094001B78AA /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; | 155 | A92275451517C094001B78AA /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; |
... | @@ -299,8 +299,8 @@ | ... | @@ -299,8 +299,8 @@ |
299 | A922753E1517C094001B78AA /* Products */ = { | 299 | A922753E1517C094001B78AA /* Products */ = { |
300 | isa = PBXGroup; | 300 | isa = PBXGroup; |
301 | children = ( | 301 | children = ( |
302 | A922753D1517C094001B78AA /* fuse_apk-mobile.app */, | 302 | A922753D1517C094001B78AA /* super_child-mobile.app */, |
303 | 509D4AAA17EBB24E00697056 /* fuse_apk-desktop.app */, | 303 | 509D4AAA17EBB24E00697056 /* super_child-desktop.app */, |
304 | ); | 304 | ); |
305 | name = Products; | 305 | name = Products; |
306 | sourceTree = "<group>"; | 306 | sourceTree = "<group>"; |
... | @@ -383,9 +383,9 @@ | ... | @@ -383,9 +383,9 @@ |
383 | /* End PBXGroup section */ | 383 | /* End PBXGroup section */ |
384 | 384 | ||
385 | /* Begin PBXNativeTarget section */ | 385 | /* Begin PBXNativeTarget section */ |
386 | 509D4A7517EBB24E00697056 /* fuse_apk-desktop */ = { | 386 | 509D4A7517EBB24E00697056 /* super_child-desktop */ = { |
387 | isa = PBXNativeTarget; | 387 | isa = PBXNativeTarget; |
388 | buildConfigurationList = 509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "fuse_apk-desktop" */; | 388 | buildConfigurationList = 509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "super_child-desktop" */; |
389 | buildPhases = ( | 389 | buildPhases = ( |
390 | 509D4A8017EBB24E00697056 /* Sources */, | 390 | 509D4A8017EBB24E00697056 /* Sources */, |
391 | 509D4A9317EBB24E00697056 /* Resources */, | 391 | 509D4A9317EBB24E00697056 /* Resources */, |
... | @@ -396,14 +396,14 @@ | ... | @@ -396,14 +396,14 @@ |
396 | dependencies = ( | 396 | dependencies = ( |
397 | 4DD5E6AA1CDAF6330046171E /* PBXTargetDependency */, | 397 | 4DD5E6AA1CDAF6330046171E /* PBXTargetDependency */, |
398 | ); | 398 | ); |
399 | name = "fuse_apk-desktop"; | 399 | name = "super_child-desktop"; |
400 | productName = fuse_apk; | 400 | productName = super_child; |
401 | productReference = 509D4AAA17EBB24E00697056 /* fuse_apk-desktop.app */; | 401 | productReference = 509D4AAA17EBB24E00697056 /* super_child-desktop.app */; |
402 | productType = "com.apple.product-type.application"; | 402 | productType = "com.apple.product-type.application"; |
403 | }; | 403 | }; |
404 | A922753C1517C094001B78AA /* fuse_apk-mobile */ = { | 404 | A922753C1517C094001B78AA /* super_child-mobile */ = { |
405 | isa = PBXNativeTarget; | 405 | isa = PBXNativeTarget; |
406 | buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "fuse_apk-mobile" */; | 406 | buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "super_child-mobile" */; |
407 | buildPhases = ( | 407 | buildPhases = ( |
408 | A92275391517C094001B78AA /* Sources */, | 408 | A92275391517C094001B78AA /* Sources */, |
409 | A922753A1517C094001B78AA /* Frameworks */, | 409 | A922753A1517C094001B78AA /* Frameworks */, |
... | @@ -414,9 +414,9 @@ | ... | @@ -414,9 +414,9 @@ |
414 | dependencies = ( | 414 | dependencies = ( |
415 | 4DD5E6B01CDAF6520046171E /* PBXTargetDependency */, | 415 | 4DD5E6B01CDAF6520046171E /* PBXTargetDependency */, |
416 | ); | 416 | ); |
417 | name = "fuse_apk-mobile"; | 417 | name = "super_child-mobile"; |
418 | productName = fuse_apk; | 418 | productName = super_child; |
419 | productReference = A922753D1517C094001B78AA /* fuse_apk-mobile.app */; | 419 | productReference = A922753D1517C094001B78AA /* super_child-mobile.app */; |
420 | productType = "com.apple.product-type.application"; | 420 | productType = "com.apple.product-type.application"; |
421 | }; | 421 | }; |
422 | /* End PBXNativeTarget section */ | 422 | /* End PBXNativeTarget section */ |
... | @@ -427,7 +427,7 @@ | ... | @@ -427,7 +427,7 @@ |
427 | attributes = { | 427 | attributes = { |
428 | LastUpgradeCheck = 0500; | 428 | LastUpgradeCheck = 0500; |
429 | }; | 429 | }; |
430 | buildConfigurationList = A92275371517C094001B78AA /* Build configuration list for PBXProject "fuse_apk" */; | 430 | buildConfigurationList = A92275371517C094001B78AA /* Build configuration list for PBXProject "super_child" */; |
431 | compatibilityVersion = "Xcode 3.2"; | 431 | compatibilityVersion = "Xcode 3.2"; |
432 | developmentRegion = English; | 432 | developmentRegion = English; |
433 | hasScannedForEncodings = 0; | 433 | hasScannedForEncodings = 0; |
... | @@ -447,8 +447,8 @@ | ... | @@ -447,8 +447,8 @@ |
447 | ); | 447 | ); |
448 | projectRoot = ""; | 448 | projectRoot = ""; |
449 | targets = ( | 449 | targets = ( |
450 | A922753C1517C094001B78AA /* fuse_apk-mobile */, | 450 | A922753C1517C094001B78AA /* super_child-mobile */, |
451 | 509D4A7517EBB24E00697056 /* fuse_apk-desktop */, | 451 | 509D4A7517EBB24E00697056 /* super_child-desktop */, |
452 | ); | 452 | ); |
453 | }; | 453 | }; |
454 | /* End PBXProject section */ | 454 | /* End PBXProject section */ |
... | @@ -733,7 +733,7 @@ | ... | @@ -733,7 +733,7 @@ |
733 | /* End XCBuildConfiguration section */ | 733 | /* End XCBuildConfiguration section */ |
734 | 734 | ||
735 | /* Begin XCConfigurationList section */ | 735 | /* Begin XCConfigurationList section */ |
736 | 509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "fuse_apk-desktop" */ = { | 736 | 509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "super_child-desktop" */ = { |
737 | isa = XCConfigurationList; | 737 | isa = XCConfigurationList; |
738 | buildConfigurations = ( | 738 | buildConfigurations = ( |
739 | 509D4AA817EBB24E00697056 /* Debug */, | 739 | 509D4AA817EBB24E00697056 /* Debug */, |
... | @@ -742,7 +742,7 @@ | ... | @@ -742,7 +742,7 @@ |
742 | defaultConfigurationIsVisible = 0; | 742 | defaultConfigurationIsVisible = 0; |
743 | defaultConfigurationName = Release; | 743 | defaultConfigurationName = Release; |
744 | }; | 744 | }; |
745 | A92275371517C094001B78AA /* Build configuration list for PBXProject "fuse_apk" */ = { | 745 | A92275371517C094001B78AA /* Build configuration list for PBXProject "super_child" */ = { |
746 | isa = XCConfigurationList; | 746 | isa = XCConfigurationList; |
747 | buildConfigurations = ( | 747 | buildConfigurations = ( |
748 | A92276FE1517C097001B78AA /* Debug */, | 748 | A92276FE1517C097001B78AA /* Debug */, |
... | @@ -751,7 +751,7 @@ | ... | @@ -751,7 +751,7 @@ |
751 | defaultConfigurationIsVisible = 0; | 751 | defaultConfigurationIsVisible = 0; |
752 | defaultConfigurationName = Release; | 752 | defaultConfigurationName = Release; |
753 | }; | 753 | }; |
754 | A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "fuse_apk-mobile" */ = { | 754 | A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "super_child-mobile" */ = { |
755 | isa = XCConfigurationList; | 755 | isa = XCConfigurationList; |
756 | buildConfigurations = ( | 756 | buildConfigurations = ( |
757 | A92277011517C097001B78AA /* Debug */, | 757 | A92277011517C097001B78AA /* Debug */, | ... | ... |
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
12 | </ItemGroup> | 12 | </ItemGroup> |
13 | <PropertyGroup Label="Globals"> | 13 | <PropertyGroup Label="Globals"> |
14 | <ProjectGuid>{3B0B58B1-2734-488E-A542-ECEC11EB2455}</ProjectGuid> | 14 | <ProjectGuid>{3B0B58B1-2734-488E-A542-ECEC11EB2455}</ProjectGuid> |
15 | <RootNamespace>fuse_apk</RootNamespace> | 15 | <RootNamespace>super_child</RootNamespace> |
16 | </PropertyGroup> | 16 | </PropertyGroup> |
17 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 17 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
18 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 18 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ... | ... |
... | @@ -3964,7 +3964,6 @@ this._iMaxVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppA | ... | @@ -3964,7 +3964,6 @@ this._iMaxVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppA |
3964 | this.volumeValue.node.height = this._iVolumeContainerHeight * (o / this._iMaxVolume); | 3964 | this.volumeValue.node.height = this._iVolumeContainerHeight * (o / this._iMaxVolume); |
3965 | } | 3965 | } |
3966 | this.videoPlay.remoteURL = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; | 3966 | this.videoPlay.remoteURL = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; |
3967 | cc.log("-------------------------------\x3e" + cc.find("TopCanvas/VideoPlayer", this.node)); | ||
3968 | cc.find("VideoPlayer", this.node).on("ready-to-play", function(e) { | 3967 | cc.find("VideoPlayer", this.node).on("ready-to-play", function(e) { |
3969 | this.videoPlay.play(); | 3968 | this.videoPlay.play(); |
3970 | this.playContainerCallback || (this.playContainerCallback = function() { | 3969 | this.playContainerCallback || (this.playContainerCallback = function() { |
... | @@ -3974,11 +3973,11 @@ this.unschedule(this.playContainerCallback); | ... | @@ -3974,11 +3973,11 @@ this.unschedule(this.playContainerCallback); |
3974 | this.playContainer.opacity = 255; | 3973 | this.playContainer.opacity = 255; |
3975 | this.scheduleOnce(this.playContainerCallback, 5); | 3974 | this.scheduleOnce(this.playContainerCallback, 5); |
3976 | }, this); | 3975 | }, this); |
3976 | this.initFocus(); | ||
3977 | this.getProgramRequest(); | 3977 | this.getProgramRequest(); |
3978 | this.getDefaultCollectRequest(); | 3978 | this.getDefaultCollectRequest(); |
3979 | this.getMediaCollectionRequest(); | 3979 | this.getMediaCollectionRequest(); |
3980 | this.getEpisodeRequest(); | 3980 | this.getEpisodeRequest(); |
3981 | this.initFocus(); | ||
3982 | this.playTheSong(); | 3981 | this.playTheSong(); |
3983 | }, | 3982 | }, |
3984 | onVideoPlayerEvent: function(e, t) { | 3983 | onVideoPlayerEvent: function(e, t) { |
... | @@ -4264,7 +4263,6 @@ var r = new cc.Node("nodeFocus"); | ... | @@ -4264,7 +4263,6 @@ var r = new cc.Node("nodeFocus"); |
4264 | this.node.addChild(r, 10); | 4263 | this.node.addChild(r, 10); |
4265 | this._cFocus = this.node.getChildByName("nodeFocus").addComponent(c); | 4264 | this._cFocus = this.node.getChildByName("nodeFocus").addComponent(c); |
4266 | this._cFocus.init("focusContainer", this, this.playOrPauseIcon.getComponent(a), o.SCREEN_WIDTH, o.SCREEN_HEIGHT, 6, 4, 1); | 4265 | this._cFocus.init("focusContainer", this, this.playOrPauseIcon.getComponent(a), o.SCREEN_WIDTH, o.SCREEN_HEIGHT, 6, 4, 1); |
4267 | this._cFocus.hide(); | ||
4268 | }, | 4266 | }, |
4269 | keyDownDirection: function(e) { | 4267 | keyDownDirection: function(e) { |
4270 | var t = null, i = this._fiCurrentFocus; | 4268 | var t = null, i = this._fiCurrentFocus; |
... | @@ -4291,54 +4289,21 @@ this.scheduleOnce(this.playContainerCallback, 5); | ... | @@ -4291,54 +4289,21 @@ this.scheduleOnce(this.playContainerCallback, 5); |
4291 | switch (e.keyCode) { | 4289 | switch (e.keyCode) { |
4292 | case cc.macro.KEY.up: | 4290 | case cc.macro.KEY.up: |
4293 | case o.ANDROID_KEY.up: | 4291 | case o.ANDROID_KEY.up: |
4294 | if (0 == this._fiCurrentFocus.node.name.indexOf("VolumeIcon")) { | ||
4295 | var i = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "raiseVolume", "()I"); | ||
4296 | if (this.volumeValue.node.height < this._iVolumeContainerHeight) { | ||
4297 | this.volumeValue.node.height = this._iVolumeContainerHeight * (i / this._iMaxVolume); | ||
4298 | this.unschedule(this.volumeControlCallback); | ||
4299 | this.volumeControl.opacity = 255; | ||
4300 | this.scheduleOnce(this.volumeControlCallback, 3); | ||
4301 | } | ||
4302 | return; | ||
4303 | } | ||
4304 | this.keyDownDirection(o.MOVE_DIRECTION_UP); | 4292 | this.keyDownDirection(o.MOVE_DIRECTION_UP); |
4305 | break; | 4293 | break; |
4306 | 4294 | ||
4307 | case cc.macro.KEY.right: | 4295 | case cc.macro.KEY.right: |
4308 | case o.ANDROID_KEY.right: | 4296 | case o.ANDROID_KEY.right: |
4309 | if (0 == this._fiCurrentFocus.node.name.indexOf("ProgressBarIcon")) { | ||
4310 | this.videoPlay.currentTime += this._iPlayProgressStep; | ||
4311 | this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime); | ||
4312 | this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), o.FOCUS_FLY_DURATION, 1); | ||
4313 | return; | ||
4314 | } | ||
4315 | this.keyDownDirection(o.MOVE_DIRECTION_RIGHT); | 4297 | this.keyDownDirection(o.MOVE_DIRECTION_RIGHT); |
4316 | break; | 4298 | break; |
4317 | 4299 | ||
4318 | case cc.macro.KEY.down: | 4300 | case cc.macro.KEY.down: |
4319 | case o.ANDROID_KEY.down: | 4301 | case o.ANDROID_KEY.down: |
4320 | if (0 == this._fiCurrentFocus.node.name.indexOf("VolumeIcon")) { | ||
4321 | i = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "lowerVolume", "()I"); | ||
4322 | if (this.volumeValue.node.height > 0) { | ||
4323 | this.volumeValue.node.height = this._iVolumeContainerHeight * (i / this._iMaxVolume); | ||
4324 | this.unschedule(this.volumeControlCallback); | ||
4325 | this.volumeControl.opacity = 255; | ||
4326 | this.scheduleOnce(this.volumeControlCallback, 3); | ||
4327 | this.videoPlay.volume = Math.floor(10 * (this.videoPlay.volume - .1)) / 10; | ||
4328 | return; | ||
4329 | } | ||
4330 | } | ||
4331 | this.keyDownDirection(o.MOVE_DIRECTION_DOWN); | 4302 | this.keyDownDirection(o.MOVE_DIRECTION_DOWN); |
4332 | break; | 4303 | break; |
4333 | 4304 | ||
4334 | case cc.macro.KEY.left: | 4305 | case cc.macro.KEY.left: |
4335 | case o.ANDROID_KEY.left: | 4306 | case o.ANDROID_KEY.left: |
4336 | if (0 == this._fiCurrentFocus.node.name.indexOf("ProgressBarIcon")) { | ||
4337 | this.videoPlay.currentTime -= this._iPlayProgressStep; | ||
4338 | this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime); | ||
4339 | this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), o.FOCUS_FLY_DURATION, 1); | ||
4340 | return; | ||
4341 | } | ||
4342 | this.keyDownDirection(o.MOVE_DIRECTION_LEFT); | 4307 | this.keyDownDirection(o.MOVE_DIRECTION_LEFT); |
4343 | break; | 4308 | break; |
4344 | 4309 | ||
... | @@ -5231,6 +5196,8 @@ cc.find("update/update_panel/close", this.node).addComponent(a).init("", !1, nul | ... | @@ -5231,6 +5196,8 @@ cc.find("update/update_panel/close", this.node).addComponent(a).init("", !1, nul |
5231 | this._aFocusTargets[1].hot_update_close = cc.find("update/update_panel/close", this.node); | 5196 | this._aFocusTargets[1].hot_update_close = cc.find("update/update_panel/close", this.node); |
5232 | cc.find("update/update_panel/update_btn", this.node).addComponent(a).init("", !1, null, null, 1); | 5197 | cc.find("update/update_panel/update_btn", this.node).addComponent(a).init("", !1, null, null, 1); |
5233 | this._aFocusTargets[1].hot_update_btn = cc.find("update/update_panel/update_btn", this.node); | 5198 | this._aFocusTargets[1].hot_update_btn = cc.find("update/update_panel/update_btn", this.node); |
5199 | cc.find("update/update_panel/close_btn", this.node).addComponent(a).init("", !1, null, null, 1); | ||
5200 | this._aFocusTargets[1].hot_close_btn = cc.find("update/update_panel/close_btn", this.node); | ||
5234 | var t = cc.find(this._oSceneContext.focusPath, this.node), i = new cc.Node("nodeFocus"); | 5201 | var t = cc.find(this._oSceneContext.focusPath, this.node), i = new cc.Node("nodeFocus"); |
5235 | this.node.addChild(i, 10); | 5202 | this.node.addChild(i, 10); |
5236 | this._cFocus = this.node.getChildByName("nodeFocus").addComponent(c); | 5203 | this._cFocus = this.node.getChildByName("nodeFocus").addComponent(c); |
... | @@ -5344,7 +5311,7 @@ break; | ... | @@ -5344,7 +5311,7 @@ break; |
5344 | case cc.macro.KEY.enter: | 5311 | case cc.macro.KEY.enter: |
5345 | case cc.macro.KEY.space: | 5312 | case cc.macro.KEY.space: |
5346 | case o.ANDROID_KEY.enter: | 5313 | case o.ANDROID_KEY.enter: |
5347 | if (0 == this._fiCurrentFocus.node.name.indexOf("close")) { | 5314 | if (0 == this._fiCurrentFocus.node.name.indexOf("close") || 0 == this._fiCurrentFocus.node.name.indexOf("close_btn")) { |
5348 | this._iSceneStatus = 0; | 5315 | this._iSceneStatus = 0; |
5349 | cc.find("update", this.node).active = !1; | 5316 | cc.find("update", this.node).active = !1; |
5350 | var s = cc.find(this._oSceneContext.focusPath, this.node).getComponent(a); | 5317 | var s = cc.find(this._oSceneContext.focusPath, this.node).getComponent(a); |
... | @@ -5454,6 +5421,11 @@ this._checkListener = null; | ... | @@ -5454,6 +5421,11 @@ this._checkListener = null; |
5454 | this._updating = !1; | 5421 | this._updating = !1; |
5455 | }, | 5422 | }, |
5456 | hotUpdate: function() { | 5423 | hotUpdate: function() { |
5424 | cc.find("update/update_panel/infoLabel", this.node).active = !1; | ||
5425 | cc.find("update/update_panel/update_info", this.node).active = !1; | ||
5426 | cc.find("update/update_panel/ProgressLabel", this.node).active = !0; | ||
5427 | cc.find("update/update_panel/fileProgress", this.node).active = !0; | ||
5428 | cc.find("update/update_panel/filep", this.node).active = !0; | ||
5457 | if (this._am && !this._updating) { | 5429 | if (this._am && !this._updating) { |
5458 | this._am.setEventCallback(this.updateCb.bind(this)); | 5430 | this._am.setEventCallback(this.updateCb.bind(this)); |
5459 | if (this._am.getState() === jsb.AssetsManager.State.UNINITED) { | 5431 | if (this._am.getState() === jsb.AssetsManager.State.UNINITED) { | ... | ... |
This diff is collapsed.
Click to expand it.
1 | // 在 main.js 的开头添加如下代码 | ||
2 | if (jsb) { | ||
3 | var hotUpdateSearchPaths = localStorage.getItem('HotUpdateSearchPaths'); | ||
4 | if (hotUpdateSearchPaths) { | ||
5 | jsb.fileUtils.setSearchPaths(JSON.parse(hotUpdateSearchPaths)); | ||
6 | } | ||
7 | } | ||
8 | |||
1 | // QQPlay window need to be inited first | 9 | // QQPlay window need to be inited first |
2 | if (false) { | 10 | if (false) { |
3 | BK.Script.loadlib('GameRes://libs/qqplay-adapter.js'); | 11 | BK.Script.loadlib('GameRes://libs/qqplay-adapter.js'); | ... | ... |
No preview for this file type
1 | {"type":"cc.Texture2D","data":"0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|1,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|1,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|1,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0"} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | {"type":"cc.Texture2D","data":"0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|1,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|1,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|1,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0|0,9729,9729,33071,33071,0"} | ||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
This diff is collapsed.
Click to expand it.
build/jsb-link/res/import/08/082b06390.json
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.

2.76 KB
No preview for this file type
No preview for this file type
... | @@ -36,7 +36,7 @@ | ... | @@ -36,7 +36,7 @@ |
36 | "zip": false | 36 | "zip": false |
37 | }, | 37 | }, |
38 | "startScene": "2d2f792f-a40c-49bb-a189-ed176a246e49", | 38 | "startScene": "2d2f792f-a40c-49bb-a189-ed176a246e49", |
39 | "title": "fuse_apk", | 39 | "title": "super_child", |
40 | "webOrientation": "auto", | 40 | "webOrientation": "auto", |
41 | "wechatgame": { | 41 | "wechatgame": { |
42 | "REMOTE_SERVER_ROOT": "", | 42 | "REMOTE_SERVER_ROOT": "", | ... | ... |
-
Please register or sign in to post a comment