合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

@@ -158,12 +158,8 @@
            //根据MAC合并设备列表

            this.MargeAllDeviceByMac(listDevice);



            Application.RunOnMainThread(() =>

            HdlThreadLogic.Current.RunMain(() =>

            {

                if (this.Parent == null)

                {

                    return;

                }

                var listOta = new List<OTADevice>();

                foreach (var macAddress in this.dicRowInfo.Keys)

                {

@@ -176,6 +172,7 @@
                    //添加设备的菜单行

                    this.AddDeviceMenuRow(macAddress);

                }



                //添加底部间隙

                var frameTemp = new FrameLayout();

                frameTemp.Height = Application.GetRealHeight(23);

@@ -801,6 +798,11 @@
            if (this.dicRowInfo.ContainsKey(deviceAddr) == false)

            {

                var localDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr);

                if (localDevice.Count == 0)

                {

                    //入网之后，又把它删了

                    return;

                }

                var rowNewInfo = new DeviceObjRowInfo();

                rowNewInfo.DeviceMac = deviceAddr;

                rowNewInfo.MacName = Common.LocalDevice.Current.GetDeviceMacName(localDevice[0]);

@@ -809,8 +811,6 @@


                //创建新的行

                this.AddDeviceMenuRow(deviceAddr);



                return;

            }

        }