Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs

@@ -53,6 +53,10 @@
        /// 判断是否有开关功能

        /// </summary>

        private bool isHadOpenSwitch = true;

        /// <summary>

        /// 当前选择的房间

        /// </summary>

        public Common.Room nowSelectRoom = null;



        #endregion



@@ -71,9 +75,11 @@
        /// 初始化控件

        /// </summary>

        /// <param name="i_device">设备对象</param>

        public virtual void InitControl(CommonDevice i_device)

        /// <param name="i_nowSelectRoom">当前选择的房间(有点用处)</param>

        public virtual void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)

        {

            this.device = i_device;

            this.nowSelectRoom = i_nowSelectRoom;

            //设备图标背景控件

            this.frameIconBackGroud = new FrameLayout();

            frameIconBackGroud.Height = this.GetPictrueRealSize(112);

@@ -137,17 +143,17 @@
            btnSwitch.SelectedImagePath = "Item/SwitchSelected.png";



            //分享的房间,则不能编辑和删除

            if (HdlRoomLogic.Current.CurrentRoom.IsSharedRoom == false)

            if (this.nowSelectRoom.IsSharedRoom == false)

            {

                //编辑

                var btnEditor = this.AddEditorControl();

                btnEditor.ButtonClickEvent += (sender, e) =>

                {

                    var detailInfo = new MainPage.DeviceDetailInfoForm();

                    detailInfo.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom);

                    detailInfo.FormCloseEvent += (curDevice, curRoom) =>

                    detailInfo.AddForm(i_device, this.nowSelectRoom);

                    detailInfo.FormCloseEvent += () =>

                    {

                        if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)

                        if (this.nowSelectRoom.IsLove == true)

                        {

                            //当前是喜爱房间时

                            if (HdlRoomLogic.Current.IsCollectInRoom(this.device) == false)

@@ -159,7 +165,8 @@
                                return;

                            }

                        }

                        else if (HdlRoomLogic.Current.CurrentRoom.Id != curRoom.Id)

                        var curRoom = HdlRoomLogic.Current.GetRoomByDevice(this.device);

                        if (curRoom == null || this.nowSelectRoom.Id != curRoom.Id)

                        {

                            //回调控件被移除的事件

                            this.RowNeedRemoveEvent?.Invoke();

@@ -182,7 +189,7 @@
                    {

                        //移除收藏(不管什么情况,收藏都要移除)

                        HdlRoomLogic.Current.DeleteLoveDevice(i_device);

                        if (HdlRoomLogic.Current.CurrentRoom.IsLove == false)

                        if (this.nowSelectRoom.IsLove == false)

                        {

                            //从房间中移除

                            HdlRoomLogic.Current.DeleteDevice(i_device);

@@ -342,10 +349,9 @@
        /// 深度卡片信息的返回事件(底层专用)

        /// </summary>

        /// <param name="device">设备</param>

        /// <param name="room">房间</param>

        public void CardDetailInfoBackEvent(CommonDevice device, Common.Room room)

        public void CardDetailInfoBackEvent(CommonDevice device)

        {

            if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)

            if (this.nowSelectRoom.IsLove == true)

            {

                //已经取消的收藏

                if (HdlRoomLogic.Current.IsCollectInRoom(device) == false)

@@ -361,7 +367,7 @@
            {   

                //如果这个设备改变了房间的话,回调卡片被删除的函数

                var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);

                if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)

                if (nowRoom == null || nowRoom.Id != this.nowSelectRoom.Id)

                {

                    //回调控件被移除的事件

                    this.RowNeedRemoveEvent?.Invoke();