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

egret/src/mapScene/icon/ActIcon.ts

+import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
+import IconBase from "./IconBase";
+
+export default class ActIcon {
+
+    private actIconsGroup;
+    private actsShowBtn;
+
+    private icons = {};
+
+    constructor(actsShowBtn, actIconGroup) {
+        this.actsShowBtn = actsShowBtn;
+        this.actIconsGroup = actIconGroup;
+        this.initUI();
+        this.initEvents();
+    }
+
+    public addActIcon(name: string, actIcon: IconBase) {
+        this.icons[name] = actIcon;
+    }
+
+    public removeActIcon(name:string){
+        if(this.icons[name]){
+            this.icons[name].destory();
+            delete this.icons[name];
+        }
+    }
+
+    public destory() {
+        for(let k in this.icons){
+            this.removeActIcon(this.icons[k]);
+        }
+        this.removeEvents();
+    }
+
+    private initUI() {
+        this.actIconsGroup.x = -999;
+    }
+
+    private updateActIcon(){
+        for(let k in this.icons){
+            if(this.icons[k].visible){
+                this.visible = true;
+                return;
+            }
+        }
+        this.visible = false;
+    }
+
+    public set visible(visible:boolean){
+        this.actsShowBtn.visible = visible;
+        this.actIconsGroup.visible = visible;
+    }
+
+    private onTap_actsShowBtn() {
+        this.actIconsGroup.visible = !this.actIconsGroup.visible;
+        this.actIconsGroup.x = 12.12;
+        if(this.actIconsGroup.visible == false) {
+            this.actIconsGroup.x = -999;
+        }
+    }
+
+    private initEvents() {
+        this.actsShowBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_actsShowBtn, this);
+        GDispatcher.addEvent('closeActBtn', this.onTap_actsShowBtn, this);
+        GDispatcher.addEvent('updateActIcon', this.updateActIcon, this);
+    }
+
+    private removeEvents() {
+        this.actsShowBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_actsShowBtn, this);
+        GDispatcher.removeEvent('closeActBtn', this.onTap_actsShowBtn, this);
+        GDispatcher.removeEvent('updateActIcon', this.updateActIcon, this);
+    }
+}
\ No newline at end of file

egret/src/mapScene/icon/HbRainIcon.ts

@@ -2,7 +2,6 @@ import IconBase from "./IconBase";
 import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
 import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
-import CutTimer from "../../CutTimer";
 
 export default class HbRainIcon extends IconBase {
 
@@ -56,7 +55,7 @@ export default class HbRainIcon extends IconBase {
         GDispatcher.removeEvent('updateHbRainIcon', this.updateIcon, this);
     }
 
-    protected destory() {
+    public destory() {
         super.destory();
     }
 

egret/src/mapScene/icon/IconBase.ts

+import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
+
 /**
  * 地图页图标基类
  * Created on 2019/10/25
@@ -48,6 +50,11 @@ export default class IconBase {
         this.iconBtn.visible = visible;
         // this.iconTipsBg.visible = visible;
         // this.iconTips.visible = visible;
+        GDispatcher.dispatchEvent('updateActIcon');
+    }
+
+    public get visible():boolean{
+        return this.iconGroup.visible;
     }
 
     public get position(): { x, y } {
@@ -95,7 +102,7 @@ export default class IconBase {
         this.iconBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchBtn, this);
     }
 
-    protected destory() {
+    public destory() {
         this.removeEvents();
     }
 

egret/src/mapScene/icon/ScratchIcon.ts

@@ -118,7 +118,7 @@ export default class ScratchIcon extends IconBase {
         super.removeEvents();
     }
 
-    protected destory() {
+    public destory() {
         super.destory();
     }
 

egret/src/mapScene/icon/TurntableIcon.ts

@@ -61,7 +61,7 @@ export default class TurntableIcon extends IconBase {
         GDispatcher.removeEvent('updateTurntableIcon', this.updateIcon, this);
     }
 
-    protected destory() {
+    public destory() {
         super.destory();
     }