react_hsbc_teller 1.3.8 → 1.4.1

package/package.json

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

package/packages/pages/video/video.jsx

@@ -38,6 +38,23 @@ let streamShare
 let muteJson = new Map()
 let dateTime = 0
 let messageValue = ''
+var os = function() {
+  var ua = navigator.userAgent,
+  isWindowsPhone = /(?:Windows Phone)/.test(ua),
+  isSymbian = /(?:SymbianOS)/.test(ua) || isWindowsPhone,
+  isAndroid = /(?:Android)/.test(ua),
+  isFireFox = /(?:Firefox)/.test(ua),
+  isChrome = /(?:Chrome|CriOS)/.test(ua),
+  isTablet = /(?:iPad|PlayBook)/.test(ua) || (isAndroid && !/(?:Mobile)/.test(ua)) || (isFireFox && /(?:Tablet)/.test(ua)),
+  isPhone = /(?:iPhone)/.test(ua) && !isTablet,
+  isPc = !isPhone && !isAndroid && !isSymbian;
+  return {
+  isTablet: isTablet,
+  isPhone: isPhone,
+  isAndroid: isAndroid,
+  isPc: isPc
+  };
+  }();
 message.config({
   getContainer: ()=>document.getElementById('allHSBC')
 })
@@ -262,8 +279,8 @@ class Video extends Component {
       let result = await API.getBase64Image({ fileName: data});
       console.log('getBase64Image',result)
       this.props.imgCallback({
-        type: result.data.type, 
-        file: result.data.fileName}
+        type: result.data.type + '', 
+        file: result.data.base64Image}
         )
     } catch (err) {
       console.error(err);
@@ -1437,7 +1454,7 @@ class Video extends Component {
         // 一炒多的图片
         if (Mival.sessionId == this.state.sessionId) {
           this.props.imgCallback({
-            type: Mival.data.type, 
+            type: Mival.data.type + '', 
             file: Mival.data.file}
             ) // 文字抄录和风险抄录，3--风险，，2--文字
         }
@@ -2733,7 +2750,7 @@ class Video extends Component {
     this.test_controller.OnStartRemoteRecordSucc = (record_id) => {
       console.log('开始服务端录制成功', record_id);
       this.state.recordId = record_id
-      this.videoRecordCallback('1')
+      this.videoRecordCallback('1',true)
     };
     // 开始服务端录制失败
     this.test_controller.OnStartRemoteRecordFailed = (
@@ -2741,12 +2758,13 @@ class Video extends Component {
       err_code,
       err_msg
     ) => {
+      this.videoRecordCallback('1',false)
       console.log('开始服务端录制失败', record_id, err_code, err_msg)
     };
     // 结束服务端录制成功
     this.test_controller.OnStopRemoteRecordSucc = (recordId) => {
       console.log('结束服务端录制成功', recordId);
-      this.videoRecordCallback('2')
+      this.videoRecordCallback('2',true)
       // this.endSessionValue()
       // 获取服务端录制结果
     };
@@ -2756,6 +2774,7 @@ class Video extends Component {
       err_code,
       err_msg
     ) => {
+      this.videoRecordCallback('2',false)
       console.log('结束服务端录制失败', recordId, err_code, err_msg)
     };
     // 开启浏览器录制成功
@@ -3069,12 +3088,13 @@ class Video extends Component {
       
     };
   }
-  videoRecordCallback = async(type)=>{
+  videoRecordCallback = async(type,status)=>{
     try {
       let result = await API.videoRecordCallback({
         activityId: this.props.businessNumber,
         sessionId: this.state.sessionId,
-        type: type
+        type: type,
+        status: status
       });
       console.log(result);
     } catch (err) {
@@ -4004,8 +4024,15 @@ class Video extends Component {
   handleCancelSign=()=>{
     this.signCanvas.current.clear()
   }
-
+  
   navigatorClick=()=>{
+    if(os.isAndroid || os.isPhone) {
+      console.log("手机")
+      } else if(os.isTablet) {
+        console.log("平板")
+      } else if(os.isPc) {
+        console.log("电脑")
+      }
     const that = this
     const publish_config = {};
     const canvas = document.createElement('canvas');
@@ -4015,12 +4042,24 @@ class Video extends Component {
     const right = document.getElementById("whiteboardDIV").getBoundingClientRect().right
     const top = document.getElementById("whiteboardDIV").getBoundingClientRect().top
     const bottom = document.getElementById("whiteboardDIV").getBoundingClientRect().bottom
-    const width = (right - left)* window.screen.width / document.body.clientWidth
-    const height = ((bottom - top)* window.screen.width / document.body.clientWidth) - 50
-    const x = left * window.screen.width / document.body.clientWidth
-    const y = top* window.screen.width / document.body.clientWidth
-    canvas.width = 1280;
-    canvas.height = 720;
+    let width = 0
+    let height = 0
+    let x = 0
+    let y = 0
+    // if(os.isTablet){
+      width = (right - left)* window.screen.width / document.body.clientWidth
+      height = ((bottom - top)* window.screen.width / document.body.clientWidth) - 50
+      x = left * window.screen.width / document.body.clientWidth + 2
+      y = top* window.screen.width / document.body.clientWidth
+    // }
+    // if(os.isPc) {
+    //   width = right - left
+    //   height = bottom - top
+    //   x = left
+    //   y = top
+    // }
+    canvas.width = 960;
+    canvas.height = 540;
     cobj.fillStyle = 'rgb(255 255 255)'
     cobj.fillRect(0,0,1280,720)
     // const height1 = document.getElementById("whiteboardDIV").getBoundingClientRect().height* window.screen.height / (document.body.clientHeight + 280)
@@ -4031,10 +4070,7 @@ class Video extends Component {
       loop()
       function loop() {
           if (!$this.paused && !$this.ended) {
-            
-            // console.log('addEventListener',x,y,width,height1,height)
-            
-            cobj.drawImage(videoMedia, x, y, width, height, 0, 0,1280, 720);
+            cobj.drawImage(videoMedia, x, y, width, height, 0, 0,960, 540);
               setTimeout(loop, 1000 / 10); // drawing at 30fps
           }
       }
@@ -4074,12 +4110,19 @@ class Video extends Component {
       streamShare = ''
     }
     videoMedia.srcObject = stream;
-    stream.getVideoTracks()[0].applyConstraints({
-      // width: document.body.clientWidth,
-      // height: document.body.clientHeight
-      width: window.screen.width,
-      height: window.screen.height
-    })
+    // if(os.isTablet){
+      stream.getVideoTracks()[0].applyConstraints({
+        width: window.screen.width,
+        height: window.screen.height
+      })
+    // }
+    // if(os.isPc) {
+    //   stream.getVideoTracks()[0].applyConstraints({
+    //     width: document.body.clientWidth,
+    //     height: document.body.clientHeight - 50
+    //   })
+    // }
+    
     streamShare = stream
     stream.getVideoTracks()[0].onended = async ()=>{
       //单击停止共享按钮后，触发这个事件