2020-12-29-1

陈嘉乐

2020-12-29 71c7ad13169695913282962a460858e13b6c0969

 ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs

@@ -87,8 +87,19 @@
            btnMore.InitControl();

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

            {

                //获取设备属于【晾衣架】

                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });

                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.Airer)

                {

                    var form = new Shared.Phone.UserCenter.Device.DeviceFunctionSettionForm();

                    form.AddForm(device, true);

                }

                else

                {

                var detailInfo = new DeviceDetailInfoForm();

                detailInfo.AddForm(device, nowSelectRoom);

                }



            };



            //初始化中部信息

@@ -300,6 +311,20 @@
            HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceDetailCardAttribute" + mainKeys, ReceiveComandDiv.A设备属性上报, (report) =>

            {

                string mainKey2 = Common.LocalDevice.Current.GetDeviceMainKeys(report);



                if (this.device.Type == DeviceType.Airer && this.device.DeviceAddr == report.DeviceAddr)

                {

                    //晾衣架特殊：5个回路代表不同的功能，但是默认本地只显示了第一个回路

                    //所以条件特殊判断

                    //检测结果

                    if (this.CheckResponeResultStatu(ReceiveComandDiv.A设备属性上报, report) == true)

                    {

                        //结果已经接收到

                        this.ResponeResult = 1;

                    }

                }

                else

                {

                if (mainKeys != mainKey2)

                {

                    //不是同一个东西

@@ -311,6 +336,7 @@
                    //结果已经接收到

                    this.ResponeResult = 1;

                }

                }

            });

        }