2022年12月01日09:56:23

wjc

2022-12-01 351bdda734832d821a9764b0cde8be5d83c4ec50

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

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

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

            {

                var detailInfo = new DeviceDetailInfoForm();

                detailInfo.AddForm(device, nowSelectRoom);

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

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

                }



            };



            //初始化中部信息

@@ -121,6 +132,17 @@
            frameWhiteBack.Gravity = Gravity.CenterHorizontal;

            bodyFrameLayout.AddChidren(frameWhiteBack);



            if (this.device.Type == DeviceType.TemperatureSensor)

            {

                //获取设备类型

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

                //空气质量传感器 ,卡片比较大

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

                {

                    frameWhiteBack.Y = Application.GetRealHeight(98);

                }

            }



            //设备名称

            this.btnDeviceName = new NormalViewControl(100, 60, true);

            btnDeviceName.Y = Application.GetRealHeight(46);

@@ -146,7 +168,7 @@
            frameRoomBlack.Height = Application.GetRealHeight(138);

            frameRoomBlack.Width = frameWhiteBack.Width;

            frameRoomBlack.BackgroundColor = 0xff232323;

            frameRoomBlack.Radius= (uint)Application.GetRealHeight(17);

            frameRoomBlack.Radius = (uint)Application.GetRealHeight(17);

            frameRoomBlack.Gravity = Gravity.BottomCenter;

            frameWhiteBack.AddChidren(frameRoomBlack);



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

            {

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

                if (mainKeys != mainKey2)



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

                {

                    //不是同一个东西

                    return;

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

                    //所以条件特殊判断

                    //检测结果

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

                    {

                        //结果已经接收到

                        this.ResponeResult = 1;

                    }

                }

                //检测结果

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

                else

                {

                    //结果已经接收到

                    this.ResponeResult = 1;

                    if (mainKeys != mainKey2)

                    {

                        //不是同一个东西

                        return;

                    }

                    //检测结果

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

                    {

                        //结果已经接收到

                        this.ResponeResult = 1;

                    }

                }

            });

        }