Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/libs/new_wx/components/Scene.ts

@@ -10,9 +10,13 @@ export default class Scene extends ComponentBase {
         this.height = this.stage.stageHeight;
         this.playAnimation();
     }
-getAllPromise(){
 
-}
+    onLoad(){
+        return new Promise((resolve, reject)=>{
+            resolve();
+        })
+    }
+
     updateScene(){
         
     }

egret/libs/new_wx/ctrls/sceneCtrl.ts

@@ -48,8 +48,10 @@ export default class SceneCtrl {
         scene.addEventListener(egret.Event.ADDED_TO_STAGE, () => {
             scene.start(data);
         }, this);
-        this.addToStage(scene);
-        onComplete && onComplete();
+        scene.onLoad().then(()=>{
+            this.addToStage(scene);
+            onComplete && onComplete();
+        });
     }
 
     addMask() {

egret/src/mapScene/MapScene.ts

@@ -108,6 +108,15 @@ export default class MapScene extends Scene {
     private inviteTimer: egret.Timer;
     private cutTime: number;
 
+    onLoad() {
+        super.onLoad().then(()=>{});
+        return new Promise((resolve, reject) => {
+            NetManager.ins.hbRainBaseInfo(() => {
+                resolve();
+            });
+        });
+    }
+
     async start(data?) {
         super.start();
 
@@ -334,7 +343,7 @@ export default class MapScene extends Scene {
                 if(item.parent) item.parent.addChild(item);
             });
         }
-        
+
     }
 
     // 添加图标

egret/src/mapScene/icon/HbRainIcon.ts

@@ -4,6 +4,8 @@ import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
 import { getlogItem } from "../../Main";
 import CutTimer from "../../CutTimer";
+import { DataManager } from "../../../libs/tw/manager/DataManager";
+import { NetName } from "../../../libs/tw/enum/NetName";
 
 export default class HbRainIcon extends IconBase {
 
@@ -15,11 +17,10 @@ export default class HbRainIcon extends IconBase {
         this.cutTimer.callFun = () => {
             this.updateIcon();
         };
-        this.updateIcon();
-    }
-
-    protected start() {
-        super.start();
+        let res = DataManager.ins.getData(NetName.HBRAIN_BASEINFO);
+        if(res) {
+            this.call(res.success, res);
+        }
     }
 
     public showLog() {
@@ -28,37 +29,38 @@ export default class HbRainIcon extends IconBase {
     }
 
     private updateIcon() {
-        NetManager.ins.hbRainBaseInfo((success, res) => {
-            if(!success) {
-                if(res.code == "600054" || res.code == "600055") {
-                    this.visible = false;
-                }
-                GDispatcher.dispatchEvent('updateActIcon');
-                return;
-            }
-            const data = res.data;
+        NetManager.ins.hbRainBaseInfo((success, res) => this.call(success, res));
+    }
 
-            let time: number;
-            const sysTime = res.timestamp;    // 当前系统时间
-            if(data.currentSession) {
-                this.visible = true;
-                time = data.currentSession.endTime - sysTime + 3000;
-                if(!this.cutTimer.start(time)) {
-                    this.cutTimer.stop();
-                    this.cutTimer.start(time);
-                }
-            } else if(data.nextSession) {
-                this.visible = true;
-                time = data.nextSession.startTime - sysTime + 3000;
-                if(!this.cutTimer.start(time)) {
-                    this.cutTimer.stop();
-                    this.cutTimer.start(time);
-                }
-            } else {
+    private call(success, res) {
+        if(!success) {
+            if(res.code == "600054" || res.code == "600055") {
                 this.visible = false;
             }
             GDispatcher.dispatchEvent('updateActIcon');
-        });
+            return;
+        }
+        const data = res.data;
+        let time: number;
+        const sysTime = res.timestamp;    // 当前系统时间
+        if(data.currentSession) {
+            this.visible = true;
+            time = data.currentSession.endTime - sysTime + 3000;
+            if(!this.cutTimer.start(time)) {
+                this.cutTimer.stop();
+                this.cutTimer.start(time);
+            }
+        } else if(data.nextSession) {
+            this.visible = true;
+            time = data.nextSession.startTime - sysTime + 3000;
+            if(!this.cutTimer.start(time)) {
+                this.cutTimer.stop();
+                this.cutTimer.start(time);
+            }
+        } else {
+            this.visible = false;
+        }
+        GDispatcher.dispatchEvent('updateActIcon');
     }