20201127 合并嘉乐代码

wei

2020-11-27 79fe8dab1bcb8e8d92d9058ca2540cd4e8f9ecf9

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

@@ -26,7 +26,7 @@
                    {
                        new Tip()
                        {
                            CloseTime = 3,
                            CloseTime = 1,
                            Text = Language.StringByID(StringId.DeviceNameCannotBeEmpty),
                            Direction = AMPopTipDirection.None,
                        }.Show(bodyView);