Commit 437fa1e5 437fa1e526290a196cc85f8d66eda01e7a07fe93 by jinwawa

repair backSceneStataus error

1 parent 0e6e01b2
......@@ -2,6 +2,6 @@
"ver": "1.0.1",
"uuid": "2d2f792f-a40c-49bb-a189-ed176a246e49",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
}
\ No newline at end of file
......
......@@ -2,6 +2,6 @@
"ver": "1.0.1",
"uuid": "0dec88e2-5146-48a2-8323-0d79c11639fd",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
}
\ No newline at end of file
......
......@@ -2,6 +2,6 @@
"ver": "1.0.1",
"uuid": "a98c2353-3f02-4eaa-a846-e2f966e3e9b9",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
}
\ No newline at end of file
......
......@@ -2,6 +2,6 @@
"ver": "1.0.1",
"uuid": "ae592cc7-1e5d-4148-8290-3ccca61fefba",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
}
\ No newline at end of file
......
......@@ -2,6 +2,6 @@
"ver": "1.0.1",
"uuid": "e126087d-d289-44c5-a274-4c82171fdfa8",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
}
\ No newline at end of file
......
......@@ -2,6 +2,6 @@
"ver": "1.0.1",
"uuid": "49547f78-96a5-4d83-a99c-6cbb17e57df6",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
}
\ No newline at end of file
......
......@@ -2,6 +2,6 @@
"ver": "1.0.1",
"uuid": "af071f9f-20c1-46f7-815f-db43875c0588",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
}
\ No newline at end of file
......
......@@ -2,6 +2,6 @@
"ver": "1.0.1",
"uuid": "86937e8d-f82c-4b9e-b602-c2eacc4b0abb",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
}
\ No newline at end of file
......
......@@ -52,12 +52,12 @@ cc.Class({
this._strAppId = oSceneParameter.appId;//应用id
}
//恢复上下文
if (this._cApplication.getBackStatus()) { //回退界面回来时,把之前的找回来
this._oSceneContext = this._cApplication.popSceneContext();
this._cApplication.setBackStatus(false);
this._bBackStatus = true;
this._strAppId = this._oSceneContext.appId;
} else {
// if (this._cApplication.getBackStatus()) { //回退界面回来时,把之前的找回来
// this._oSceneContext = this._cApplication.popSceneContext();
// this._cApplication.setBackStatus(false);
// this._bBackStatus = true;
// this._strAppId = this._oSceneContext.appId;
// } else {
this._oSceneContext = {};
this._oSceneContext.focusPath = "NaviList/NaviCell0";
this._oSceneContext.iNaviIndex = 0;
......@@ -67,7 +67,7 @@ cc.Class({
this._oSceneContext.typeListY = 0;
this._oSceneContext.appId = "";
// this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id
}
// }
//-----上下文及参数处理结束---------
this._oInit = {
......@@ -148,10 +148,8 @@ cc.Class({
} else {
cc.log("Business Error:get nav..." + oJSONResult.description);
}
this._oInit.bIsNaviDataInit = true;
this.initNaviList();
if (this._oInit.bIsNaviDataInit) {
// this.initData();
this.getTypeList();
......
......@@ -50,10 +50,10 @@ cc.Class({
this._strAppId = oSceneParameter.appId;//应用id
}
//恢复上下文
if (this._cApplication.getBackStatus()) {
this._oSceneContext = this._cApplication.popSceneContext();
this._cApplication.setBackStatus(false);
} else {
// if (this._cApplication.getBackStatus()) {
// this._oSceneContext = this._cApplication.popSceneContext();
// this._cApplication.setBackStatus(false);
// } else {
this._oSceneContext = {};
this._oSceneContext.requestedTypeId = null;
this._oSceneContext._iCurrentTypeIndex = 0;
......@@ -61,7 +61,7 @@ cc.Class({
this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/TypeListCell0";
this._oSceneContext.typeListY = 0;
// this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id
}
// }
this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试
//---------上下文及参数相关处理结束-----------
......
......@@ -21,15 +21,15 @@ cc.Class({
this._strAppId = oSceneParameter.appId;//应用id
}
//从其他界面退回来的
if (this._cApplication.getBackStatus()) {
this._oSceneContext = this._cApplication.popSceneContext();
this._cApplication.setBackStatus(false);
} else {
// if (this._cApplication.getBackStatus()) {
// this._oSceneContext = this._cApplication.popSceneContext();
// this._cApplication.setBackStatus(false);
// } else {
this._oSceneContext = {};
// this._oSceneContext.iRecordKeyDownOperation = 0; //记录用户上下左右操作记录,目的是为了解决用户回退界面焦点框位置不准确问题
this._oSceneContext.categoryRecordIndexOfFirstCell = 0;
this._oSceneContext.focusPath = "CategoryList/DataContainerMask/DataContainer/StarListCell0";
}
// }
//---------上下文及参数相关处理结束-----------
this._nodeCategoryList = this.node.getChildByName('CategoryList');
let lvCategoryList = this._nodeCategoryList.addComponent(ListView);
......
......@@ -41,10 +41,10 @@ cc.Class({
this._strAppId = oSceneParameter.appId;//应用id
}
//恢复上下文
if (this._cApplication.getBackStatus()) {
this._oSceneContext = this._cApplication.popSceneContext();
this._cApplication.setBackStatus(false);
} else {
// if (this._cApplication.getBackStatus()) {
// this._oSceneContext = this._cApplication.popSceneContext();
// this._cApplication.setBackStatus(false);
// } else {
this._oSceneContext = {};
this._oSceneContext.requestedTypeId = null;
this._oSceneContext._iCurrentTypeIndex = 0;
......@@ -52,7 +52,7 @@ cc.Class({
this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/TypeListCell0";
this._oSceneContext.typeListY = 0;
// this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id
}
// }
this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试
//---------上下文及参数相关处理结束-----------
......
......@@ -55,16 +55,16 @@ cc.Class({
this._iMediaId = oSceneParameter.id;
}
//恢复上下文
if (this._cApplication.getBackStatus()) {
this._oSceneContext = this._cApplication.popSceneContext();
this._cApplication.setBackStatus(false);
} else {
// if (this._cApplication.getBackStatus()) {
// this._oSceneContext = this._cApplication.popSceneContext();
// this._cApplication.setBackStatus(false);
// } else {
this._oSceneContext = {};
this._oSceneContext.currentPage = 1;
this._oSceneContext.requestedStart = 0;
this._oSceneContext._nodeGatherNumListX = 0;
// this._oSceneContext.elderTypeId = oSceneParameter.typeId || 37; //从上级拿过来的二级父Id
}
// }
this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试
this._iMediaId = this._iMediaId || 3050;
......
......@@ -112,7 +112,7 @@ cc.Class({
this._iMaxVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "maxVolume", "()I");//反射获取系统音量
this.volumeValue.node.height = this._iVolumeContainerHeight * (iCurrentVolume / this._iMaxVolume);//更新声音进度条
}
this.videoPlay.remoteURL = "http://vjs.zencdn.net/v/oceans.mp4"; //测试播放器(不能播放m3u8即ts格式视频)
this.videoPlay.remoteURL = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; //测试播放器
cc.log("------------------------------->"+cc.find("TopCanvas/VideoPlayer", this.node));
cc.find("VideoPlayer", this.node).on('ready-to-play', function (event) {
......
......@@ -45,18 +45,18 @@ cc.Class({
this._strAppId = oSceneParameter.appId;//应用id
}
//恢复上下文
if (this._cApplication.getBackStatus()) {
this._oSceneContext = this._cApplication.popSceneContext();
this._cApplication.setBackStatus(false);
this._bBackStatus = true;
} else {
// if (this._cApplication.getBackStatus()) {
// this._oSceneContext = this._cApplication.popSceneContext();
// this._cApplication.setBackStatus(false);
// this._bBackStatus = true;
// } else {
this._oSceneContext = {};
this._oSceneContext._iCurrentTypeIndex = 0;
this._oSceneContext.categoryRecordIndexOfFirstCell = 0;
this._oSceneContext.nodeTypeListX = 0;
this._oSceneContext.focusPath = "KeywordsDelete";
this._oSceneContext.elderTypeId = (oSceneParameter != null ? oSceneParameter.elderTypeId : 0) || 37; //从上级拿过来的二级父Id
}
// }
this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试
//---------上下文及参数相关处理结束-----------
......
......@@ -12,7 +12,7 @@
android:layout_marginEnd="5dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="20dp"
android:visibility="visible" />
android:visibility="invisible" />
</RelativeLayout>
\ No newline at end of file
......
......@@ -86,6 +86,9 @@ public class TopdrawSDKWrapper {
@Override
public void run() {
int pg = Double.valueOf(d).intValue();
if(pg==1){
Toast.makeText(_activity,"下载中...",Toast.LENGTH_SHORT).show();
}
if (100 == pg) {
pb_progress.setVisibility(View.INVISIBLE);
} else {
......
// 在 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');
......