新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

 ZigbeeApp/Shared/Phone/Common/Form/SelectDeviceForm.cs

old mode 100755
new mode 100644
File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SelectDeviceForm.cs
@@ -3,7 +3,7 @@
using System.Text;

using ZigBee.Device;



namespace Shared.Phone.UserCenter

namespace Shared.Phone
{

    /// <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 = Common.LocalDevice.Current.GetDeviceMainKeys(device);

            string mainkeys = HdlDeviceCommonLogic.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 = Common.LocalDevice.Current.GetDeviceMainKeys(device);

            string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
            if (i_listSelectDevice.Contains(mainKeys) == true)

            {

                row.SelectCancel = SelcetCancel;