Dev/4.3.1 (#375)

* update podfile source to china

* update podfile source to china

* gitee sync test

* [Android] gitee sync >> use china repos.

* fix sync shell

* [Android]revert to use common repo url.

* update sync script.

* update sync script.

* update sync script.

* Add download agora SDK when executing pod install and modify dependencies

* gitee sync modify source url

* modify podfile file script

* modify podfile file script

* update download ijk and swiftlint

* update ijk download script

* iOS Adapt to RTC 4.3.1 version

* [windows] Adapt to 4.3.1 sdk and ajust examples.

* mac Adapt to RTC 4.3.1 version

* [windows]enable use_audio4

* [Android]Adapt to 4.3.1 sdk

* [Android][Audio]Adapt to 4.3.1 sdk

* Change way of using salt (#374)

* Change way of using salt

* Add macOS support

* [Windows]perfect screen parameter adjusting.

* [windows]change way of using salt.

* [Android]Renew beauty api and etc.

* add package_script

* [windows]fix case switch crash.

* [windows]fix release compile problem.

* [windows]change slider notify to NW_RELEASEDCAPTURE.

* [windows]show startCameraCapture error.

* [Android]Fix fragment back bug.

* [windows]fix original video bug (NMS-20350).

* fix  pip bug

* fix  crash  bug

* fix  volume bug

* fix  stutter bug

* [Android]Update beauty api and fix bug(NMS-20393)

* [Android]Fix beauty effect bug.

* [Android]Update gradle config.

* [Android]Update gradle config.

* [Android]Add pip mode demo.

* [windows]update ci.

* [windows]update ci.

* [windows]update ci.

* [windows]update ci 2.

* [windows]update ci 3.

* open audio4

* Adapt to the new api

* Adapt to the new api

* Use AVPictureInPictureVideoCallViewController implements the function of custom View picture-in-picture

* add package_script

* update package script

* fix crash bug

* update package

* update package script

* [iOS/mac] update rtc version.

* [Android]fix AgoraFocalLengthInfo params bug.

* [Android]perfect code.

* [windows] fix deviceId compile error.

* fix gitee sync scrip bug.

* fix gitee sync scrip bug.

* [windows] fix device id bug.

---------

Co-authored-by: zhaoyongqiang <[email protected]>
Co-authored-by: sync2gitee <[email protected]>
Co-authored-by: xucz <[email protected]>
Co-authored-by: Sihán Zhū <[email protected]>

Author: 5 people

.github/ci/build/build_windows.bat

@@ -66,14 +66,11 @@ echo zip_name: %zip_name%
 
 dir
 
-echo off
-REM curl --silent %sdk_url% ./
-python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
+curl %sdk_url% -o %zip_name%
+REM python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
 7z x ./%zip_name% -y
-echo on
 
 dir
-
 rmdir /S /Q Agora_Native_SDK_for_Windows_FULL\demo
 del /F /Q Agora_Native_SDK_for_Windows_FULL\commits
 del /F /Q Agora_Native_SDK_for_Windows_FULL\package_size_report.txt

.github/ci/build/modify_podfile.py

@@ -5,15 +5,17 @@ def modfiy(path):
         contents = []
         for num, line in enumerate(file):
             if "pod 'Agora" in line:
-                line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'"
+                line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
             elif "pod 'sdk" in line:
                 line = ""
+            elif 'sh .download_script' in line:
+                line = line.replace('true', 'false') + "\n"
             contents.append(line)
         file.close()
 
         with open(path, 'w', encoding='utf-8') as fw:
             for content in contents:
-                fw.write(content + "\n")
+                fw.write(content)
             fw.close()
 
 

.github/workflows/gitee-sync-shell.sh

@@ -13,6 +13,19 @@ sed -ie "s#https://services.gradle.org/distributions#https://mirrors.cloud.tence
 git add Android/APIExample/settings.gradle Android/APIExample/gradle/wrapper/gradle-wrapper.properties Android/APIExample-Audio/settings.gradle Android/APIExample-Audio/gradle/wrapper/gradle-wrapper.properties
 git commit -m '[Android] gitee sync >> use china repos.'
 
+# change iOS Podfile to china repos
+python3 .github/workflows/modify_podfile.py iOS/APIExample/Podfile
+python3 .github/workflows/modify_podfile.py iOS/APIExample-Audio/Podfile
+python3 .github/workflows/modify_podfile.py iOS/APIExample-OC/Podfile
+python3 .github/workflows/modify_podfile.py macOS/Podfile
+
+# sed -ie '1s#^#source "https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git"\n#' iOS/APIExample/Podfile
+# sed -ie '1s#^#source "https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git"\n#' iOS/APIExample-Audio/Podfile
+# sed -ie '1s#^#source "https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git"\n#' iOS/APIExample-OC/Podfile
+# sed -ie '1s#^#source "https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git"\n#' macOS/Podfile
+git add iOS/APIExample/Podfile iOS/APIExample-Audio/Podfile iOS/APIExample-OC/Podfile macOS/Podfile
+git commit -m '[iOS] gitee sync >> use china repos.'
+
 git branch
 git status
 git push gitee

.github/workflows/gitee-sync.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.actor != 'dependabot[bot]'
     steps:
       - name: Gitee sync repo
-        uses: xgfd3/hub-mirror-action@v1.0
+        uses: xgfd3/hub-mirror-action@v1.4
         with:
           src: github/AgoraIO
           dst: gitee/agoraio-community
@@ -25,4 +25,5 @@ jobs:
           dst_token: ${{ secrets.GITEE_PRIVATE_TOKEN }}
           force_update: true
           account_type: org
-          shell_path: ./.github/workflows/gitee-sync-shell.sh
+          shell_path: ./.github/workflows/gitee-sync-shell.sh
+          github_ref: ${{ github.ref }}

.github/workflows/modify_podfile.py

@@ -0,0 +1,34 @@
+import os, sys
+
+def modfiy(path):
+    with open(path, 'r', encoding='utf-8') as file:
+        contents = []
+        for num, line in enumerate(file):
+            if "pod 'Agora" in line:
+                line = '\t'+"pod 'sdk', :path => 'sdk.podspec'" + "\n"
+            elif "pod 'sdk" in line:
+                line = ""
+            elif "pod 'Floaty" in line:
+                line = '\t'+"pod 'Floaty', :git => 'https://gitee.com/shengwang-dependencies/Floaty.git'" + "\n"
+            elif "pod 'AGEVideoLayout" in line:
+                line = '\t'+"pod 'AGEVideoLayout', :git => 'https://gitee.com/shengwang-dependencies/AGEVideoLayout.git'" + "\n"
+            elif "pod 'CocoaAsyncSocket" in line:
+                line = '\t'+"pod 'CocoaAsyncSocket', :git => 'https://gitee.com/shengwang-dependencies/CocoaAsyncSocket.git'" + "\n"
+            elif "pod 'SwiftLint" in line:
+                line = '\t'+"pod 'SwiftLint', :git => 'https://gitee.com/shengwang-dependencies/SwiftLint', :commit => '1067113303c134ef472a71b30d21e5350de7889d'" + "\n"
+            elif "pod 'ijkplayer" in line:
+                line = '\t'+"pod 'ijkplayer', :path => 'ijkplayer.podspec'" + "\n"
+            elif 'sh .download_script' in line:
+                line = line.replace('#', '').replace('false', 'true')
+            contents.append(line)
+        file.close()
+        
+        with open(path, 'w', encoding='utf-8') as fw:
+            for content in contents:
+                fw.write(content)
+            fw.close()
+
+
+if __name__ == '__main__':
+    path = sys.argv[1:][0]
+    modfiy(path.strip())

Android/APIExample-Audio/app/build.gradle

@@ -48,7 +48,7 @@ dependencies {
         implementation fileTree(dir: "${localSdkPath}", include: ['*.jar', '*.aar'])
     }
     else{
-        def agora_sdk_version = "4.3.0"
+        def agora_sdk_version = "4.3.1"
         // case 1: full single lib with voice only
         implementation "io.agora.rtc:voice-sdk:${agora_sdk_version}"
         // case 2: partial libs with voice only

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/MainActivity.java

@@ -30,9 +30,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     public boolean onSupportNavigateUp() {
-        NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
-        return NavigationUI.navigateUp(navController, appBarConfiguration)
-                || super.onSupportNavigateUp();
+        onBackPressed();
+        return false;
     }
 
     @Override

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/common/BaseFragment.java

@@ -36,7 +36,7 @@ public void handleOnBackPressed() {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         handler = new Handler(Looper.getMainLooper());
-        requireActivity().getOnBackPressedDispatcher().addCallback(onBackPressedCallback);
+        requireActivity().getOnBackPressedDispatcher().addCallback(this, onBackPressedCallback);
     }
 
     @Override

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/ProcessAudioRawData.java

@@ -334,7 +334,7 @@ public boolean onEarMonitoringAudioFrame(int type, int samplesPerChannel, int by
         }
 
         @Override
-        public boolean onPlaybackAudioFrameBeforeMixing(String channel, int uid, int audioFrameType, int samples, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer byteBuffer, long renderTimeMs, int bufferLength) {
+        public boolean onPlaybackAudioFrameBeforeMixing(String channelId, int uid, int type, int samplesPerChannel, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer buffer, long renderTimeMs, int avsync_type, int rtpTimestamp) {
             return false;
         }
 

Android/APIExample-Audio/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-7.3.3-bin.zip