react_hsbc_teller 0.3.1 → 0.3.2

package/package.json

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

package/packages/pages/video/video.jsx

@@ -727,6 +727,17 @@ class Video extends Component {
     // 发布媒体流成功
     this.test_controller.OnPublishSucc = (sid) => {
       console.log('发布媒体流成功', sid)
+      if(sid == document.getElementById('video10').name) {
+          callNimIM('sendCustomCmdMsg', {
+            customId: this.state.imRoomId,
+            content: JSON.stringify({
+              'typeId': 2030,
+              'sessionId': this.state.sessionId,
+              'sharedScreen': 1,
+              'tellerId': this.props.tellerAccount
+            })
+          });
+      }
     };
     // 发布媒体流失败
     this.test_controller.OnPublishFailed = (sid, err_code, err_msg) => {
@@ -778,7 +789,18 @@ class Video extends Component {
     };
     // 取消发布成功
     this.test_controller.OnUnPublishSucc = (sid) => {
-      console.log('取消发布成功', sid)
+      console.log('取消发布成功', sid,document.getElementById('publish_video1').name)
+      if(sid != document.getElementById('publish_video1').name) {
+        callNimIM('sendCustomCmdMsg', {
+          customId: this.state.imRoomId,
+          content: JSON.stringify({
+            'typeId': 2030,
+            'sessionId': this.state.sessionId,
+            'sharedScreen': 0,
+            'tellerId': this.props.tellerAccount
+          })
+        })
+      }
     };
     // 取消订阅媒体流成功
     this.test_controller.OnUnSubscribeSucc = (sid) => {
@@ -965,36 +987,6 @@ class Video extends Component {
     // 切流成功通知
     this.test_controller.OnChangeMediaStreamSuccess = (sid) => {
       console.log('切流成功通知', sid);
-      if (this.state.publishDevic == 2) {
-        // 打开共享
-        callNimIM('sendCustomCmdMsg', {
-          customId: this.state.imRoomId,
-          content: JSON.stringify({
-            'typeId': 2030,
-            'sessionId': this.state.sessionId,
-            'sharedScreen': 1,
-            'tellerId': this.props.tellerAccount
-          })
-        });
-        this.setState({
-          isSharedScreen: true,
-          screenName: '取消共享'
-        });
-      } else {
-        this.setState({
-          isSharedScreen: false,
-          screenName: '投屏'
-        });
-        callNimIM('sendCustomCmdMsg', {
-          customId: this.state.imRoomId,
-          content: JSON.stringify({
-            'typeId': 2030,
-            'sessionId': this.state.sessionId,
-            'sharedScreen': 0,
-            'tellerId': this.props.tellerAccount
-          })
-        })
-      }
     };
     // 切流失败通知
     this.test_controller.OnChangeMediaStreamFailed = (
@@ -1398,7 +1390,7 @@ class Video extends Component {
           publish_config.video_profile_type = 5
           publish_config.publish_video_id = 'video10'
           publish_config.publish_streamId_id = 'subscribe_streamId10'
-          publish_config.publish_tag = ''
+          publish_config.publish_tag = 'projectionWhiteboard'
           this.test_controller.Publish(publish_config)
         }
 
@@ -1678,7 +1670,7 @@ class Video extends Component {
         publish_config.part_of_screen_id = 'touBoxItem';
         publish_config.publish_video_id = 'video10'
         publish_config.publish_streamId_id = 'subscribe_streamId10'
-        publish_config.publish_tag = ''
+        publish_config.publish_tag = 'projectionWhiteboard'
         this.test_controller.Publish(publish_config)
       }
     } else{
@@ -1713,7 +1705,7 @@ class Video extends Component {
         <Spin spinning={this.state.loading} tip="视频初始化中...">
           <Header></Header>
           <div className="health">
-            <div className="projection" style={{ display: (this.state.isCustomer == 'noVideo') ? '' : 'none', }}>
+            <div className="projection" style={{ display: (this.state.isCustomer) ? '' : 'none', }}>
               <div className="button">
                 <div className={`${this.state.isSelect == 'video' ? 'selectSee' : "noSelest"}`} onClick={this.switchSelect.bind(this)}>视频画面</div>
                 <div className={`${this.state.isSelect == 'noVideo' ? 'selectSee' : "noSelest"}`} onClick={this.switchSelect.bind(this)}>投屏白板</div>
@@ -1805,9 +1797,7 @@ class Video extends Component {
                 </div>
 
               </div>
-              <div className={`itemed ${this.state.isBigVideo == 'video2' ? 'item1' : ""}`}>
-
-                <div onClick={this.enlargeClick.bind(this, 'isLangVideo2')}>
+              <div className={`itemed ${this.state.isBigVideo == 'video2' ? 'item1' : ""}`} onClick={this.enlargeClick.bind(this, 'isLangVideo2')}>
                   <video
                     id="video2"
                     autoPlay
@@ -1818,7 +1808,6 @@ class Video extends Component {
                   <label style={{ display: 'none' }} id="feedId2" type="text" />
                   {/* <div className='customerTitle'>客户</div> */}
                   <canvas style={{ display: (this.state.isCustomer) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView2" width="40" height="70"></canvas>
-                </div>
               </div>
               <div className={`itemed ${this.state.isBigVideo == 'video3' ? 'item1' : ""}`}
                 onClick={this.enlargeClick.bind(this, 'isLangVideo3')}>

package/packages/pages/video/video.less

@@ -79,8 +79,8 @@
   height: 100%;
 }
 .health{
-  margin: 20px;
-  height:  ~"calc(100vh - 60px)";
+  margin: 20px 20px 0 20px;
+  height:  ~"calc(100vh - 130px)";
 }
 .all{
   height: 100%;
@@ -144,7 +144,7 @@
 }
 .projection{
   width: 80%;
-  height: 88%;
+  height:  ~"calc(100vh - 130px)";
   position: absolute;
   z-index: 1;
   // background: #fff;