合并代码

黄学彪

2020-01-10 985abd7ee6049147119518aa41fb2d08c0cfc40d

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs

@@ -74,6 +74,11 @@
        public void InitControl()

        {

            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(this.deviceMac);

            if (listDevice.Count == 0)

            {

                //针对单纯只有一个200端点的设备

                listDevice.Add(Common.LocalDevice.Current.GetOTADevice(this.deviceMac));

            }

            //图标

            btnIcon = frameTable.AddLeftIcon(81);

            Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);

@@ -127,6 +132,11 @@
            hadRefresh = true;



            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(this.deviceMac);

            if (listDevice.Count == 0)

            {

                //针对单纯只有一个200端点的设备

                listDevice.Add(Common.LocalDevice.Current.GetOTADevice(this.deviceMac));

            }

            //图标

            Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);

            //设备