合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SelectDeviceForm.cs

File was renamed from ZigbeeApp/Shared/Phone/Common/Form/SelectDeviceForm.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;

namespace Shared.Phone
namespace Shared.Phone.UserCenter
{
    /// <summary>
    /// 设备选择的界面
@@ -119,7 +119,7 @@
        /// <param name="addLine">是否添加底线</param>
        private void AddDeviceRow(CommonDevice device, List<string> i_listSelectDevice, bool SelcetCancel, bool SelectOnlyOne, bool addLine)
        {
            string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
            string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
            var row = new DeviceSelectControl(device, SelectOnlyOne == false, listView.rowSpace / 2);
            row.MainKeys = mainkeys;
            listView.AddChidren(row);
@@ -131,7 +131,7 @@
            }

            //设置选择状态
            string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
            string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
            if (i_listSelectDevice.Contains(mainKeys) == true)
            {
                row.SelectCancel = SelcetCancel;