Skip to content

金学艇 / ChildEdu

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 437fa1e5 437fa1e526290a196cc85f8d66eda01e7a07fe93 by jinwawa
Options

repair backSceneStataus error

1 parent 0e6e01b2
Expand all
Inline Side-by-side
Showing 29 changed files with 46 additions and 53 deletions
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 "ver": "1.0.1", 2 "ver": "1.0.1",
3 "uuid": "2d2f792f-a40c-49bb-a189-ed176a246e49", 3 "uuid": "2d2f792f-a40c-49bb-a189-ed176a246e49",
4 "asyncLoadAssets": false, 4 "asyncLoadAssets": false,
5 "autoReleaseAssets": false, 5 "autoReleaseAssets": true,
6 "subMetas": {} 6 "subMetas": {}
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 "ver": "1.0.1", 2 "ver": "1.0.1",
3 "uuid": "0dec88e2-5146-48a2-8323-0d79c11639fd", 3 "uuid": "0dec88e2-5146-48a2-8323-0d79c11639fd",
4 "asyncLoadAssets": false, 4 "asyncLoadAssets": false,
5 "autoReleaseAssets": false, 5 "autoReleaseAssets": true,
6 "subMetas": {} 6 "subMetas": {}
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 "ver": "1.0.1", 2 "ver": "1.0.1",
3 "uuid": "a98c2353-3f02-4eaa-a846-e2f966e3e9b9", 3 "uuid": "a98c2353-3f02-4eaa-a846-e2f966e3e9b9",
4 "asyncLoadAssets": false, 4 "asyncLoadAssets": false,
5 "autoReleaseAssets": false, 5 "autoReleaseAssets": true,
6 "subMetas": {} 6 "subMetas": {}
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 "ver": "1.0.1", 2 "ver": "1.0.1",
3 "uuid": "ae592cc7-1e5d-4148-8290-3ccca61fefba", 3 "uuid": "ae592cc7-1e5d-4148-8290-3ccca61fefba",
4 "asyncLoadAssets": false, 4 "asyncLoadAssets": false,
5 "autoReleaseAssets": false, 5 "autoReleaseAssets": true,
6 "subMetas": {} 6 "subMetas": {}
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 "ver": "1.0.1", 2 "ver": "1.0.1",
3 "uuid": "e126087d-d289-44c5-a274-4c82171fdfa8", 3 "uuid": "e126087d-d289-44c5-a274-4c82171fdfa8",
4 "asyncLoadAssets": false, 4 "asyncLoadAssets": false,
5 "autoReleaseAssets": false, 5 "autoReleaseAssets": true,
6 "subMetas": {} 6 "subMetas": {}
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 "ver": "1.0.1", 2 "ver": "1.0.1",
3 "uuid": "49547f78-96a5-4d83-a99c-6cbb17e57df6", 3 "uuid": "49547f78-96a5-4d83-a99c-6cbb17e57df6",
4 "asyncLoadAssets": false, 4 "asyncLoadAssets": false,
5 "autoReleaseAssets": false, 5 "autoReleaseAssets": true,
6 "subMetas": {} 6 "subMetas": {}
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 "ver": "1.0.1", 2 "ver": "1.0.1",
3 "uuid": "af071f9f-20c1-46f7-815f-db43875c0588", 3 "uuid": "af071f9f-20c1-46f7-815f-db43875c0588",
4 "asyncLoadAssets": false, 4 "asyncLoadAssets": false,
5 "autoReleaseAssets": false, 5 "autoReleaseAssets": true,
6 "subMetas": {} 6 "subMetas": {}
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 "ver": "1.0.1", 2 "ver": "1.0.1",
3 "uuid": "86937e8d-f82c-4b9e-b602-c2eacc4b0abb", 3 "uuid": "86937e8d-f82c-4b9e-b602-c2eacc4b0abb",
4 "asyncLoadAssets": false, 4 "asyncLoadAssets": false,
5 "autoReleaseAssets": false, 5 "autoReleaseAssets": true,
6 "subMetas": {} 6 "subMetas": {}
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -52,12 +52,12 @@ cc.Class({ ...@@ -52,12 +52,12 @@ cc.Class({
52 this._strAppId = oSceneParameter.appId;//应用id 52 this._strAppId = oSceneParameter.appId;//应用id
53 } 53 }
54 //恢复上下文 54 //恢复上下文
55 if (this._cApplication.getBackStatus()) { //回退界面回来时，把之前的找回来 55 // if (this._cApplication.getBackStatus()) { //回退界面回来时，把之前的找回来
56 this._oSceneContext = this._cApplication.popSceneContext(); 56 // this._oSceneContext = this._cApplication.popSceneContext();
57 this._cApplication.setBackStatus(false); 57 // this._cApplication.setBackStatus(false);
58 this._bBackStatus = true; 58 // this._bBackStatus = true;
59 this._strAppId = this._oSceneContext.appId; 59 // this._strAppId = this._oSceneContext.appId;
60 } else { 60 // } else {
61 this._oSceneContext = {}; 61 this._oSceneContext = {};
62 this._oSceneContext.focusPath = "NaviList/NaviCell0"; 62 this._oSceneContext.focusPath = "NaviList/NaviCell0";
63 this._oSceneContext.iNaviIndex = 0; 63 this._oSceneContext.iNaviIndex = 0;
...@@ -67,7 +67,7 @@ cc.Class({ ...@@ -67,7 +67,7 @@ cc.Class({
67 this._oSceneContext.typeListY = 0; 67 this._oSceneContext.typeListY = 0;
68 this._oSceneContext.appId = ""; 68 this._oSceneContext.appId = "";
69 // this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id 69 // this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id
70 } 70 // }
71 //-----上下文及参数处理结束--------- 71 //-----上下文及参数处理结束---------
72 72
73 this._oInit = { 73 this._oInit = {
...@@ -148,10 +148,8 @@ cc.Class({ ...@@ -148,10 +148,8 @@ cc.Class({
148 } else { 148 } else {
149 cc.log("Business Error:get nav..." + oJSONResult.description); 149 cc.log("Business Error:get nav..." + oJSONResult.description);
150 } 150 }
151
152 this._oInit.bIsNaviDataInit = true; 151 this._oInit.bIsNaviDataInit = true;
153 this.initNaviList(); 152 this.initNaviList();
154
155 if (this._oInit.bIsNaviDataInit) { 153 if (this._oInit.bIsNaviDataInit) {
156 // this.initData(); 154 // this.initData();
157 this.getTypeList(); 155 this.getTypeList();
......
...@@ -50,10 +50,10 @@ cc.Class({ ...@@ -50,10 +50,10 @@ cc.Class({
50 this._strAppId = oSceneParameter.appId;//应用id 50 this._strAppId = oSceneParameter.appId;//应用id
51 } 51 }
52 //恢复上下文 52 //恢复上下文
53 if (this._cApplication.getBackStatus()) { 53 // if (this._cApplication.getBackStatus()) {
54 this._oSceneContext = this._cApplication.popSceneContext(); 54 // this._oSceneContext = this._cApplication.popSceneContext();
55 this._cApplication.setBackStatus(false); 55 // this._cApplication.setBackStatus(false);
56 } else { 56 // } else {
57 this._oSceneContext = {}; 57 this._oSceneContext = {};
58 this._oSceneContext.requestedTypeId = null; 58 this._oSceneContext.requestedTypeId = null;
59 this._oSceneContext._iCurrentTypeIndex = 0; 59 this._oSceneContext._iCurrentTypeIndex = 0;
...@@ -61,7 +61,7 @@ cc.Class({ ...@@ -61,7 +61,7 @@ cc.Class({
61 this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/TypeListCell0"; 61 this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/TypeListCell0";
62 this._oSceneContext.typeListY = 0; 62 this._oSceneContext.typeListY = 0;
63 // this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id 63 // this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id
64 } 64 // }
65 65
66 this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试 66 this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试
67 //---------上下文及参数相关处理结束----------- 67 //---------上下文及参数相关处理结束-----------
......
...@@ -21,15 +21,15 @@ cc.Class({ ...@@ -21,15 +21,15 @@ cc.Class({
21 this._strAppId = oSceneParameter.appId;//应用id 21 this._strAppId = oSceneParameter.appId;//应用id
22 } 22 }
23 //从其他界面退回来的 23 //从其他界面退回来的
24 if (this._cApplication.getBackStatus()) { 24 // if (this._cApplication.getBackStatus()) {
25 this._oSceneContext = this._cApplication.popSceneContext(); 25 // this._oSceneContext = this._cApplication.popSceneContext();
26 this._cApplication.setBackStatus(false); 26 // this._cApplication.setBackStatus(false);
27 } else { 27 // } else {
28 this._oSceneContext = {}; 28 this._oSceneContext = {};
29 // this._oSceneContext.iRecordKeyDownOperation = 0; //记录用户上下左右操作记录，目的是为了解决用户回退界面焦点框位置不准确问题 29 // this._oSceneContext.iRecordKeyDownOperation = 0; //记录用户上下左右操作记录，目的是为了解决用户回退界面焦点框位置不准确问题
30 this._oSceneContext.categoryRecordIndexOfFirstCell = 0; 30 this._oSceneContext.categoryRecordIndexOfFirstCell = 0;
31 this._oSceneContext.focusPath = "CategoryList/DataContainerMask/DataContainer/StarListCell0"; 31 this._oSceneContext.focusPath = "CategoryList/DataContainerMask/DataContainer/StarListCell0";
32 } 32 // }
33 //---------上下文及参数相关处理结束----------- 33 //---------上下文及参数相关处理结束-----------
34 this._nodeCategoryList = this.node.getChildByName('CategoryList'); 34 this._nodeCategoryList = this.node.getChildByName('CategoryList');
35 let lvCategoryList = this._nodeCategoryList.addComponent(ListView); 35 let lvCategoryList = this._nodeCategoryList.addComponent(ListView);
......
...@@ -41,10 +41,10 @@ cc.Class({ ...@@ -41,10 +41,10 @@ cc.Class({
41 this._strAppId = oSceneParameter.appId;//应用id 41 this._strAppId = oSceneParameter.appId;//应用id
42 } 42 }
43 //恢复上下文 43 //恢复上下文
44 if (this._cApplication.getBackStatus()) { 44 // if (this._cApplication.getBackStatus()) {
45 this._oSceneContext = this._cApplication.popSceneContext(); 45 // this._oSceneContext = this._cApplication.popSceneContext();
46 this._cApplication.setBackStatus(false); 46 // this._cApplication.setBackStatus(false);
47 } else { 47 // } else {
48 this._oSceneContext = {}; 48 this._oSceneContext = {};
49 this._oSceneContext.requestedTypeId = null; 49 this._oSceneContext.requestedTypeId = null;
50 this._oSceneContext._iCurrentTypeIndex = 0; 50 this._oSceneContext._iCurrentTypeIndex = 0;
...@@ -52,7 +52,7 @@ cc.Class({ ...@@ -52,7 +52,7 @@ cc.Class({
52 this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/TypeListCell0"; 52 this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/TypeListCell0";
53 this._oSceneContext.typeListY = 0; 53 this._oSceneContext.typeListY = 0;
54 // this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id 54 // this._oSceneContext.elderTypeId = oSceneParameter.elderTypeId || 37; //从上级拿过来的二级父Id
55 } 55 // }
56 56
57 this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试 57 this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试
58 //---------上下文及参数相关处理结束----------- 58 //---------上下文及参数相关处理结束-----------
......
...@@ -55,16 +55,16 @@ cc.Class({ ...@@ -55,16 +55,16 @@ cc.Class({
55 this._iMediaId = oSceneParameter.id; 55 this._iMediaId = oSceneParameter.id;
56 } 56 }
57 //恢复上下文 57 //恢复上下文
58 if (this._cApplication.getBackStatus()) { 58 // if (this._cApplication.getBackStatus()) {
59 this._oSceneContext = this._cApplication.popSceneContext(); 59 // this._oSceneContext = this._cApplication.popSceneContext();
60 this._cApplication.setBackStatus(false); 60 // this._cApplication.setBackStatus(false);
61 } else { 61 // } else {
62 this._oSceneContext = {}; 62 this._oSceneContext = {};
63 this._oSceneContext.currentPage = 1; 63 this._oSceneContext.currentPage = 1;
64 this._oSceneContext.requestedStart = 0; 64 this._oSceneContext.requestedStart = 0;
65 this._oSceneContext._nodeGatherNumListX = 0; 65 this._oSceneContext._nodeGatherNumListX = 0;
66 // this._oSceneContext.elderTypeId = oSceneParameter.typeId || 37; //从上级拿过来的二级父Id 66 // this._oSceneContext.elderTypeId = oSceneParameter.typeId || 37; //从上级拿过来的二级父Id
67 } 67 // }
68 68
69 this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试 69 this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试
70 this._iMediaId = this._iMediaId || 3050; 70 this._iMediaId = this._iMediaId || 3050;
......
...@@ -112,7 +112,7 @@ cc.Class({ ...@@ -112,7 +112,7 @@ cc.Class({
112 this._iMaxVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "maxVolume", "()I");//反射获取系统音量 112 this._iMaxVolume = jsb.reflection.callStaticMethod("org/cocos2dx/javascript/AppActivity", "maxVolume", "()I");//反射获取系统音量
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://vjs.zencdn.net/v/oceans.mp4"; //测试播放器(不能播放m3u8即ts格式视频) 115 this.videoPlay.remoteURL = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; //测试播放器
116 116
117 cc.log("------------------------------->"+cc.find("TopCanvas/VideoPlayer", this.node)); 117 cc.log("------------------------------->"+cc.find("TopCanvas/VideoPlayer", this.node));
118 cc.find("VideoPlayer", this.node).on('ready-to-play', function (event) { 118 cc.find("VideoPlayer", this.node).on('ready-to-play', function (event) {
......
...@@ -45,18 +45,18 @@ cc.Class({ ...@@ -45,18 +45,18 @@ cc.Class({
45 this._strAppId = oSceneParameter.appId;//应用id 45 this._strAppId = oSceneParameter.appId;//应用id
46 } 46 }
47 //恢复上下文 47 //恢复上下文
48 if (this._cApplication.getBackStatus()) { 48 // if (this._cApplication.getBackStatus()) {
49 this._oSceneContext = this._cApplication.popSceneContext(); 49 // this._oSceneContext = this._cApplication.popSceneContext();
50 this._cApplication.setBackStatus(false); 50 // this._cApplication.setBackStatus(false);
51 this._bBackStatus = true; 51 // this._bBackStatus = true;
52 } else { 52 // } else {
53 this._oSceneContext = {}; 53 this._oSceneContext = {};
54 this._oSceneContext._iCurrentTypeIndex = 0; 54 this._oSceneContext._iCurrentTypeIndex = 0;
55 this._oSceneContext.categoryRecordIndexOfFirstCell = 0; 55 this._oSceneContext.categoryRecordIndexOfFirstCell = 0;
56 this._oSceneContext.nodeTypeListX = 0; 56 this._oSceneContext.nodeTypeListX = 0;
57 this._oSceneContext.focusPath = "KeywordsDelete"; 57 this._oSceneContext.focusPath = "KeywordsDelete";
58 this._oSceneContext.elderTypeId = (oSceneParameter != null ? oSceneParameter.elderTypeId : 0) || 37; //从上级拿过来的二级父Id 58 this._oSceneContext.elderTypeId = (oSceneParameter != null ? oSceneParameter.elderTypeId : 0) || 37; //从上级拿过来的二级父Id
59 } 59 // }
60 60
61 this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试 61 this._strAppId = this._strAppId || "tda7e47f868313d9f5"; //测试
62 //---------上下文及参数相关处理结束----------- 62 //---------上下文及参数相关处理结束-----------
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 android:layout_marginEnd="5dp" 12 android:layout_marginEnd="5dp"
13 android:layout_marginRight="5dp" 13 android:layout_marginRight="5dp"
14 android:layout_marginBottom="20dp" 14 android:layout_marginBottom="20dp"
15 android:visibility="visible" /> 15 android:visibility="invisible" />
16 16
17 17
18 </RelativeLayout> 18 </RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -86,6 +86,9 @@ public class TopdrawSDKWrapper { ...@@ -86,6 +86,9 @@ public class TopdrawSDKWrapper {
86 @Override 86 @Override
87 public void run() { 87 public void run() {
88 int pg = Double.valueOf(d).intValue(); 88 int pg = Double.valueOf(d).intValue();
89 if(pg==1){
90 Toast.makeText(_activity,"下载中...",Toast.LENGTH_SHORT).show();
91 }
89 if (100 == pg) { 92 if (100 == pg) {
90 pb_progress.setVisibility(View.INVISIBLE); 93 pb_progress.setVisibility(View.INVISIBLE);
91 } else { 94 } else {
......
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
9 // QQPlay window need to be inited first 1 // QQPlay window need to be inited first
10 if (false) { 2 if (false) {
11 BK.Script.loadlib('GameRes://libs/qqplay-adapter.js'); 3 BK.Script.loadlib('GameRes://libs/qqplay-adapter.js');
......