Merge branch 'WJC' into wxr4

wxr

2021-04-28 cc48110a814477bc0d01615f9844aea6ff2b609f

 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -59,8 +59,6 @@
        /// <param name="mESVideoInfo"></param>
        public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
        {
            this.esVideoInfo = mESVideoInfo;

#if __IOS__
             int roomID = 0;
            int.TryParse(mESVideoInfo.roomno, out roomID);