Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-28 af0266fa5570b6adcdb22f631bf13170e8646ca5

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

@@ -236,7 +236,7 @@


            //显示选择界面

            var form = new SelectDeviceForm();

            form.AddForm(list, new List<string>(), true);

            form.AddForm(list, new List<string>(), true, false);

            form.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddSensor));



            //设备选择确定