Merge branch 'WJC' into temp-wxr

wxr

2021-05-23 4d14154c36ac5692aadc036eed97fb9f1c410e2a

 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs

@@ -189,7 +189,7 @@
                        }
                        else
                        {
                            Method method = new Method();
                            PirMethod method = new PirMethod();
                            //自定义错误提示文本
                            string eorroText = "";
                            if (str == "获取可视对讲")