合并门锁，完成住宅管理

黄学彪

2019-10-12 c6b35c3138b944830b5336bf610f918154dd47c7

 ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs

@@ -474,18 +474,18 @@
                        //界面关闭

                        return;

                    }

                    await Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);

                    await Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);

                }

            });

        }



        /// <summary>

        /// 接受设备在线推送(不要忘记最后它会推送一个Null的东西过来)

        /// 接受设备在线推送

        /// </summary>

        /// <param name="device"></param>

        private void ReceiveDeviceStatuPush(CommonDevice device)

        {

            if (this.Parent == null || device == null)

            if (this.Parent == null)

            {

                //界面关闭

                return;