Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

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

@@ -78,7 +78,7 @@
                        this.AddRowControl(listScene[i], i != count);

                    }

                    //调整真实高度

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

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

                });

            });