Merge branch 'wxr6' into temp-wxr

wxr

2021-06-23 197faa202beea7bc6723b24d3bc1de2d5fa48844

 HDL-ON_Android/VideoActivity.cs

@@ -169,7 +169,7 @@
                        mPhone.SetRemoteSurfaceHolder(mRemoteSurfaceHolder, "mRemoteSurfaceHolder!=null"); //设置来电窗口
                    }

                    ViewGroup v = (ViewGroup)FindViewById(Resource.Id.localVideo);
                    ViewGroup v = (ViewGroup)FindViewById(Resource.Id.locaVideo);
                    mPhone.SetLocalVideoContainer(v);//设置本地视频窗口，一定要调用，不然后会出现没声音
                }
                else