react_hsbc_teller 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "React",
   "private": false,
   "main": "lib/hsbc.js",

package/packages/pages/video/video.jsx

@@ -295,7 +295,7 @@ class Video extends Component {
   saveLog = (val) => {
     axios({
       method: 'get',
-      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=2.0.0&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
+      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=2.0.2&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -324,19 +324,23 @@ class Video extends Component {
       console.log(result);
       this.state.imRoomId = result.imRoomId,
         this.state.sessionId = result.sessionId;
-      let publish_config = {}
-      publish_config.media_type = 1
-      publish_config.publish_device = 1
-      publish_config.videoSource = this.state.cameraValue
-      publish_config.audioSource = this.state.microphoneValue
-      publish_config.need_volume_analyser = true
-      // publish_config.video_profile_type = 3
-      publish_config.video_profile_type = 100
-      publish_config.video_profile_diy = { width: 640, height: 360, frameRate: 15, bitrate: 400 }
-      publish_config.publish_video_id = 'publish_video1'
-      publish_config.publish_streamId_id = 'publish_streamId1'
-      publish_config.publish_tag = 'tag1'
-      this.test_controller.Publish(publish_config)
+
+      this.state.cameraList.forEach((el, i) => {
+        let publish_config = {}
+        publish_config.media_type = i==0? 1:3
+        publish_config.publish_device = 1
+        publish_config.videoSource = el.actionid
+        publish_config.audioSource = this.state.microphoneValue
+        publish_config.need_volume_analyser = true
+        // publish_config.video_profile_type = 3
+        publish_config.video_profile_type = 100
+        publish_config.video_profile_diy = { width: 640, height: 360, frameRate: 15, bitrate: 400 }
+        publish_config.publish_video_id = 'publish_video' + (i+1)
+        publish_config.publish_streamId_id = 'publish_streamId'  + (i+1)
+        publish_config.publish_tag = 'tag' + (i+1)
+        this.test_controller.Publish(publish_config)
+      })
+      
       // eslint-disable-next-line no-undef
       setTimeout(() => {
         if (this.state.imStatus && !this.state.imJoinRoom) {
@@ -486,6 +490,16 @@ class Video extends Component {
         publish_video_id: 'publish_video1',
         publish_streamId_id: 'publish_streamId1',
         publish_tag: 'tag1'
+      },
+      {
+        publish_video_id: 'publish_video2',
+        publish_streamId_id: 'publish_streamId2',
+        publish_tag: 'tag2'
+      },
+      {
+        publish_video_id: 'publish_video3',
+        publish_streamId_id: 'publish_streamId3',
+        publish_tag: 'tag3'
       }
     ];
     config_param.initSubscribe = [
@@ -578,82 +592,47 @@ class Video extends Component {
           height: 175
         },
         {
-          tag: 'customer1',
+          tag: 'tag2',
           xPosition: 213,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'customer2',
+          tag: 'tag3',
           xPosition: 426,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'customer3',
+          tag: 'customer1',
           xPosition: 639,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'customer4',
+          tag: 'customer2',
           xPosition: 852,
           yPosition: 0,
           width: 213,
           height: 175
         },
         {
-          tag: 'customer5',
+          tag: 'customer3',
           xPosition: 1065,
           yPosition: 0,
           width: 213,
           height: 175
         },
-        // {
-        //   tag: 'customer6',
-        //   xPosition: 1440,
-        //   yPosition: 0,
-        //   width: 240,
-        //   height: 180
-        // },
-        // {
-        //   tag: 'customer7',
-        //   xPosition: 1680,
-        //   yPosition: 0,
-        //   width: 240,
-        //   height: 180
-        // },
-        // {
-        //   tag: 'customer8',
-        //   xPosition: 1680,
-        //   yPosition: 180,
-        //   width: 240,
-        //   height: 180
-        // },
-        // {
-        //   tag: 'customer9',
-        //   xPosition: 1680,
-        //   yPosition: 360,
-        //   width: 240,
-        //   height: 180
-        // },
-        // {
-        //   tag: 'customer10',
-        //   xPosition: 1680,
-        //   yPosition: 540,
-        //   width: 240,
-        //   height: 180
-        // },
-        // {
-        //   tag: 'customer11',
-        //   xPosition: 1680,
-        //   yPosition: 720,
-        //   width: 240,
-        //   height: 180
-        // }
+        {
+          tag: 'customer4',
+          xPosition: 1278,
+          yPosition: 0,
+          width: 213,
+          height: 175
+        },
       ]
       Array.isArray(res) ?
         res.map((item) => {
@@ -1721,19 +1700,23 @@ class Video extends Component {
     // 加入房间成功
     this.test_controller.OnJoinRoomSucc = () => {
       console.log('加入房间成功')
-      let publish_config = {}
-      publish_config.media_type = 1
-      publish_config.publish_device = 1
-      publish_config.need_volume_analyser = true
-      publish_config.videoSource = this.state.cameraValue
-      publish_config.audioSource = this.state.microphoneValue
-      // publish_config.video_profile_type = 3
-      publish_config.video_profile_type = 100
-      publish_config.video_profile_diy = { width: 640, height: 360, frameRate: 15, bitrate: 400 }
-      publish_config.publish_video_id = 'publish_video1'
-      publish_config.publish_streamId_id = 'publish_streamId1'
-      publish_config.publish_tag = 'tag1'
-      this.test_controller.Publish(publish_config)
+
+      this.state.cameraList.forEach((el, i) => {
+        let publish_config = {}
+        publish_config.media_type = i==0? 1:3
+        publish_config.publish_device = 1
+        publish_config.videoSource = el.actionid
+        publish_config.audioSource = this.state.microphoneValue
+        publish_config.need_volume_analyser = true
+        // publish_config.video_profile_type = 3
+        publish_config.video_profile_type = 100
+        publish_config.video_profile_diy = { width: 640, height: 360, frameRate: 15, bitrate: 400 }
+        publish_config.publish_video_id = 'publish_video' + (i+1)
+        publish_config.publish_streamId_id = 'publish_streamId'  + (i+1)
+        publish_config.publish_tag = 'tag' + (i+1)
+        this.test_controller.Publish(publish_config)
+      })
+      
       this.roomCallBack(1, '', 0)
       this.saveLog('mrtc join room success')
     };
@@ -3013,7 +2996,7 @@ class Video extends Component {
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '2.0.0')
+    console.log('hsbc_teller_sdk', '2.0.2')
     let arr = []
     for(let i=1;i<=12;i++){
       arr.push({
@@ -5233,6 +5216,40 @@ class Video extends Component {
                   </div>
 
                 </div>
+                {
+                  this.state.cameraList.map((item, index) => {
+                    if (index > 0) 
+                    return <div
+                    className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
+                  >
+                    <div className="publishVideoDiv">
+
+                      <video
+                        id={"publish_video" + (index+1)}
+                        className={`publishVideoClass`}
+                        autoPlay
+                        muted={true}
+                        disablePictureInPicture
+                      />
+                      <label style={{ display: 'none' }} id={"publish_streamId"+ (index+1)} type="text" />
+
+                      <div id="publish_video_div" className={`tellerTitle titleSamlle`}>
+                        <div>
+                          {
+                            this.state.voiceStatue && <img
+                              alt=""
+                              src={require("../../assets/img/jingyin.png").default}
+                              className="voiceClass"
+                            />
+                          }
+                          <canvas style={{ display: (!this.state.voiceStatue) ? '' : 'none', width: '25px', height: '25px', marginTop: '4px' }} className="canvasClass"  id={"publish_volumeView"+ (index+1)} width="40" height="70"></canvas>
+                        </div>
+                        <div className='titleName' style={{ color: this.props.titleColor, fontSize: this.props.fontSize + 'px', fontFamily: this.props.fontFamily }}>{this.state.titleNameRm}</div>
+                      </div>
+                    </div>
+                  </div>
+                  })
+                }
                 {/* <div className={`itemed ${this.state.isVideoList? 'videoMinutuListClass': 'videoMinutuClass'}`}
                   style={{ position: "relative", display: (this.state.videoList[0].videoName) ? '' : 'none' }}
                 >