Merge branch 'CJL-Linphone' into wxr7

wxr

2021-08-27 30741caa02ed108fb0fbbaeda91eb6dd7c33fc9f

 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