Merge remote-tracking branch 'origin/CJL-LC' into wxr4

wxr

2021-07-01 8ac39f2f962329f30ee61ee8a7abe6d6b5940dd5

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

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