Merge branch 'dev5.9.1.1' of Software/android-cloud-H5 into master

static/rtcEngine/WXtrialInterface.html

@@ -57,9 +57,9 @@
                                 @click.prevent="definitionFun(item.value)">
                                 {{item.name}}
                             </div>
-                            <div class="tc drawer-item mb-15" @click.prevent="resolutionRatio">
+                            <!-- <div class="tc drawer-item mb-15" @click.prevent="resolutionRatio">
                                 分辨率
-                            </div>
+                            </div> -->
                             <div class="tc drawer-item mb-15" @click.prevent="volumeControl(24)">
                                 音量 +
                             </div>

static/rtcEngine/js/WXtrialInterface.js

@@ -202,7 +202,7 @@ const app = new Vue({
 
             const connection = {
                 name: "猪猪令是猪",
-                topic, // 云机ID 必填
+                topic, // SN号  必填
                 url,  //信令服务地址  必填
                 ICEServerUrl,
                 width: 720, // 推流视频宽度  必填
@@ -216,6 +216,7 @@ const app = new Vue({
                 authToken,  //拉流鉴权 token  必填
                 bitrate: 6000,  //码率 必填
                 fps: 30, //必填
+                isAllowedOpenCamera: true, // 是否允许打开摄像头
                 callback: this.statusCallBack,//回调函数 必填
             };