2020-03-23-3

WJC

2020-03-23 bba578c2f0acf2eca747edcb69426771e0cadd32

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs

@@ -234,7 +234,7 @@
            //处理设备

            foreach (var data2 in allData.DeviceList)

            {

                string mainKey = data2.MacAddr + data2.Epoint;

                string mainKey = LocalDevice.Current.GetDeviceMainKeys(data2.MacAddr, data2.Epoint);

                //传感器设备信息

                var Deviceinfo = new Safeguard.ZoneDeviceListData();

                Deviceinfo.IsBypass = data2.IsBypass;

@@ -295,7 +295,7 @@
                if (data.Type == 0)

                {

                    //本地是否有这个设备

                    string mainKey = data.DeviceAddr + data.Epoint;

                    string mainKey = LocalDevice.Current.GetDeviceMainKeys(data.DeviceAddr, data.Epoint);

                    //报警信息

                    zoneInfo.dicAlarmDevice[mainKey] = data;

                    CommonDevice device = LocalDevice.Current.GetDevice(mainKey);

@@ -559,7 +559,7 @@
                //一批设备里面，成功添加的

                if (data.Status == 0)

                {

                    listSuccess.Add(data.MacAddr + data.Epoint);

                    listSuccess.Add(LocalDevice.Current.GetDeviceMainKeys(data.MacAddr, data.Epoint));

                }

                else if (data.Status == 1)

                {

@@ -745,7 +745,7 @@
            {

                if (data.Status == 0)

                {

                    listKeys.Add(data.MacAddr + data.Epoint);

                    listKeys.Add(LocalDevice.Current.GetDeviceMainKeys(data.MacAddr, data.Epoint));

                }

            }