3.22医生

TUICallKit/TUICallKit/TUICallKit.js

@@ -1,6 +1,4 @@
-import { TUIStore, StoreName, NAME } from "../index";
-import { TUICallKitServer } from "../TUICallService/index";
-
+import { TUICallKitServer,TUIStore, StoreName, NAME } from "../index";
 const {
   CALL_STATUS,
   CALL_ROLE,
@@ -207,6 +205,7 @@ Component({
   lifetimes: {
     attached() {
       let that = this;
+   
       TUIStore.watch(
         StoreName.CALL,
         {
@@ -231,6 +230,7 @@ Component({
     },
     async detached() {
       let that = this;
+      TUICallKitServer.getTUICallEngineInstance().handleExceptionExit();
       TUIStore.unwatch(StoreName.CALL, {
         [CALL_STATUS]: this.handleCallStatusChange.bind(that),
         [IS_GROUP]: this.handleIsGroupChange.bind(that),
@@ -246,7 +246,7 @@ Component({
         [PUSHER]: this.handlePusherChange.bind(that),
         [PLAYER]: this.handlePlayerListChange.bind(that),
       });
-      await TUICallKitServer.reject();
+     
     },
   },
 });

TUICallKit/TUICallKit/component/SingleCall/SingleCall.js

@@ -44,9 +44,8 @@ Component({
     moved(){
         //console.log('moved')
     },
-    detached(){
-        //console.log('detached')
-        this.hangup()
+    async detached(){
+    
     }
   },
   pageLifetimes: {
@@ -54,7 +53,7 @@ Component({
      
     },
     hide() {
-     this.hangup()
+     // this.hangup()
     },
   },
   data:{
@@ -69,7 +68,8 @@ Component({
     IMG_CAMERA_FALSE:`${PATH}/doctor_camera_false.png`,
     IMG_TRANS:`${PATH}/doctor_trans.png`,
     IMG_SWITCH_CAMERA:`${PATH}/doctor_switch_camera.png`,
-    patient_avatar:wx.getStorageSync('patient_avatar')
+    patient_avatar:wx.getStorageSync('patient_avatar'),
+    patient_name:wx.getStorageSync('patientInfo')?wx.getStorageSync('patientInfo').patient_family_data.patient_name:''
   },
   methods: {
     async accept() {
@@ -77,11 +77,9 @@ Component({
     },
     async hangup() {
       await TUICallKitServer.hangup();
-      console.log(this.data.remoteUserInfoList)
     },
     async reject() {
       await TUICallKitServer.reject();
-      //console.log(this.data.remoteUserInfoList)
     },
     async switchCamera() {
       await TUICallKitServer.switchCamera();

TUICallKit/TUICallKit/component/SingleCall/SingleCall.wxml

@@ -20,7 +20,7 @@
   <view wx:if="{{callStatus === 'calling' && callMediaType === 2}}" class="invite-calling">
     <view class="invite-calling-header">
         <view class="other-view white" wx:if="{{callRole == 'caller'}}">
-        <text>{{callDuration}}</text>
+        <text>{{patient_name}}</text>
       </view>
       <view class="invite-calling-header-right">
        

TUICallKit/TUICallService/serve/callManager.js

@@ -87,9 +87,11 @@ class CallManager {
         });
     }
     _handleCallStatusToCalling() {
+        console.log('isPageRedirected:'+this._isPageRedirected);
         if (this._isPageRedirected)
             return;
         this._targetPagePath = this.getRoute().route;
+        console.log('videourl:'+`/${this._globalCallPagePath}`);
         // @ts-ignore
         wx.navigateTo({
             url: `/${this._globalCallPagePath}`,
@@ -115,6 +117,7 @@ class CallManager {
                 this._isPageRedirected = false;
             },
             fail: () => {
+                this._isPageRedirected = false;
                 console.error(`${PREFIX} navigateBack fail!`);
             },
             complete: () => { },

TUICallKit/TUICallService/serve/callManager.ts

@@ -95,6 +95,7 @@ export class CallManager {
         this._isPageRedirected = false;
       },
       fail: () => {
+        this._isPageRedirected = false;
         console.error(`${PREFIX} navigateBack fail!`);
       },
       complete: () => {},

TUICallKit/pages/globalCall/globalCall.js

@@ -1,9 +1,11 @@
+import { TUICallKitServer } from "../../index";
 Page({
   data: {},
   onShow() {
 
   },
   onHide(){
+    TUICallKitServer.getTUICallEngineInstance().handleExceptionExit();
      console.log('接听页面隐藏'); 
   }
 });