agora-appbuilder-core 1.0.8 → 1.0.9

package/template/agora-rn-uikit/src/Controls/BtnTemplate.tsx

@@ -5,8 +5,6 @@ import {
   StyleProp,
   TouchableOpacityProps,
   ViewStyle,
-  Text,
-  View,
 } from 'react-native';
 import PropsContext from './../PropsContext';
 import styles from '../Style';
@@ -17,7 +15,6 @@ interface BtnTemplateInterface {
   color?: string;
   onPress?: TouchableOpacityProps['onPress'];
   style?: StyleProp<ViewStyle>;
-  btnText?: string;
 }
 
 const BtnTemplate: React.FC<BtnTemplateInterface> = (props) => {
@@ -25,37 +22,30 @@ const BtnTemplate: React.FC<BtnTemplateInterface> = (props) => {
   const {BtnTemplateStyles, theme} = styleProps || {};
 
   return (
-    <TouchableOpacity onPress={props.onPress}>
-      <View
+    <TouchableOpacity
+      style={{
+        ...styles.controlBtn,
+        ...(BtnTemplateStyles as object),
+        ...(props.style as object),
+      }}
+      // onPress={props.onPress}
+      onPress={() => {
+        console.log('pressed mute')
+        props.onPress()
+      }}
+      >
+      <Image
         style={{
-          ...styles.controlBtn,
-          ...(BtnTemplateStyles as object),
-          ...(props.style as object),
-        }}>
-        <Image
-          style={{
-            width: '100%',
-            height: '100%',
-            tintColor:
-              props.name !== 'callEnd'
-                ? theme || props.color || '#fff'
-                : '#FD0845',
-          }}
-          resizeMode={'contain'}
-          source={{uri: icons[props.name]}}
-        />
-      </View>
-      <Text
-        style={{
-          textAlign: 'center',
-          marginTop: 5,
-          color:
+          width: '100%',
+          height: '100%',
+          tintColor:
             props.name !== 'callEnd'
               ? theme || props.color || '#fff'
               : '#FD0845',
-        }}>
-        {props.btnText}
-      </Text>
+        }}
+        resizeMode={'contain'}
+        source={{uri: icons[props.name]}}
+      />
     </TouchableOpacity>
   );
 };

package/template/agora-rn-uikit/src/Controls/Local/EndCall.tsx

@@ -13,7 +13,6 @@ function EndCall() {
   return (
     <BtnTemplate
       name={'callEnd'}
-      btnText={'Hang Up'}
       style={{...styles.endCall, ...(endCall as object)}}
       onPress={() =>
         (dispatch as DispatchType<'EndCall'>)({

package/template/agora-rn-uikit/src/Controls/Local/LocalAudioMute.tsx

@@ -15,7 +15,6 @@ function LocalAudioMute() {
   return (
     <BtnTemplate
       name={local.audio ? 'mic' : 'micOff'}
-      btnText={'Audio'}
       style={{...styles.localBtn, ...(muteLocalAudio as object)}}
       onPress={() => {
         (dispatch as DispatchType<'LocalMuteAudio'>)({

package/template/agora-rn-uikit/src/Controls/Local/LocalVideoMute.tsx

@@ -15,7 +15,6 @@ function LocalVideoMute() {
   return (
     <BtnTemplate
       name={local.video ? 'videocam' : 'videocamOff'}
-      btnText={'Video'}
       style={{...styles.localBtn, ...(muteLocalVideo as object)}}
       onPress={() => {
         (dispatch as DispatchType<'LocalMuteVideo'>)({

package/template/agora-rn-uikit/src/Controls/Local/SwitchCamera.tsx

@@ -13,7 +13,6 @@ function SwitchCamera() {
     <BtnTemplate
       name={'switchCamera'}
       style={{...styles.localBtn, ...(switchCamera as object)}}
-      btnText={'Switch'}
       onPress={() => {
         // RtcEngine.switchCamera();
         (dispatch as DispatchType<'SwitchCamera'>)({

package/template/agora-rn-uikit/src/RTCConfigure.tsx

@@ -201,6 +201,7 @@ const RtcConfigure: React.FC<Partial<RtcPropsInterface>> = (props) => {
         };
         break;
       case 'LocalMuteVideo':
+        console.log('Switch: Local mute video', {value: action.value}, {state});
         (engine.current as RtcEngine).muteLocalVideoStream(
           (action as ActionType<'LocalMuteAudio'>).value[0],
         );
@@ -307,6 +308,49 @@ const RtcConfigure: React.FC<Partial<RtcPropsInterface>> = (props) => {
     },
     [dualStreamMode],
   );
+
+  const getRemoteVolume = () => {
+    console.log('getting remote user track');
+    // console.log(engine.current.client.remoteUsers);
+    const client = engine?.current?.client;
+    if (client) {
+      const {remoteUsers} = client;
+
+      const userVolume = remoteUsers.map(
+        (remoteUser: {uid: any; audioTrack: any; hasAudio: boolean}) => {
+          const {uid, audioTrack, hasAudio} = remoteUser;
+          console.log({remoteUser}, {hasAudio});
+          return {
+            uid,
+            volumeLevel: hasAudio ? audioTrack.getVolumeLevel() : 0,
+          };
+        },
+      );
+      console.log({userVolume});
+      const highestvolumeObj = volumes.reduce(
+        (highestVolume, volume, index) => {
+          if (highestVolume === null) {
+            return volume;
+          } else {
+            if (volume.level > highestVolume.level) {
+              return volume;
+            }
+            return highestVolume;
+          }
+          // console.log(`${index} UID ${volume.uid} Level ${volume.level}`);
+        },
+        null,
+      );
+      const activeSpeaker = highestvolumeObj ? highestvolumeObj.uid : undefined;
+    }
+  };
+  // useEffect(() => {
+  //   const timer = setInterval(getRemoteVolume, 1000);
+  //   return () => {
+  //     clearInterval(timer);
+  //   };
+  // }, []);
+
   const [uidState, dispatch] = useReducer(reducer, initialState);
 
   // When mode is updated, reducer is triggered to update the individual states
@@ -460,20 +504,21 @@ const RtcConfigure: React.FC<Partial<RtcPropsInterface>> = (props) => {
         });
       }
       if (engine.current) {
-        if(uidState.max[0].video){
+        if (uidState.max[0].video) {
+          console.log('another place 1');
           await engine.current.muteLocalVideoStream(true);
         }
-        
+
         await engine.current.joinChannel(
           rtcProps.token || null,
           rtcProps.channel,
           null,
           rtcProps.uid || 0,
         );
-        if(uidState.max[0].video){
+        if (uidState.max[0].video) {
+          console.log('another place 2');
           await engine.current.muteLocalVideoStream(false);
         }
-
       } else {
         console.error('trying to join before RTC Engine was initialized');
       }

package/template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "HelloWorld",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "main": ".electron/index.js",
   "scripts": {
@@ -71,6 +71,7 @@
   "devDependencies": {
     "@babel/core": "7.14.3",
     "@babel/plugin-proposal-class-properties": "7.14.5",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
     "@babel/preset-env": "7.14.4",
     "@babel/preset-react": "7.13.13",
     "@babel/preset-typescript": "7.13.0",
@@ -92,7 +93,7 @@
     "babel-plugin-transform-define": "2.0.0",
     "cross-env": "7.0.3",
     "del": "5.1.0",
-    "electron": "5.0.8",
+    "electron": "16.0.1",
     "electron-builder": "22.10.5",
     "electron-notarize": "1.0.0",
     "eslint": "6.8.0",

package/template/react-native-toast-message/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+.git
+node_modules
+.idea
+coverage

package/template/react-native-toast-message/.npmignore

@@ -0,0 +1,5 @@
+__tests__
+coverage
+.eslintrc.js
+.prettierrc.js
+success-toast.gif