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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs

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

        /// </summary>

        private bool isHadOpenSwitch = true;

        /// <summary>

        /// 当前选择的房间

        /// </summary>

        public Common.Room nowSelectRoom = null;



        #endregion



@@ -79,9 +83,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.btnBackGroud = new PicViewControl(this.Width, this.Height, false);

            btnBackGroud.UnSelectedImagePath = "Item/FunctionCardView.png";

@@ -115,7 +121,7 @@
                {

                    //取消收藏

                    HdlRoomLogic.Current.DeleteLoveDevice(i_device);

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

                    if (this.nowSelectRoom.IsLove == true)

                    {

                        //如果当前房间是我的喜爱的话,回调卡片被删除的事件

                        this.CardNeedRemoveEvent?.Invoke();

@@ -308,10 +314,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)

@@ -324,7 +329,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.CardNeedRemoveEvent?.Invoke();

                    return;