合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

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

@@ -99,7 +99,7 @@
        /// </summary>

        private void SetMiddleFrameInfo()

        {

            new System.Threading.Thread(() =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                if (this.Parent == null)

                {

@@ -128,8 +128,7 @@
                        }

                    }

                });

            })

            { IsBackground = true }.Start();

            });

        }



        #endregion

@@ -236,7 +235,7 @@


        #endregion



        #region ■ 保存选择的设备_______________________

        #region ■ 保存选择的设备_____________________



        /// <summary>

        /// 保存选择的设备

@@ -282,7 +281,7 @@


        #endregion



        #region ■ 结构体_______________________________

        #region ■ 结构体_____________________________



        /// <summary>

        /// 报警目标数据