Merge branch 'dev/4.0.0-GA' of github.com:AgoraIO/API-Examples into dev/4.0.0-GA

Author: zhaoyongqiang

Android/APIExample/app/build.gradle

@@ -36,7 +36,23 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    implementation 'io.agora.rtc:agora-full-beta:4.0.0-beta.1'
+
+    def agora_sdk_version = "4.0.0.test3"
+    // case 1: full lib
+    // implementation "io.agora.rtc:agora-special-full:${agora_sdk_version}"
+    // case 2: partial lib
+    implementation "io.agora.rtc:full-rtc-basic-special:${agora_sdk_version}"
+    implementation "io.agora.rtc:ains:${agora_sdk_version}"
+    implementation "io.agora.rtc:full-super-resolution:${agora_sdk_version}"
+    implementation "io.agora.rtc:full-virtual-background:${agora_sdk_version}"
+    implementation "io.agora.rtc:full-content-inspect:${agora_sdk_version}"
+    implementation "io.agora.rtc:full-screen-sharing:${agora_sdk_version}"
+    implementation "io.agora.rtc:spatial-audio:${agora_sdk_version}"
+    implementation "io.agora.rtc:audio-beauty:${agora_sdk_version}"
+    implementation "io.agora.rtc:screen-capture:${agora_sdk_version}"
+    implementation "io.agora.rtc:clear-vision:${agora_sdk_version}"
+    implementation "io.agora.rtc:pvc:${agora_sdk_version}"
+
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

Android/APIExample/app/src/main/java/io/agora/api/example/ExampleActivity.java

@@ -1,16 +1,26 @@
 package io.agora.api.example;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 
+import com.yanzhenjie.permission.AndPermission;
+import com.yanzhenjie.permission.runtime.Permission;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import io.agora.api.example.common.Constant;
 import io.agora.api.example.common.model.ExampleBean;
 import io.agora.api.example.examples.advanced.AdjustVolume;
@@ -167,9 +177,40 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 fragment = new JoinChannelAudio();
                 break;
         }
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.fragment_Layout, fragment)
-                .commit();
+        runOnPermissionGranted(()-> {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.fragment_Layout, fragment)
+                    .commit();
+        });
+    }
+
+    @SuppressLint("WrongConstant")
+    private void runOnPermissionGranted(@NonNull Runnable runnable){
+        List<String> permissionList = new ArrayList<>();
+        permissionList.add(Permission.READ_EXTERNAL_STORAGE);
+        permissionList.add(Permission.WRITE_EXTERNAL_STORAGE);
+        permissionList.add(Permission.RECORD_AUDIO);
+        permissionList.add(Permission.CAMERA);
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
+            permissionList.add(Manifest.permission.BLUETOOTH_CONNECT);
+        }
+
+        String[] permissionArray = new String[permissionList.size()];
+        permissionList.toArray(permissionArray);
+
+        if (AndPermission.hasPermissions(this,permissionArray))
+        {
+            runnable.run();
+            return;
+        }
+        // Request permission
+        AndPermission.with(this).runtime().permission(
+                permissionArray
+        ).onGranted(permissions ->
+        {
+            // Permissions Granted
+            runnable.run();
+        }).start();
     }
 
     @Override

windows/APIExample/APIExample/APIExample.rc

@@ -276,7 +276,7 @@ BEGIN
     LTEXT           "",IDC_STATIC_DETAIL,442,325,181,58
     EDITTEXT        IDC_EDIT_AUDIO_MIX_PATH,71,345,218,13,ES_AUTOHSCROLL
     CONTROL         "only local play",IDC_CHK_ONLY_LOCAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,307,365,61,10
-    CONTROL         "replace microphone",IDC_CHK_REPLACE_MICROPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,374,365,78,10
+    CONTROL         "replace microphone",IDC_CHK_REPLACE_MICROPHONE,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,374,365,78,10
     LTEXT           "repeat times",IDC_STATIC_AUDIO_REPEAT,11,363,48,8
     EDITTEXT        IDC_EDIT_AUDIO_REPEAT_TIMES,71,363,218,13,ES_AUTOHSCROLL
     CONTROL         "",IDC_SLIDER_VOLUME,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,66,381,224,15

windows/APIExample/APIExample/APIExample.vcxproj

@@ -365,6 +365,9 @@ copy $(SolutionDir)APIExample\Advanced\LocalVideoTranscoding\agora.jpg $(Solutio
     <None Include="res\APIExample.rc2" />
   </ItemGroup>
   <ItemGroup>
+    <CopyFileToFolders Include="res\agora.png">
+      <DeploymentContent>false</DeploymentContent>
+    </CopyFileToFolders>
     <Image Include="res\APIExample.ico" />
     <Image Include="res\IDB_NETWORK_QUALITY.bmp" />
     <CopyFileToFolders Include="res\local.bmp" />

windows/APIExample/APIExample/APIExample.vcxproj.filters

@@ -390,5 +390,8 @@
     <CopyFileToFolders Include="res\remote.bmp">
       <Filter>Resource Files</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="res\agora.png">
+      <Filter>Resource Files</Filter>
+    </CopyFileToFolders>
   </ItemGroup>
 </Project>

windows/APIExample/APIExample/Advanced/AudioMixing/CAgoraAudioMixingDlg.cpp

@@ -275,7 +275,6 @@ void CAgoraAudioMixingDlg::OnBnClickedButtonSetAudioMix()
 		//strAudioPath = "http://10.70.1.19:9091/file/api/download/electron-wayang/\%E5\%B9\%B4\%E5\%B0\%91\%E6\%9C\%89\%E4\%B8\%BA\%E6\%9D\%8E\%E8\%8D\%A3\%E6\%B5\%A9.mp3";
 		int nRet = m_rtcEngine->startAudioMixing(strAudioPath.c_str(),
 			bOnlyLocal,
-			bReplaceMicroPhone,
 			iRepeatTimes
 		);
 		strInfo.Format(_T("path:%s,\nonlyLocal:%s,\nReplaceMicroPhone:%s,\nRepeatTimes:%d"), strPath,

windows/APIExample/APIExample/Advanced/LocalVideoTranscoding/CLocalVideoTranscodingDlg.cpp

@@ -150,11 +150,11 @@ void CLocalVideoTranscodingDlg::OnBnClickedButtonJoinchannel()
 
 		stream_infos[i].x = 0;
 		stream_infos[i].y = 0;
-		stream_infos[i].width = 200;
-		stream_infos[i].height = 200;
+		stream_infos[i].width = 60;
+		stream_infos[i].height = 60;
 		stream_infos[i].imageUrl = m_imgPng.c_str();
 		stream_infos[i].mirror = false;
-		stream_infos[i].zOrder = 2;
+		stream_infos[i].zOrder = 3;
 		//jpg image
 		++i;
 		stream_infos[i].sourceType = agora::media::RTC_IMAGE_JPEG_SOURCE;
@@ -165,7 +165,7 @@ void CLocalVideoTranscodingDlg::OnBnClickedButtonJoinchannel()
 		stream_infos[i].height = 64;
 		stream_infos[i].imageUrl = m_imgJpg.c_str();
 		stream_infos[i].mirror = false;
-		stream_infos[i].zOrder = 2;
+		stream_infos[i].zOrder = 4;
 		//video encoder configuration
 		agora::rtc::VideoEncoderConfiguration encoder_config;
 		encoder_config.codecType = agora::rtc::VIDEO_CODEC_H264;

windows/APIExample/APIExample/Advanced/MediaPlayer/CAgoraMediaPlayer.cpp

@@ -343,9 +343,7 @@ void CAgoraMediaPlayer::OnBnClickedButtonPlay()
 	}
 }
 
-
-//push video button click handler.
-void CAgoraMediaPlayer::OnBnClickedButtonPublishVideo()
+void CAgoraMediaPlayer::ToggleMediaPlayerPublish()
 {
 	if (m_publishMeidaplayer) {
 		ChannelMediaOptions op;
@@ -368,7 +366,7 @@ void CAgoraMediaPlayer::OnBnClickedButtonPublishVideo()
 		options.publishMediaPlayerAudioTrack = true;
 		options.publishMediaPlayerId = m_mediaPlayer->getMediaPlayerId();
 		options.publishCameraTrack = false;
-		options.publishMicrophoneTrack  = false;
+		options.publishMicrophoneTrack = false;
 		options.autoSubscribeAudio = false;
 		options.autoSubscribeVideo = false;
 		m_rtcEngine->updateChannelMediaOptions(options);
@@ -378,6 +376,13 @@ void CAgoraMediaPlayer::OnBnClickedButtonPublishVideo()
 }
 
 
+//push video button click handler.
+void CAgoraMediaPlayer::OnBnClickedButtonPublishVideo()
+{
+	ToggleMediaPlayerPublish();
+}
+
+
 //show notify information
 void CAgoraMediaPlayer::OnSelchangeListInfoBroadcasting()
 {
@@ -434,6 +439,12 @@ LRESULT CAgoraMediaPlayer::OnmediaPlayerStateChanged(WPARAM wParam, LPARAM lPara
 		break;
 	case agora::media::base::PLAYER_STATE_STOPPED:
 		strState = _T("PLAYER_STATE_STOPPED");
+		//when player is stopped, unpublish the stream if it's publishing
+		//if player is stopped w/o stopping publishing, the timestamp will be incorrect next time it
+		//opens a media file again
+		if (m_publishMeidaplayer) {
+			ToggleMediaPlayerPublish();
+		}
 		break;
 	case agora::media::base::PLAYER_STATE_FAILED:
 		strState = _T("PLAYER_STATE_FAILED");

windows/APIExample/APIExample/Advanced/MediaPlayer/CAgoraMediaPlayer.h

@@ -267,7 +267,7 @@ class CAgoraMediaPlayer : public CDialogEx
 	afx_msg void OnBnClickedButtonOpen();
 	afx_msg void OnBnClickedButtonStop();
 	afx_msg void OnBnClickedButtonPlay();
-	
+	void ToggleMediaPlayerPublish();
 	afx_msg void OnBnClickedButtonPublishVideo();
 
 	afx_msg void OnSelchangeListInfoBroadcasting();

windows/APIExample/APIExample/Advanced/RegionConn/CAgoraRegionConnDlg.cpp

@@ -121,7 +121,11 @@ bool CAgoraRegionConnDlg::InitAgora()
 	m_cmbAreaCode.GetWindowText(area_code);
 
 	//set area code 
+	CString strInfo;
 	context.areaCode = m_mapAreaCode[area_code];
+	strInfo.Format(_T("areaCode: %u"), context.areaCode);
+	m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
+
 	context.eventHandler = &m_eventHandler;
 	//set channel profile in the engine to the CHANNEL_PROFILE_LIVE_BROADCASTING.
 	context.channelProfile = CHANNEL_PROFILE_LIVE_BROADCASTING;
@@ -240,7 +244,7 @@ BOOL CAgoraRegionConnDlg::OnInitDialog()
 
 	int nIndex = 0;
 
-	m_cmbAreaCode.InsertString(nIndex++, _T("AREA_CODE_GLOBAL"));
+	m_cmbAreaCode.InsertString(nIndex++, _T("AREA_CODE_GLOB"));
 	m_cmbAreaCode.InsertString(nIndex++, _T("AREA_CODE_CN"));
 	m_cmbAreaCode.InsertString(nIndex++, _T("AREA_CODE_NA"));
 	m_cmbAreaCode.InsertString(nIndex++, _T("AREA_CODE_EUR"));