2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceHardInfoLogic.cs

@@ -14,11 +14,11 @@


        /// <summary>

        /// 设备硬件信息的逻辑

        /// </summary>
        private static HdlDeviceHardInfoLogic m_Current = null;
        /// </summary>

        private static HdlDeviceHardInfoLogic m_Current = null;

        /// <summary>

        /// 设备硬件信息的逻辑

        /// </summary>
        /// </summary>

        public static HdlDeviceHardInfoLogic Current

        {

            get

@@ -78,10 +78,10 @@
        /// <param name="device"></param>

        private void SetHardFirmwareInfoToDevice(CommonDevice device)

        {

            if (HdlDeviceAttributeLogic.Current.IsEsixt("DeviceGetHardFirmwareInfo") == false)

            if (HdlGatewayReceiveLogic.Current.IsEsixt("DeviceGetHardFirmwareInfo") == false)

            {

                //添加事件

                HdlDeviceAttributeLogic.Current.AddAttributeEvent("DeviceGetHardFirmwareInfo", "DeviceStatusReport", this.SetHardFirmwareInfoByInterfaceResult);

                HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceGetHardFirmwareInfo", ReceiveComandDiv.A设备属性上报, this.SetHardFirmwareInfoByInterfaceResult);

            }

            //发送命令

            this.SetHardFirmwareInfoComand(device);

@@ -98,34 +98,34 @@
        public void SetHardFirmwareInfoComand(CommonDevice device)

        {

            var jObject = new Newtonsoft.Json.Linq.JObject

            {
                { "DeviceAddr",device.DeviceAddr },
                { "Epoint", device.DeviceEpoint },
                { "Cluster_ID", (int)Cluster_ID.Basic },
                { "Command", 108 }
            {

                { "DeviceAddr",device.DeviceAddr },

                { "Epoint", device.DeviceEpoint },

                { "Cluster_ID", (int)Cluster_ID.Basic },

                { "Command", 108 }

            };

            var attriBute = new Newtonsoft.Json.Linq.JArray

            {
            {

               new Newtonsoft.Json.Linq.JObject

               {
               {

                 { "AttriButeId", 4}

               },
               },

               new Newtonsoft.Json.Linq.JObject

               {

                 { "AttriButeId", 5}

               },
               },

               new Newtonsoft.Json.Linq.JObject

               {

                 { "AttriButeId", 6}

               },
               },

                  new Newtonsoft.Json.Linq.JObject

               {

                 { "AttriButeId", 7}

               },
               },

               new Newtonsoft.Json.Linq.JObject

               {

                 { "AttriButeId", 13}

               }
               }

            };

            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };

            jObject.Add("Data", data);

@@ -211,7 +211,17 @@
                    isRightData = true;

                    if (data.AttriButeDataHex.Length > 2)

                    {

                        var value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));

                        string value;

                        if (Common.LocalDevice.Current.IsHdlDevice(device) == false)

                        {

                            //第三方设备

                            value = data.AttriButeDataHex.Substring(2);

                        }

                        else

                        {

                            //河东设备

                            value = UserCenterLogic.TranslateHexadecimalIntoText(data.AttriButeDataHex.Substring(2));

                        }

                        if (device.SerialNumber != value)

                        {

                            //属性变更了

@@ -228,20 +238,13 @@
            }



            //如果属性变更了

            if (AttriButeChanged == true && UserCenterResourse.listDeviceAttributePushForm.Count > 0)

            if (AttriButeChanged == true)

            {

                if (device.IsCustomizeImage == false)

                {

                    //UI重新生成

                    device.IconPath = string.Empty;

                    device.ReSave();

                }

                //属性变更推送

                var list = new List<CommonFormBase>();

                list.AddRange(UserCenterResourse.listDeviceAttributePushForm);

                for (int i = 0; i < list.Count; i++)

                {

                    list[i]?.DeviceAttributePush(device);

                }

            }

            return 1;