@@ -295,28 +295,32 @@ let MTComp = (function () {
295
295
}
296
296
} , [ props . endCall . value ] ) ;
297
297
298
+ useEffect ( ( ) => {
299
+ if ( rtmMessages ) {
300
+ dispatch (
301
+ changeChildAction ( "messages" , getData ( rtmMessages ) . data , false )
302
+ ) ;
303
+ }
304
+ } , [ rtmMessages ] ) ;
305
+
298
306
useEffect ( ( ) => {
299
307
if ( rtmChannelResponse ) {
300
308
rtmClient . on ( "MessageFromPeer" , function ( message , peerId ) {
301
- console . log ( "Message from: " + peerId + " Message: " + message . text ) ;
302
- setRtmMessages ( ( messages : any ) => [ ...messages , message . text ] ) ;
303
- console . log ( "messages " + rtmMessages ) ;
304
- dispatch (
305
- changeChildAction ( "messages" , getData ( rtmMessages ) . data , false )
309
+ console . log (
310
+ "Message from: " + peerId + " Message: " + message . text
306
311
) ;
312
+ setRtmMessages ( message . text ) ;
307
313
} ) ;
308
314
rtmChannelResponse . on ( "ChannelMessage" , function ( message , memberId ) {
309
315
console . log ( "Message received from: " + memberId , message . text ) ;
310
- setRtmMessages ( ( messages : any ) => [ ... messages , message . text ] ) ;
316
+ setRtmMessages ( message . text ) ;
311
317
dispatch (
312
318
changeChildAction ( "messages" , getData ( rtmMessages ) . data , false )
313
319
) ;
314
320
} ) ;
315
321
}
316
322
} , [ rtmChannelResponse ] ) ;
317
323
318
- console . log ( "rtmMessages " , props . messages ) ;
319
-
320
324
useEffect ( ( ) => {
321
325
client . on ( "user-joined" , ( user : IAgoraRTCRemoteUser ) => {
322
326
let userData = {
@@ -539,21 +543,28 @@ MTComp = withMethodExposing(MTComp, [
539
543
params : [ ] ,
540
544
} ,
541
545
execute : async ( comp , values ) => {
542
- let message = {
543
- time : new Date ( ) . getMilliseconds ( ) ,
544
- from : comp . children . localUser . getView ( ) ,
546
+ let otherData =
547
+ values != undefined && values [ 1 ] !== undefined ? values [ 1 ] : "" ;
548
+ let toUsers : any =
549
+ values != undefined && values [ 0 ] !== undefined ? values [ 0 ] : "" ;
550
+
551
+ let message : any = {
552
+ time : Date . now ( ) ,
553
+ from : userId ,
545
554
} ;
546
- console . log ( values ) ;
555
+ message [ "data" ] = otherData ;
556
+
557
+ console . log ( toUsers ) ;
547
558
548
- if ( values != undefined && values [ 0 ] !== undefined ) {
549
- let peers = values ?. map ( ( u : any ) => u . user ) ;
550
- peers . forEach ( ( p ) => {
559
+ if ( toUsers . length > 0 && toUsers [ 0 ] !== undefined ) {
560
+ let peers = toUsers ?. map ( ( u : any ) => u . user ) ;
561
+ console . log ( "peers" , peers ) ;
562
+ peers . forEach ( ( p : any ) => {
551
563
sendPeerMessageRtm ( message , String ( p ) ) ;
552
564
} ) ;
553
565
} else {
554
566
sendMessageRtm ( message ) ;
555
567
}
556
- comp . children . messages . getView ( ) ;
557
568
} ,
558
569
} ,
559
570
{
0 commit comments