Merge branch 'WJC' into wxr6

wxr

2021-06-09 34cac3d14e5243c2388b54da02f5aebeec555da8

 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 == "获取可视对讲")