合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

@@ -222,7 +222,7 @@
            rowInfo.MenuRow = rowMenu;

            //向右图标

            var btnRight = rowMenu.frameTable.AddMostRightEmptyIcon(58, 58);

            btnRight.UnSelectedImagePath = "Item/Next.png";

            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.SelectedImagePath = "Item/Down.png";

            rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);



@@ -626,12 +626,6 @@
        /// <param name="device"></param>

        private void ReceiveDeviceStatu(CommonDevice device)

        {

            lock (dicRowInfo)

            {

                if (this.Parent == null)

                {

                    return;

                }

                DeviceObjRowInfo rowInfo = null;

                if (this.dicRowInfo.ContainsKey(device.DeviceAddr) == true)

                {

@@ -671,7 +665,6 @@
                    }

                });

            }

        }



        /// <summary>

        /// 设置全部设备离线

@@ -704,7 +697,7 @@
        {

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceListFormSensor", ReceiveComandDiv.A传感器上报, (device) =>

             {

                 Application.RunOnMainThread(() =>

                 HdlThreadLogic.Current.RunMain(() =>

                 {

                     if (this.dicRowInfo.ContainsKey(device.DeviceAddr) == false)

                     {