agora-appbuilder-core 4.0.0-spl.16 → 4.0.0-spl.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.0.0-spl.16",
+  "version": "4.0.0-spl.18",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/bridge/rtc/webNg/RtcEngine.ts

@@ -165,9 +165,18 @@ if ($config.GEO_FENCING) {
 }
 
 if ($config.LOG_ENABLED) {
-  AgoraRTC.setLogLevel(0);
+  if (
+    (APPBUILDER_PUBLIC_TARGET === 'wsdk' ||
+      APPBUILDER_PUBLIC_TARGET === 'rsdk') &&
+    APPBUILDER_PUBLIC_NODE_ENV === 'production'
+  ) {
+    AgoraRTC.setLogLevel(4);
+  } else {
+    AgoraRTC.setLogLevel(0);
+  }
   AgoraRTC.enableLogUpload();
 } else {
+  AgoraRTC.setLogLevel(4);
   AgoraRTC.disableLogUpload();
 }
 
@@ -224,6 +233,9 @@ export default class RtcEngine {
 
   async enableAudio(): Promise<void> {
     const audioConfig: MicrophoneAudioTrackInitConfig = {
+      encoderConfig: $config.AUDIO_ENCODER_CONFIG_PRESET
+        ? $config.AUDIO_ENCODER_CONFIG_PRESET
+        : undefined,
       bypassWebAudio: Platform.OS == 'web' && isMobileOrTablet(),
       // microphoneId: this.audioDeviceId,
     };
@@ -257,6 +269,9 @@ export default class RtcEngine {
     const audioConfig: MicrophoneAudioTrackInitConfig = {
       bypassWebAudio: Platform.OS == 'web' && isMobileOrTablet(),
       microphoneId: preferredMicrophoneId,
+      encoderConfig: $config.AUDIO_ENCODER_CONFIG_PRESET
+        ? $config.AUDIO_ENCODER_CONFIG_PRESET
+        : undefined,
     };
     const videoConfig: CameraVideoTrackInitConfig = {
       encoderConfig: this.videoProfile,
@@ -307,7 +322,32 @@ export default class RtcEngine {
           localVideo = await AgoraRTC.createCameraVideoTrack(videoConfig);
         } catch (e) {
           videoConfig.cameraId = '';
-          localVideo = await AgoraRTC.createCameraVideoTrack(videoConfig);
+          try {
+            localVideo = await AgoraRTC.createCameraVideoTrack(videoConfig);
+          } catch (e) {
+            console.log(
+              '[RTCEngineBridge]: Provided cameraId and default camera failed, trying other available devices',
+            );
+            const devices = await navigator.mediaDevices.enumerateDevices();
+            for (let device of devices) {
+              if (device.kind === 'videoinput') {
+                videoConfig.cameraId = device.deviceId;
+                try {
+                  localVideo = await AgoraRTC.createCameraVideoTrack(
+                    videoConfig,
+                  );
+                  break;
+                } catch (e) {
+                  console.log(
+                    '[RTCEngineBridge]:',
+                    'Camera not available with deviceId' + device,
+                    'Reason: ',
+                    e,
+                  );
+                }
+              }
+            }
+          }
         }
         this.localStream.video = localVideo;
         this.videoDeviceId = localVideo

package/template/global.d.ts

@@ -99,6 +99,7 @@ interface ConfigInterface {
   TOOLBAR_COLOR: string;
   ACTIVE_SPEAKER: boolean;
   TOAST_NOTIFICATIONS: boolean;
+  AUDIO_ENCODER_CONFIG_PRESET: string;
 }
 declare var $config: ConfigInterface;
 

package/template/index.rsdk.tsx

@@ -28,10 +28,6 @@ interface AppBuilderReactSdkInterface extends AppBuilderSdkApiInterface {
   View: React.FC;
 }
 
-if (APPBUILDER_PUBLIC_NODE_ENV === 'production') {
-  AgoraRTC.setLogLevel(4);
-}
-
 const AppBuilderReactSdkApi: AppBuilderReactSdkInterface = {
   ...AppBuilderSdkApi,
   View: SDKAppWrapper,

package/template/index.wsdk.tsx

@@ -10,10 +10,6 @@ import AgoraRTC from 'agora-rtc-sdk-ng';
 export * from 'customization-api';
 export * from 'customization-implementation';
 
-if (APPBUILDER_PUBLIC_NODE_ENV === 'production') {
-  AgoraRTC.setLogLevel(4);
-}
-
 const AppBuilderWebSdkApi: AppBuilderSdkApiInterface = AppBuilderSdkApi;
 
 // init code