Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SelectDeviceForm.cs

@@ -80,7 +80,7 @@
                    this.AddDeviceRow(i_listShowDevice[i], i_listSelectDevice, SelcetCancel, SelectOnlyOne, i != count);

                }

                //调整列表控件的高度

                listView.AdjustRealHeight(Application.GetRealHeight(23));
                listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23), Application.GetRealHeight(6));

            });



            //完成

@@ -171,16 +171,16 @@
        private List<CommonDevice> GetListDeviceFromRow()

        {

            List<CommonDevice> listDevice = new List<CommonDevice>();

            for (int i = 0; ; i++)

            for (int i = 0; i < this.listView.ChildrenCount; i++)

            {

                var row = (DeviceSelectControl)this.listView.GetChildren(i);

                if (row == null)

                var myView = this.listView.GetChildren(i);

                if (myView is DeviceSelectControl)

                {

                    break;

                }

                    var row = (DeviceSelectControl)myView;

                if (row.IsSelected == true)

                {

                    listDevice.Add(row.device);

                    }

                }

            }

            return listDevice;

@@ -193,11 +193,11 @@
        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseForm()

        public override void CloseFormBefore()

        {

            ActionSelectDeviceEx = null;



            base.CloseForm();

            base.CloseFormBefore();

        }



        #endregion