1.修改分类页

@@ -17,7 +17,7 @@
         "__id__": 2
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [],
     "_prefab": null,
     "_opacity": 255,
@@ -189,7 +189,7 @@
       "array": [
         0,
         0,
-        265.0037841796875,
+        271.0659484863281,
         0,
         0,
         0,
@@ -643,7 +643,7 @@
       "__type__": "TypedArray",
       "ctor": "Float32Array",
       "array": [
-        -485,
+        -505,
         -43,
         0,
         0,
@@ -951,7 +951,7 @@
     "alignMode": 2,
     "_target": null,
     "_alignFlags": 9,
-    "_left": 30,
+    "_left": 10,
     "_right": 0,
     "_top": 128,
     "_bottom": 0,
@@ -999,7 +999,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 900,
+      "width": 1000,
       "height": 650
     },
     "_anchorPoint": {
@@ -1023,7 +1023,7 @@
       "__type__": "TypedArray",
       "ctor": "Float32Array",
       "array": [
-        148.5,
+        90,
         -35,
         0,
         0,
@@ -1077,7 +1077,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 900,
+      "width": 1020,
       "height": 650
     },
     "_anchorPoint": {
@@ -1147,7 +1147,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 900,
+      "width": 1000,
       "height": 650
     },
     "_anchorPoint": {
@@ -2114,7 +2114,7 @@
     "alignMode": 1,
     "_target": null,
     "_alignFlags": 12,
-    "_left": 338.5,
+    "_left": 230,
     "_right": 0,
     "_top": 119,
     "_bottom": 0,

@@ -57,7 +57,7 @@
     "_is3DNode": true,
     "_groupIndex": 0,
     "groupIndex": 0,
-    "autoReleaseAssets": true,
+    "autoReleaseAssets": false,
     "_id": "77eede39-2337-45ac-ba31-eb6e433ff217"
   },
   {
@@ -207,7 +207,7 @@
       "array": [
         0,
         0,
-        265.0037841796875,
+        271.0659484863281,
         0,
         0,
         0,
@@ -602,7 +602,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 216,
+      "width": 0,
       "height": 63
     },
     "_anchorPoint": {
@@ -614,7 +614,7 @@
       "__type__": "TypedArray",
       "ctor": "Float32Array",
       "array": [
-        120,
+        12,
         272.5,
         0,
         0,
@@ -1345,7 +1345,7 @@
       "__type__": "TypedArray",
       "ctor": "Float32Array",
       "array": [
-        -78,
+        30,
         -36.400001525878906,
         0,
         0,
@@ -1469,7 +1469,7 @@
       "__type__": "TypedArray",
       "ctor": "Float32Array",
       "array": [
-        54,
+        162,
         -36.400001525878906,
         0,
         0,
@@ -1593,7 +1593,7 @@
       "__type__": "TypedArray",
       "ctor": "Float32Array",
       "array": [
-        243,
+        351,
         -36.400001525878906,
         0,
         0,
@@ -1691,8 +1691,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "疯狂赛车手手",
-    "_N$string": "疯狂赛车手手",
+    "_string": "",
+    "_N$string": "",
     "_fontSize": 36,
     "_lineHeight": 50,
     "_enableWrapText": true,
@@ -2137,7 +2137,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 564,
-      "height": 60
+      "height": 120
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2149,7 +2149,7 @@
       "ctor": "Float32Array",
       "array": [
         294,
-        191,
+        161,
         0,
         0,
         0,
@@ -2260,8 +2260,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 52
+      "width": 264,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2272,8 +2272,8 @@
       "__type__": "TypedArray",
       "ctor": "Float32Array",
       "array": [
-        112,
-        13,
+        144,
+        10,
         0,
         0,
         0,
@@ -2313,7 +2313,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "2c3552e2-5961-4541-ab46-068aeabbf034"
+      "__uuid__": "74d68834-c4a7-44a8-b9e0-2fa2693ba5e4"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -2342,7 +2342,7 @@
     "_alignFlags": 9,
     "_left": 652,
     "_right": 0,
-    "_top": 321,
+    "_top": 300,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -2458,7 +2458,7 @@
       "__id__": 2
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 56
@@ -2530,9 +2530,7 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "431c5199-fa09-462c-8892-21eb3d0e0b89"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_sizeMode": 0,
     "_fillType": 0,
@@ -2576,7 +2574,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Label",
+    "_name": "NewLabel",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2

@@ -906,7 +906,7 @@
         "__id__": 35
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 40
@@ -2054,7 +2054,7 @@
       "__id__": 8
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 46

@@ -175,12 +175,12 @@ cc.Class({
             //     case BusinessParameter.CARTOON_APPID:
             // this._oSceneContext.focusPath = this._oSceneContext.focusPath || "SongList/DataContainerMask/DataContainer/ListCell0/SongTitleContainer";
             this._strSongListCellComponentName = "pfbCategoryListCell";
-            this._iBeginPositionX = -289.5;
+            this._iBeginPositionX = -350;
             this._iBeginPositionY = 196;
             this._iShowCellRows = 3;
             this._iAlphaCellRows = 0;
             this._iHiddenCellRows = 3;
-            this._iCellCountEachRow = 3;
+            this._iCellCountEachRow = 4;
             this._fCellMarginTop = 0;
             this._fCellMarginRight = 24;
             this._fCellMarginBottom = 16;

@@ -70,8 +70,8 @@ cc.Class({
         this._nodeTypeList.addComponent(TVScrollParameter);
 
         // cc.find("Desc/Collect", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 172, 56));
-        cc.find("ButtonOpen", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 278, 72));
-        cc.find("ButtonVip", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 572, 72));
+        cc.find("ButtonOpen", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 264, 100));
+        // cc.find("ButtonVip", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 572, 72));
         cc.find("FullView", this.node).zIndex = 100;
 
         this._nodeTypeListWrapper = cc.find("TypeListArea/TypeListWrapper", this.node);
@@ -281,8 +281,8 @@ cc.Class({
                         cc.find("Desc/LabelTime", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].updateTime;
                         //这里给描述做拦截，防止字数多超出栏目
                         var description = oJSONResult.resultSet[0].description;
-                        if (description.length > 55) {
-                            description = description.substring(0, 55) + "...";
+                        if (description.length > 110) {
+                            description = description.substring(0, 110) + "...";
                         }
                         cc.find("Desc/LabelDesc", this.node).getComponent(cc.Label).string = description;
                         //搞标签
@@ -369,7 +369,7 @@ cc.Class({
         if (0 == nodeInitFocus.name.indexOf('Button')) {
             this._cFocus.hide();
             cc.loader.loadRes("GameDetail/icon_button_open", cc.Texture2D, function (err, texture) {
-                nodeInitFocus.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 72, 278, 72));
+                nodeInitFocus.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 100, 264, 100));
             });
         }
 
@@ -510,7 +510,7 @@ cc.Class({
 
         if (0 == fiFrom.node.getName().indexOf('ButtonOpen')) {
             cc.loader.loadRes("GameDetail/icon_button_open", cc.Texture2D, function (err, texture) {
-                fiFrom.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, 278, 72));
+                fiFrom.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, 264, 100));
             });
         }
 
@@ -545,7 +545,7 @@ cc.Class({
         if (0 == fiTo.node.getName().indexOf('ButtonOpen')) {
             // fiTo.node.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
             cc.loader.loadRes("GameDetail/icon_button_open", cc.Texture2D, function (err, texture) {
-                fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 72, 278, 72));
+                fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 100, 264, 100));
             });
         }
 

@@ -37,6 +37,9 @@ cc.Class({
 
         cc.log("gameLoading包名：" + this._oSceneContext._downloadUrl);
 
+        if (!cc.sys.isNative) {
+            return;
+        }
         if (this._oSceneContext._downloadUrl && this._oSceneContext._downloadUrl != "undefined") { //如果有下载地址就启动奥比游戏
             jsb.reflection.callStaticMethod("com/topdraw/melody/TopdrawSDKWrapper", "startOBiGame", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", this._oSceneContext._downloadUrl, this._oSceneContext._packageName, this._oSceneContext._className, "updateProgress");
         } else {
@@ -51,7 +54,6 @@ cc.Class({
         let nodeBar = cc.find("ProgressBar/bar", this.node);
         nodeBar.width = strProgress / 100 * progressBarWidth;
 
-        // this._downloadUrl && this._downloadUrl != "undefined" && 
         if (strProgress == "100") {
             this._bIsFocusInit = true;
             this.backAScene();

@@ -208,9 +208,20 @@ cc.Class({
 
                     self.getTopNaviRequest("topNavi");
                     self.getTopNaviRequest("topCell");
-
                     self.getRecommendModelRequest();
-                    self.getRightRecommendRequest();   //
+
+                    //在这里选择是初始化首页瀑布流还是初始化其他导航的列表数据
+                    if (this._oSceneContext._iCurrentLeftIndex == 1) {
+                        cc.log("初始化瀑布流");
+                        self.getRightRecommendRequestData();
+                        cc.find("scrollContent/ViewPagerArea", this.node).active = true;
+                        cc.find("scrollContent/BlockShadow", this.node).active = true;
+                    } else {
+                        this.getSimulateRequest();
+                        cc.find("scrollContent/ViewPagerArea", this.node).active = false;
+                        cc.find("scrollContent/BlockShadow", this.node).active = false;
+                    }
+
                 } catch (error) {
                     cc.log("Business Exception:Get getMainLayoutJsonRequest..." + error);
                 }
@@ -361,16 +372,35 @@ cc.Class({
         }
     },
 
+    getRightRecommendRequestData: function () {
+        if (this._oInit.main_recommend) {
+            this.getRightRecommendRequest();
+            return;
+        }
+        Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/main_recommend.json", null, null,
+            function (strResponse) {
+                try {
+                    this._oInit.main_recommend = strResponse;
+                    this.getRightRecommendRequest();
+                } catch (error) {
+                    cc.log("Business Exception:Get getRightRecommendRequest..." + error);
+                }
+            },
+            function (strResponse) {
+                cc.log("Business Error:Get getRightRecommendRequest..." + strResponse);
+            }, this, "uuid");
+    },
+
     //渲染推荐框架
     getRightRecommendRequest: function () {
         var self = this;
         var rightNodeLayout = this.targetAry[1].target;
-        Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/main_recommend.json", null, null,
-            function (strResponse) {
+        // Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/main_recommend.json", null, null,
+        //     function (strResponse) {
         try {
             // var arrModules = waterfall_model.waterfall;     //拿到模拟数据
             // var arrModules = this.test_json.json;
-                    var arrModules = JSON.parse(strResponse);
+            var arrModules = JSON.parse(this._oInit.main_recommend);
             var bgHeight = 0;
             this._aBgHeight = [];
             this._aBgHeight.push(0);
@@ -596,20 +626,20 @@ cc.Class({
         } catch (error) {
             cc.log("Business Exception:Get getRightRecommendRequest..." + error);
         }
-            },
-            function (strResponse) {
-                cc.log("Business Error:Get getRightRecommendRequest..." + strResponse);
-            }, this, "uuid");
+        // },
+        // function (strResponse) {
+        //     cc.log("Business Error:Get getRightRecommendRequest..." + strResponse);
+        // }, this, "uuid");
     },
 
     recoverFocusPath: function () {
         if (this._oSceneContext._iCurrentLeftIndex == 1) {
             if (this._oSceneContext._iPageIndex == 1) {
-                this.scheduleOnce(()=>{
+                this.scheduleOnce(() => {
                     let fiFocusTarget = cc.find(this._oSceneContext.focusPath, this.node).getComponent(FocusInfo);
                     this._cFocus.flyFocus(this._fiCurrentFocus, fiFocusTarget, Common.MOVE_DIRECTION_DOWN, null, null);
                     return;
-                },0)
+                }, 0)
             }
             let height = this._aBgHeight[this._oSceneContext._iPageIndex - 1] || 0;   //-1,打补丁：解决回退回来页面对不上的bug
             this.onScrollViewScrollStart();
@@ -978,6 +1008,7 @@ cc.Class({
                     iTargetTopUp = fiFocusTarget.node.getParent().getComponent(cc.Widget).top;
                 }
                 // cc.log("目标节点： "+fiCurrentFocus.node.name);
+                if (this._aBgHeight && this._aBgHeight.length > 0) {
                     let iCurrentFloorBottomUp = this._aBgHeight[this._oSceneContext._iPageIndex - 1] || 0;//当前楼层底部高度
                     // cc.log(iCurrentFloorBottomUp + "目标节点的高度：" + iTargetTopUp);
                     if (this._bIsScrollViewMoving) {
@@ -1007,6 +1038,7 @@ cc.Class({
                             return;
                         }
                     }
+                }
                 this.keyDownDirection(Common.MOVE_DIRECTION_UP);
                 break;
             case cc.macro.KEY.right:
@@ -1041,6 +1073,7 @@ cc.Class({
                 } else if (fiFocusTarget.node.getParent().getComponent(cc.Widget)) {
                     iTargetTop = fiFocusTarget.node.getParent().getComponent(cc.Widget).top;
                 }
+                if (this._aBgHeight && this._aBgHeight.length > 0) {
                     let iCurrentFloorBottom = this._aBgHeight[this._oSceneContext._iPageIndex - 1] || 0;//当前楼层底部高度
                     // cc.log(iCurrentFloorBottom + "目标节点的高度：" + iTargetTop + "::" + this._oSceneContext._iPageIndex);
                     if (this._bIsScrollViewMoving) {
@@ -1070,6 +1103,7 @@ cc.Class({
                             return;
                         }
                     }
+                }
                 this.keyDownDirection(Common.MOVE_DIRECTION_DOWN);
                 break;
             case cc.macro.KEY.left:
@@ -1277,14 +1311,16 @@ cc.Class({
 
                 this._oSceneContext._iCurrentLeftIndex = iIndex;
                 this.scheduleOnce(function () {
-                    // this.requestMediaList(1);   //重新渲染CategoryList
                     this.getSimulateRequest();
                 }, 0);
-                // this.renderCategoryList(1);
 
                 var rightNodeLayout = this.targetAry[1].target;
 
                 if (iIndex == 1) {
+                    this.scheduleOnce(function () {
+                        // this.getRightRecommendRequestData();
+                    }, 0);
+
                     cc.find("scrollContent/ViewPagerArea", this.node).active = true;
                     cc.find("scrollContent/BlockShadow", this.node).active = true;
                     // cc.find("scrollContent/CategoryListRecommendLayout", this.node).active = false;
@@ -1513,11 +1549,11 @@ cc.Class({
                 // this.panel.byteProgress.progress = 0;
 
                 this._bAbleHotUpdate = true;
-                this._iSceneStatus = 1;       //焦点框跳转层级
-                cc.find("update", this.node).active = true;       //显示出来更新面板
-                this._cFocus.show();
-                let fiHotUpdateBtn = cc.find('update/update_panel/update_btn', this.node).getComponent(FocusInfo); //热更新按钮 
-                this._cFocus.flyFocus(this._fiCurrentFocus, fiHotUpdateBtn, Common.MOVE_DIRECTION_RIGHT, null, null);
+                // this._iSceneStatus = 1;       //焦点框跳转层级
+                // cc.find("update", this.node).active = true;       //显示出来更新面板
+                // this._cFocus.show();
+                // let fiHotUpdateBtn = cc.find('update/update_panel/update_btn', this.node).getComponent(FocusInfo); //热更新按钮 
+                // this._cFocus.flyFocus(this._fiCurrentFocus, fiHotUpdateBtn, Common.MOVE_DIRECTION_RIGHT, null, null);
 
                 break;
             default:
@@ -1528,9 +1564,9 @@ cc.Class({
         this._checkListener = null;
         this._updating = false;
 
-        // if (this._bAbleHotUpdate) {
-        //     this.hotUpdate();   //放在这里可以静默升级
-        // }
+        if (this._bAbleHotUpdate) {
+            this.hotUpdate();   //放在这里可以静默升级
+        }
     },
 
     hotUpdate: function () {

@@ -49,8 +49,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 270,
-      "height": 192
+      "width": 221,
+      "height": 176
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -128,8 +128,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 270,
-      "height": 152
+      "width": 221,
+      "height": 136
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -812,7 +812,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 270,
+      "width": 221,
       "height": 40
     },
     "_anchorPoint": {
@@ -825,7 +825,7 @@
       "ctor": "Float32Array",
       "array": [
         0,
-        -76,
+        -68,
         0,
         0,
         0,
@@ -876,7 +876,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 270,
+      "width": 221,
       "height": 40
     },
     "_anchorPoint": {
@@ -998,7 +998,7 @@
       "__type__": "TypedArray",
       "ctor": "Float32Array",
       "array": [
-        -125,
+        -100.5,
         0,
         0,
         0,
@@ -1165,7 +1165,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 270,
+      "width": 221,
       "height": 40
     },
     "_anchorPoint": {
@@ -1241,7 +1241,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 270,
+      "width": 221,
       "height": 40
     },
     "_anchorPoint": {
@@ -1590,7 +1590,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 250,
+      "width": 200,
       "height": 40
     },
     "_anchorPoint": {
@@ -1669,7 +1669,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 250,
+      "width": 200,
       "height": 40
     },
     "_anchorPoint": {
@@ -2123,7 +2123,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 250,
+      "width": 200,
       "height": 40
     },
     "_anchorPoint": {

@@ -173,7 +173,7 @@ public class TopdrawSDKWrapper {
                                 _activity.startActivity(intent);
                                 pluginLoaded = false;
 
-                                _activity.runOnUiThread(new Runnable() {        //直接加载游戏，传回去进度是100
+                                _activity.runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
                                         singleColorView.setVisibility(View.VISIBLE);    //展示单色背景，解决透明度问题