Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -95,7 +95,7 @@
                    this.AddRowLayout(listAllDevice[i], i != count);

                }

                //调整真实高度

                listView.AdjustRealHeight(Application.GetRealHeight(23));

                listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));

            });

        }