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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -196,7 +196,7 @@
                    //这里先去获取它的干接点类型

                    this.ShowProgressBar();

                    //获取第七回路的配置信息

                    listRelayInfo7 = await HdlDevicePanelLogic.Current.GetDryContactConfigureInfo(nowSelectDevice);

                    listRelayInfo7 = HdlDevicePanelLogic.Current.GetDryContactConfigureInfo(nowSelectDevice);

                    if (listRelayInfo7 == null)

                    {

                        //关闭进度条

@@ -324,7 +324,7 @@
                    var title = Language.StringByID(R.MyInternationalizationString.uSelectDryContactFunction);



                    var form = new BottomItemSelectForm();

                    form.AddForm(title, listText, nowSelectNo);

                    form.AddForm(title, listText, null, nowSelectNo);

                    form.FinishSelectEvent += (selectNo) =>

                    {

                        if (selectNo == nowSelectNo)