HDL Home App 第二版本 旧平台金堂用 正在使用
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
黄学彪
2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22 
 ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs


@@ -13,7 +13,7 @@


        /// <summary>


        /// The action.


        /// </summary>


        public Action action;


        public Action<DeviceUI,Common.Room> action;




        /// <summary>


        /// 收藏按钮


@@ -246,8 +246,8 @@


        {


            UserView.HomePage.Instance.ScrollEnabled = true;


            ZigBee.Device.ZbGateway.StatusList.Remove(this);


            //action();


            //action = null;


            action(device,room);


            action = null;


            RemoveUpdateControlDeviceStatuAction();


            if (IsDrawerLockMode)


            {


@@ -298,8 +298,7 @@


                }


            }




            var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);


            if (de == null)


            if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)


            {


                collectionBtn.IsSelected = false;


            }


@@ -654,9 +653,9 @@


            UserView.HomePage.Instance.AddChidren(detailInfo);


            UserView.HomePage.Instance.PageIndex += 1;


            detailInfo.Show(device, room);


            detailInfo.EditAction = (d,r) =>


            detailInfo.EditAction += (curDev,curRoom) =>


            {


                Show(device, room);


                Show(curDev, curRoom);


            };


        }