合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -53,10 +53,6 @@
            {

                //先移除

                this.RemoveDeviceHardInfoThread(device);



                string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);

                this.hsGetHardInfoDevice.Add(mainkeys);



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

                {

                    //添加事件

@@ -89,6 +85,8 @@
                //不需要发送

                return;

            }

            string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);

            this.hsGetHardInfoDevice.Add(mainkeys);

            //发送

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

            jObject.Add("Data", data);