更新 web demo webrtc api 至 3.0

anderlu · anderlu · commit 8b9016f1bc6f · 2019-03-01T16:34:32.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@ Android/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_8_1_j
 Android/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_1_jar.xml
 Android/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml
 Android/.idea/libraries/Gradle__LiteAVSDK_TRTC_release__aar.xml
+Android/.settings/*
+.project
diff --git a/H5/index.html b/H5/index.html
@@ -52,7 +52,7 @@
   <!-- jquery Demo用到，WebRTCAPI不依赖 -->
   <script src="./libs/jquery.min.js"></script>
   <!-- demo 部分 -->
-  <script src="https://sqimg.qq.com/expert_qq/webrtc/2.6.2/WebRTCAPI.min.js"></script>
+  <script src="https://sqimg.qq.com/expert_qq/webrtc/3.0/WebRTCAPI.min.js"></script>
   <script>
     document.write('<script src="./js/config.js?v='+new Date()+'" type="text/javascript"></scr'+'ipt>')
     document.write('<script src="./js/index.js?v='+new Date()+'" type="text/javascript"></scr'+'ipt>')
diff --git a/H5/js/index.js b/H5/js/index.js
@@ -76,19 +76,48 @@ function onWebSocketClose() {
     RTC.quit();
 }
 
+function gotStream( opt ,succ){
+    RTC.getLocalStream({
+        video:true,
+        audio:true,
+        videoDevice:opt.videoDevice,
+        // 如需指定分辨率，可以在attributes中增加对width和height的约束
+        // 否则将获取摄像头的默认分辨率
+        // 更多配置项 请参考 接口API
+        // https://cloud.tencent.com/document/product/647/17251#webrtcapi.getlocalstream
+        // attributes:{
+        //     width:640,
+        //     height:320
+        // }
+    },function(info){
+        var stream = info.stream;
+        succ ( stream )
+    });
+}
+
 function initRTC(opts) {
     window.RTC = new WebRTCAPI({
         userId: opts.userId,
         userSig: opts.userSig,
         sdkAppId: opts.sdkappid,
         accountType: opts.accountType
     }, function () {
-        RTC.createRoom({
+        // RTC.createRoom({
+        RTC.enterRoom({
             roomid: opts.roomid * 1,
             privateMapKey: opts.privateMapKey,
             role: "user",
         }, function (info) {
             console.warn("init succ", info)
+            gotStream({
+                audio:true,
+                video:true
+            },function(stream){
+                RTC.startRTC({
+                    stream: stream,
+                    role: 'user'
+                });
+            })
         }, function (error) {
             console.error("init error", error)
         });
@@ -114,7 +143,7 @@ function initRTC(opts) {
         }
     });
     RTC.on("onStreamNotify", function (info) {
-        // console.warn('onStreamNotify', info)
+        console.warn('onStreamNotify', info)
     });
     RTC.on("onWebSocketNotify", function (info) {
         // console.warn('onWebSocketNotify', info)
@@ -141,6 +170,7 @@ function push() {
         "userSig": userSig,
         "sdkappid": sdkappid,
         "accountType": 1, // 随便传一个值，现在没有啥用处
+        "closeLocalMedia": false,
         "roomid": roomid
     });
 }
@@ -163,9 +193,9 @@ function stopWs() {
 
 function startRTC() {
     RTC.startRTC(0, function (info) {
-        // console.debug(info)
+        console.debug('success', info)
     }, function (info) {
-        // console.debug(info)
+        console.debug('failed', info)
     });
 }
 
