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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs

@@ -312,7 +312,7 @@
                    //标题:选择干接点功能

                    var title = Language.StringByID(R.MyInternationalizationString.uSelectDryContactFunction);



                    var form = new BottomDialogSelectForm();

                    var form = new BottomItemSelectForm();

                    form.AddForm(title, listText, nowSelectNo);

                    form.FinishSelectEvent += async (selectNo) =>

                    {