合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs

@@ -221,7 +221,7 @@
            var listDevice = this.dicShowDevice[roomId];

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

            {

                string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(listDevice[i]);

                string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(listDevice[i]);

                var contr = new DeviceSimpleSelectControl(listDevice[i], false, this.listView.rowSpace / 2);

                listView.AddChidren(contr);

                contr.InitControl();

@@ -290,7 +290,7 @@


            foreach (var deviceKeys in room.ListDevice)

            {

                var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);

                var device = Common.LocalDevice.Current.GetDevice(deviceKeys);

                if (device != null)

                {

                    canShow = true;