请合并最新版代码

xm

2020-07-13 412e0af11df2b1d7986adf002e7997d82344ab3e

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -101,10 +101,13 @@
            {

                //简约面板随便一个回路来获取设备信息

                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);

                var key = new ZigBee.Device.Panel();

                key.DeviceAddr = deviceMac;

                key.CurrentGateWayId = dev.CurrentGateWayId;

                InitBindInfo(key);

                if (dev != null)
                {
                    var key = new ZigBee.Device.Panel();
                    key.DeviceAddr = deviceMac;
                    key.CurrentGateWayId = dev.CurrentGateWayId;
                    InitBindInfo(key);
                }
            }

        }



@@ -1206,6 +1209,10 @@
                foreach (var bDev in bindList)

                {

                    var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);

                    if (device == null)
                    {
                        continue;
                    }

                    if (device.Type == DeviceType.TemperatureSensor)

                    {

                        var bD = device as TemperatureSensor;