Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 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);



@@ -396,8 +396,17 @@
            //pir传感器

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_Pir)

            {

                if (device is IASZone)

                {

                var form = new DevicePirSensor.PirSensorBindTargetSettionForm();

                form.AddForm((IASZone)device);

                }

                else

                {

                    //pir传感器,他们又搞了个继电器在里面

                    var form = new DeviceFunctionSettionForm();

                    form.AddForm(device, true);

                }

            }

            //中央空调

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.AirConditioner_ZbGateway)

@@ -626,12 +635,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 +674,6 @@
                    }

                });

            }

        }



        /// <summary>

        /// 设置全部设备离线

@@ -704,7 +706,7 @@
        {

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

             {

                 Application.RunOnMainThread(() =>

                 HdlThreadLogic.Current.RunMain(() =>

                 {

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

                     {