Skip to content

金学艇 / ChildEdu

Go to a project
Toggle navigation
Toggle navigation pinning
Commit e9bc0a46 e9bc0a46fa35f7893d7c2bb6dd919ba816fcc5b5 by jinwawa
Options

update sceneRecommend and ...

1 parent 437fa1e5
Expand all
Inline Side-by-side
Showing 37 changed files with 120 additions and 119 deletions
......@@ -113,8 +113,9 @@ cc.Class({
this.volumeValue.node.height = this._iVolumeContainerHeight * (iCurrentVolume / this._iMaxVolume);//更新声音进度条
}
this.videoPlay.remoteURL = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; //测试播放器
// this.videoPlay.remoteURL = "http://vjs.zencdn.net/v/oceans.mp4";
cc.log("------------------------------->"+cc.find("TopCanvas/VideoPlayer", this.node));
// cc.log("------------------------------->"+cc.find("TopCanvas/VideoPlayer", this.node));
cc.find("VideoPlayer", this.node).on('ready-to-play', function (event) {
this.videoPlay.play();
......@@ -128,11 +129,11 @@ cc.Class({
this.scheduleOnce(this.playContainerCallback, 5);
}, this);
this.initFocus();
this.getProgramRequest();
this.getDefaultCollectRequest(); //获取收藏Id
this.getMediaCollectionRequest(); //该片是否收藏过
this.getEpisodeRequest();
this.initFocus();
this.playTheSong(); //获取播放地址
},
......@@ -586,7 +587,7 @@ cc.Class({
this._cFocus.init('focusContainer', this,
this.playOrPauseIcon.getComponent(FocusInfo),
Common.SCREEN_WIDTH, Common.SCREEN_HEIGHT, 6, 4, 1.0);
this._cFocus.hide(); //所有焦点都是隐藏的
// this._cFocus.hide(); //所有焦点都是隐藏的
},
keyDownDirection: function (Direct) {
......@@ -628,57 +629,57 @@ cc.Class({
switch (event.keyCode) {
case cc.macro.KEY.up:
case Common.ANDROID_KEY.up:
if (0 == this._fiCurrentFocus.node.name.indexOf('VolumeIcon')) { //测试声音【0,1】
var currentVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "raiseVolume", "()I");
if (this.volumeValue.node.height < this._iVolumeContainerHeight) {//播放器声音会出现0.99999999
this.volumeValue.node.height = this._iVolumeContainerHeight * (currentVolume / this._iMaxVolume);//更新声音进度条
this.unschedule(this.volumeControlCallback);
this.volumeControl.opacity = 255;
this.scheduleOnce(this.volumeControlCallback, 3);
// this.videoPlay.volume = Math.ceil((this.videoPlay.volume + 0.1) * 10) / 10;
// this.volumeValue.node.height = this._iVolumeContainerHeight * this.videoPlay.volume;
}
return; //焦点框上上下下不允许跳到其他地方
}
// if (0 == this._fiCurrentFocus.node.name.indexOf('VolumeIcon')) { //测试声音【0,1】
// var currentVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "raiseVolume", "()I");
// if (this.volumeValue.node.height < this._iVolumeContainerHeight) {//播放器声音会出现0.99999999
// this.volumeValue.node.height = this._iVolumeContainerHeight * (currentVolume / this._iMaxVolume);//更新声音进度条
// this.unschedule(this.volumeControlCallback);
// this.volumeControl.opacity = 255;
// this.scheduleOnce(this.volumeControlCallback, 3);
// // this.videoPlay.volume = Math.ceil((this.videoPlay.volume + 0.1) * 10) / 10;
// // this.volumeValue.node.height = this._iVolumeContainerHeight * this.videoPlay.volume;
// }
// return; //焦点框上上下下不允许跳到其他地方
// }
this.keyDownDirection(Common.MOVE_DIRECTION_UP);
break;
case cc.macro.KEY.right:
case Common.ANDROID_KEY.right:
if (0 == this._fiCurrentFocus.node.name.indexOf('ProgressBarIcon')) { //测试快进
this.videoPlay.currentTime += this._iPlayProgressStep;
this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime);
this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(),
this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去
return;
}
// if (0 == this._fiCurrentFocus.node.name.indexOf('ProgressBarIcon')) { //测试快进
// this.videoPlay.currentTime += this._iPlayProgressStep;
// this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime);
// this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(),
// this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去
// return;
// }
this.keyDownDirection(Common.MOVE_DIRECTION_RIGHT);
break;
case cc.macro.KEY.down:
case Common.ANDROID_KEY.down:
if (0 == this._fiCurrentFocus.node.name.indexOf('VolumeIcon')) { //测试声音【0,1】
var currentVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "lowerVolume", "()I");
if (this.volumeValue.node.height > 0) {
this.volumeValue.node.height = this._iVolumeContainerHeight * (currentVolume / this._iMaxVolume);//更新声音进度条
this.unschedule(this.volumeControlCallback);
this.volumeControl.opacity = 255;
this.scheduleOnce(this.volumeControlCallback, 3);
this.videoPlay.volume = Math.floor((this.videoPlay.volume - 0.1) * 10) / 10;
// this.volumeValue.node.height = this._iVolumeContainerHeight * this.videoPlay.volume;
return;
}
}
// if (0 == this._fiCurrentFocus.node.name.indexOf('VolumeIcon')) { //测试声音【0,1】
// var currentVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "lowerVolume", "()I");
// if (this.volumeValue.node.height > 0) {
// this.volumeValue.node.height = this._iVolumeContainerHeight * (currentVolume / this._iMaxVolume);//更新声音进度条
// this.unschedule(this.volumeControlCallback);
// this.volumeControl.opacity = 255;
// this.scheduleOnce(this.volumeControlCallback, 3);
// this.videoPlay.volume = Math.floor((this.videoPlay.volume - 0.1) * 10) / 10;
// // this.volumeValue.node.height = this._iVolumeContainerHeight * this.videoPlay.volume;
// return;
// }
// }
this.keyDownDirection(Common.MOVE_DIRECTION_DOWN);
break;
case cc.macro.KEY.left:
case Common.ANDROID_KEY.left:
if (0 == this._fiCurrentFocus.node.name.indexOf('ProgressBarIcon')) { //测试快进
this.videoPlay.currentTime -= this._iPlayProgressStep;
this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime);
this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(),
this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去
return;
}
// if (0 == this._fiCurrentFocus.node.name.indexOf('ProgressBarIcon')) { //测试快进
// this.videoPlay.currentTime -= this._iPlayProgressStep;
// this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime);
// this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(),
// this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), Common.FOCUS_FLY_DURATION, 1.0); //焦点框跟上去
// return;
// }
this.keyDownDirection(Common.MOVE_DIRECTION_LEFT);
break;
case cc.macro.KEY.enter:
......
......@@ -353,6 +353,10 @@ cc.Class({
fiHotUpdateBtn.init('',false,null,null,1.0);
this._aFocusTargets[1]['hot_update_btn']=cc.find('update/update_panel/update_btn',this.node);
let fiCloseBtn=cc.find('update/update_panel/close_btn',this.node).addComponent(FocusInfo); //热更新按钮
fiCloseBtn.init('',false,null,null,1.0);
this._aFocusTargets[1]['hot_close_btn']=cc.find('update/update_panel/close_btn',this.node);
var nodeInitFocus = cc.find(this._oSceneContext.focusPath, this.node);
// cc.log("初始化 "+nodeInitFocus.name);
var nodeFocus = new cc.Node('nodeFocus');
......@@ -548,7 +552,7 @@ cc.Class({
case cc.macro.KEY.enter:
case cc.macro.KEY.space:
case Common.ANDROID_KEY.enter:
if (0 == this._fiCurrentFocus.node.name.indexOf('close')) {
if (0 == this._fiCurrentFocus.node.name.indexOf('close') || 0 == this._fiCurrentFocus.node.name.indexOf('close_btn')) {
this._iSceneStatus=0;
cc.find("update", this.node).active = false; //关闭更新面板
let fiAfterNode=cc.find(this._oSceneContext.focusPath,this.node).getComponent(FocusInfo); //热更新按钮
......@@ -743,6 +747,13 @@ cc.Class({
},
hotUpdate: function () {
//隐藏更新说明，显示更新进度条
cc.find("update/update_panel/infoLabel", this.node).active = false;
cc.find("update/update_panel/update_info", this.node).active = false;
cc.find("update/update_panel/ProgressLabel", this.node).active = true;
cc.find("update/update_panel/fileProgress", this.node).active = true;
cc.find("update/update_panel/filep", this.node).active = true;
if (this._am && !this._updating) {
this._am.setEventCallback(this.updateCb.bind(this));
......
{"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
{"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
......
......@@ -2,6 +2,6 @@
"engine_version": "2.0.10",
"has_native": true,
"project_type": "js",
"projectName": "fuse_apk",
"projectName": "super_child",
"packageName": "org.cocos2d.helloworld"
}
\ No newline at end of file
......
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/pb_progress"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="150dp"
android:layout_height="20dp"
android:layout_gravity="end|bottom"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="5dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="20dp"
android:visibility="invisible" />
</RelativeLayout>
\ No newline at end of file
......
<resources>
<string name="app_name" translatable="false">fuse_apk</string>
<string name="app_name" translatable="false">超级少儿</string>
</resources>
......
......@@ -34,6 +34,7 @@ import android.os.Bundle;
import android.content.Intent;
import android.content.res.Configuration;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ProgressBar;
import android.widget.Toast;
......@@ -41,12 +42,15 @@ import android.widget.Toast;
public class AppActivity extends Cocos2dxActivity {
private static final String TAG="AppActivity";
private static AppActivity _activity;
static ProgressBar pb_progress;
private static View view=null;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
view= LayoutInflater.from(this).inflate(R.layout.activity_main,null);
mFrameLayout.addView(view);
// setContentView(R.layout.activity_main);
pb_progress=findViewById(R.id.pb_progress);
_activity=this;
// Workaround in https://stackoverflow.com/questions/16283079/re-launch-of-activity-on-home-button-but-only-the-first-time/16447508
if (!isTaskRoot()) {
......@@ -151,6 +155,10 @@ public class AppActivity extends Cocos2dxActivity {
super.onStart();
}
public View getProgressBarView(){
return view;
}
public static void startGame(int i,String apkName,final String strJSCallBack){
Log.d(TAG,"AppActivity starGame start..."+apkName);
// if (pluginLoaded) {
......
......@@ -33,6 +33,7 @@ public class MyApplication extends TopdrawApplication {
TopdrawSDK.init(context,initListener);
PluginLoader.getInstance().init(getApplicationContext(), mHandler, TOPDRAW_API_PATH, "/plugin/plugin.json");
PluginLoader.getInstance().start();
}
public static Context getAppContext() { return context; }
......
......@@ -48,8 +48,9 @@ public class TopdrawSDKWrapper {
public static void startGame(int i,String apkName,final String strJSCallBack){
Log.d(TAG,"TopdrawSDKWrapper starGame start..."+apkName);
View view= LayoutInflater.from(_activity).inflate(R.layout.activity_main,null);
View view=_activity.getProgressBarView();
pb_progress=view.findViewById(R.id.pb_progress);
if (pluginLoaded) {
return;
}
......
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":fuse_apk" />
<option name="GRADLE_PROJECT_PATH" value=":super_child" />
</configuration>
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
......
include ':libcocos2dx'
project(':libcocos2dx').projectDir = new File('D:/CocosCreator_2.0.10/resources/cocos2d-x/cocos/platform/android/libcocos2dx')
include ':fuse_apk'
project(':fuse_apk').projectDir = new File(settingsDir, 'app')
include ':super_child'
project(':super_child').projectDir = new File(settingsDir, 'app')
......
//
// Prefix header for all source files of the 'fuse_apk' target in the 'fuse_apk' project
// Prefix header for all source files of the 'super_child' target in the 'super_child' project
//
#ifdef __OBJC__
......
......@@ -135,7 +135,7 @@
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>"; };
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>"; };
502380DB17EBB88200990C9B /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; };
509D4AAA17EBB24E00697056 /* fuse_apk-desktop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "fuse_apk-desktop.app"; sourceTree = BUILT_PRODUCTS_DIR; };
509D4AAA17EBB24E00697056 /* super_child-desktop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "super_child-desktop.app"; sourceTree = BUILT_PRODUCTS_DIR; };
509D4AAB17EBB2AB00697056 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = ios/AppController.h; sourceTree = "<group>"; };
509D4AAC17EBB2AB00697056 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppController.mm; path = ios/AppController.mm; sourceTree = "<group>"; };
509D4AB717EBB2AB00697056 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ios/Info.plist; sourceTree = "<group>"; };
......@@ -149,7 +149,7 @@
509D4AE617EBB81800697056 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
509D4AE817EBB82000697056 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
509D4AEA17EBB82600697056 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
A922753D1517C094001B78AA /* fuse_apk-mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "fuse_apk-mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A922753D1517C094001B78AA /* super_child-mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "super_child-mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A92275411517C094001B78AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
A92275431517C094001B78AA /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
A92275451517C094001B78AA /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
......@@ -299,8 +299,8 @@
A922753E1517C094001B78AA /* Products */ = {
isa = PBXGroup;
children = (
A922753D1517C094001B78AA /* fuse_apk-mobile.app */,
509D4AAA17EBB24E00697056 /* fuse_apk-desktop.app */,
A922753D1517C094001B78AA /* super_child-mobile.app */,
509D4AAA17EBB24E00697056 /* super_child-desktop.app */,
);
name = Products;
sourceTree = "<group>";
......@@ -383,9 +383,9 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
509D4A7517EBB24E00697056 /* fuse_apk-desktop */ = {
509D4A7517EBB24E00697056 /* super_child-desktop */ = {
isa = PBXNativeTarget;
buildConfigurationList = 509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "fuse_apk-desktop" */;
buildConfigurationList = 509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "super_child-desktop" */;
buildPhases = (
509D4A8017EBB24E00697056 /* Sources */,
509D4A9317EBB24E00697056 /* Resources */,
......@@ -396,14 +396,14 @@
dependencies = (
4DD5E6AA1CDAF6330046171E /* PBXTargetDependency */,
);
name = "fuse_apk-desktop";
productName = fuse_apk;
productReference = 509D4AAA17EBB24E00697056 /* fuse_apk-desktop.app */;
name = "super_child-desktop";
productName = super_child;
productReference = 509D4AAA17EBB24E00697056 /* super_child-desktop.app */;
productType = "com.apple.product-type.application";
};
A922753C1517C094001B78AA /* fuse_apk-mobile */ = {
A922753C1517C094001B78AA /* super_child-mobile */ = {
isa = PBXNativeTarget;
buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "fuse_apk-mobile" */;
buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "super_child-mobile" */;
buildPhases = (
A92275391517C094001B78AA /* Sources */,
A922753A1517C094001B78AA /* Frameworks */,
......@@ -414,9 +414,9 @@
dependencies = (
4DD5E6B01CDAF6520046171E /* PBXTargetDependency */,
);
name = "fuse_apk-mobile";
productName = fuse_apk;
productReference = A922753D1517C094001B78AA /* fuse_apk-mobile.app */;
name = "super_child-mobile";
productName = super_child;
productReference = A922753D1517C094001B78AA /* super_child-mobile.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
......@@ -427,7 +427,7 @@
attributes = {
LastUpgradeCheck = 0500;
};
buildConfigurationList = A92275371517C094001B78AA /* Build configuration list for PBXProject "fuse_apk" */;
buildConfigurationList = A92275371517C094001B78AA /* Build configuration list for PBXProject "super_child" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
......@@ -447,8 +447,8 @@
);
projectRoot = "";
targets = (
A922753C1517C094001B78AA /* fuse_apk-mobile */,
509D4A7517EBB24E00697056 /* fuse_apk-desktop */,
A922753C1517C094001B78AA /* super_child-mobile */,
509D4A7517EBB24E00697056 /* super_child-desktop */,
);
};
/* End PBXProject section */
......@@ -733,7 +733,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "fuse_apk-desktop" */ = {
509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "super_child-desktop" */ = {
isa = XCConfigurationList;
buildConfigurations = (
509D4AA817EBB24E00697056 /* Debug */,
......@@ -742,7 +742,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
A92275371517C094001B78AA /* Build configuration list for PBXProject "fuse_apk" */ = {
A92275371517C094001B78AA /* Build configuration list for PBXProject "super_child" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A92276FE1517C097001B78AA /* Debug */,
......@@ -751,7 +751,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "fuse_apk-mobile" */ = {
A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "super_child-mobile" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A92277011517C097001B78AA /* Debug */,
......
......@@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{3B0B58B1-2734-488E-A542-ECEC11EB2455}</ProjectGuid>
<RootNamespace>fuse_apk</RootNamespace>
<RootNamespace>super_child</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......
......@@ -3964,7 +3964,6 @@ this._iMaxVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppA
this.volumeValue.node.height = this._iVolumeContainerHeight * (o / this._iMaxVolume);
}
this.videoPlay.remoteURL = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8";
cc.log("-------------------------------\x3e" + cc.find("TopCanvas/VideoPlayer", this.node));
cc.find("VideoPlayer", this.node).on("ready-to-play", function(e) {
this.videoPlay.play();
this.playContainerCallback || (this.playContainerCallback = function() {
......@@ -3974,11 +3973,11 @@ this.unschedule(this.playContainerCallback);
this.playContainer.opacity = 255;
this.scheduleOnce(this.playContainerCallback, 5);
}, this);
this.initFocus();
this.getProgramRequest();
this.getDefaultCollectRequest();
this.getMediaCollectionRequest();
this.getEpisodeRequest();
this.initFocus();
this.playTheSong();
},
onVideoPlayerEvent: function(e, t) {
......@@ -4264,7 +4263,6 @@ var r = new cc.Node("nodeFocus");
this.node.addChild(r, 10);
this._cFocus = this.node.getChildByName("nodeFocus").addComponent(c);
this._cFocus.init("focusContainer", this, this.playOrPauseIcon.getComponent(a), o.SCREEN_WIDTH, o.SCREEN_HEIGHT, 6, 4, 1);
this._cFocus.hide();
},
keyDownDirection: function(e) {
var t = null, i = this._fiCurrentFocus;
......@@ -4291,54 +4289,21 @@ this.scheduleOnce(this.playContainerCallback, 5);
switch (e.keyCode) {
case cc.macro.KEY.up:
case o.ANDROID_KEY.up:
if (0 == this._fiCurrentFocus.node.name.indexOf("VolumeIcon")) {
var i = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "raiseVolume", "()I");
if (this.volumeValue.node.height < this._iVolumeContainerHeight) {
this.volumeValue.node.height = this._iVolumeContainerHeight * (i / this._iMaxVolume);
this.unschedule(this.volumeControlCallback);
this.volumeControl.opacity = 255;
this.scheduleOnce(this.volumeControlCallback, 3);
}
return;
}
this.keyDownDirection(o.MOVE_DIRECTION_UP);
break;
case cc.macro.KEY.right:
case o.ANDROID_KEY.right:
if (0 == this._fiCurrentFocus.node.name.indexOf("ProgressBarIcon")) {
this.videoPlay.currentTime += this._iPlayProgressStep;
this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime);
this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), o.FOCUS_FLY_DURATION, 1);
return;
}
this.keyDownDirection(o.MOVE_DIRECTION_RIGHT);
break;
case cc.macro.KEY.down:
case o.ANDROID_KEY.down:
if (0 == this._fiCurrentFocus.node.name.indexOf("VolumeIcon")) {
i = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "lowerVolume", "()I");
if (this.volumeValue.node.height > 0) {
this.volumeValue.node.height = this._iVolumeContainerHeight * (i / this._iMaxVolume);
this.unschedule(this.volumeControlCallback);
this.volumeControl.opacity = 255;
this.scheduleOnce(this.volumeControlCallback, 3);
this.videoPlay.volume = Math.floor(10 * (this.videoPlay.volume - .1)) / 10;
return;
}
}
this.keyDownDirection(o.MOVE_DIRECTION_DOWN);
break;
case cc.macro.KEY.left:
case o.ANDROID_KEY.left:
if (0 == this._fiCurrentFocus.node.name.indexOf("ProgressBarIcon")) {
this.videoPlay.currentTime -= this._iPlayProgressStep;
this.playProgressBarValue.node.width = this._iPlayContainerWidth * (this.videoPlay.currentTime / this._iVideoPlayTotalTime);
this._cFocus.fly(this.playProgressBarValue.node.width, this._fiCurrentFocus.getTop(), this._fiCurrentFocus.getWidth(), this._fiCurrentFocus.getHeight(), o.FOCUS_FLY_DURATION, 1);
return;
}
this.keyDownDirection(o.MOVE_DIRECTION_LEFT);
break;
......@@ -5231,6 +5196,8 @@ cc.find("update/update_panel/close", this.node).addComponent(a).init("", !1, nul
this._aFocusTargets[1].hot_update_close = cc.find("update/update_panel/close", this.node);
cc.find("update/update_panel/update_btn", this.node).addComponent(a).init("", !1, null, null, 1);
this._aFocusTargets[1].hot_update_btn = cc.find("update/update_panel/update_btn", this.node);
cc.find("update/update_panel/close_btn", this.node).addComponent(a).init("", !1, null, null, 1);
this._aFocusTargets[1].hot_close_btn = cc.find("update/update_panel/close_btn", this.node);
var t = cc.find(this._oSceneContext.focusPath, this.node), i = new cc.Node("nodeFocus");
this.node.addChild(i, 10);
this._cFocus = this.node.getChildByName("nodeFocus").addComponent(c);
......@@ -5344,7 +5311,7 @@ break;
case cc.macro.KEY.enter:
case cc.macro.KEY.space:
case o.ANDROID_KEY.enter:
if (0 == this._fiCurrentFocus.node.name.indexOf("close")) {
if (0 == this._fiCurrentFocus.node.name.indexOf("close") || 0 == this._fiCurrentFocus.node.name.indexOf("close_btn")) {
this._iSceneStatus = 0;
cc.find("update", this.node).active = !1;
var s = cc.find(this._oSceneContext.focusPath, this.node).getComponent(a);
......@@ -5454,6 +5421,11 @@ this._checkListener = null;
this._updating = !1;
},
hotUpdate: function() {
cc.find("update/update_panel/infoLabel", this.node).active = !1;
cc.find("update/update_panel/update_info", this.node).active = !1;
cc.find("update/update_panel/ProgressLabel", this.node).active = !0;
cc.find("update/update_panel/fileProgress", this.node).active = !0;
cc.find("update/update_panel/filep", this.node).active = !0;
if (this._am && !this._updating) {
this._am.setEventCallback(this.updateCb.bind(this));
if (this._am.getState() === jsb.AssetsManager.State.UNINITED) {
......
// 在 main.js 的开头添加如下代码
if (jsb) {
var hotUpdateSearchPaths = localStorage.getItem('HotUpdateSearchPaths');
if (hotUpdateSearchPaths) {
jsb.fileUtils.setSearchPaths(JSON.parse(hotUpdateSearchPaths));
}
}
// QQPlay window need to be inited first
if (false) {
BK.Script.loadlib('GameRes://libs/qqplay-adapter.js');
......
{"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
{"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
......
......@@ -36,7 +36,7 @@
"zip": false
},
"startScene": "2d2f792f-a40c-49bb-a189-ed176a246e49",
"title": "fuse_apk",
"title": "super_child",
"webOrientation": "auto",
"wechatgame": {
"REMOTE_SERVER_ROOT": "",
......