Hotfix/4.0.0 (#28)

* update renew token

* fix renewtoken bug

* fix error

* update ktvapi

* update ktvapi

* Develop/4.0 ios (#14)

* fix error

* update ktvapi

* update ktvapi

* update v4.0.0 KTVAPI Android (#16)

* update v4.0.0 KTVAPI Android

* renew ktvapi

---------

Co-authored-by: CYG <[email protected]>

* optimize readme (#19)

Co-authored-by: CYG <[email protected]>

* optimize demo (#20)

Co-authored-by: CYG <[email protected]>

* update logic

* Dev/4.0.0 android demo (#22)

* optimize demo

* optimize demo

* Update README.md

---------

Co-authored-by: CYG <[email protected]>

* Update README.md

* [Android]optimize readme

* Update README.md

* Update README.md

* [Android]repalce song

* Update README.md

* Update README.md

* update ktvapi

* update ktvapi

* update mic logic

* [Android]fix ktvapi

* hook

* [Android]fix bugs

---------

Co-authored-by: zhangwei <[email protected]>
Co-authored-by: chenpark <[email protected]>
Co-authored-by: CYG <[email protected]>

Author: 4 people

.githooks/pre-commit

@@ -0,0 +1,14 @@
+bash
+#!/bin/bash
+
+# 检查即将提交的文件是否包含 AGORA_APP_ID=
+if git diff --cached | grep -q '^+AGORA_APP_ID='; then
+  echo "ERROR: AGORA_APP_ID cannot be committed."
+  exit 1
+fi
+
+# 检查即将提交的文件是否包含 AGORA_APP_CERTIFICATE=
+if git diff --cached | grep -q '^+AGORA_APP_CERTIFICATE='; then
+  echo "ERROR: AGORA_APP_CERTIFICATE cannot be committed."
+  exit 1
+fi

KTVAPI/Android/app/build.gradle

@@ -58,6 +58,8 @@ android {
     }
 }
 
+apply from: "${rootDir.absolutePath}/git-hooks.gradle"
+
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.7.0'

KTVAPI/Android/app/src/main/java/io/agora/ktvdemo/ui/LivingFragment.kt

@@ -140,6 +140,7 @@ class LivingFragment : BaseFragment<FragmentLivingBinding>() {
                             if (KeyCenter.isLeadSinger()) {
                                 ktvApi.switchSingerRole(KTVSingRole.LeadSinger, object : ISwitchRoleStateListener {
                                     override fun onSwitchRoleSuccess() {
+
                                         // 加载成功开始播放音乐
                                         ktvApi.startSing(KeyCenter.songCode, 0)
                                     }
@@ -177,6 +178,7 @@ class LivingFragment : BaseFragment<FragmentLivingBinding>() {
                         }
                     })
                 } else {
+
                     // 使用本地音乐文件
                     val musicConfiguration = KTVLoadMusicConfiguration(
                         KeyCenter.songCode.toString(), false, KeyCenter.LeadSingerUid, KTVLoadMusicMode.LOAD_NONE
@@ -280,6 +282,7 @@ class LivingFragment : BaseFragment<FragmentLivingBinding>() {
                 url?.let {
                     dealDownloadLrc(it)
                 }
+
             }
 
             override fun onHighPartTime(highStartTime: Long, highEndTime: Long) {

KTVAPI/Android/git-hooks.gradle

@@ -0,0 +1,6 @@
+task installGitHooks(type: Copy){
+    from "${rootDir.absolutePath}/../../.githooks/pre-commit"
+    into "${rootDir.absolutePath}/../../.git/hooks"
+    include 'pre-commit'
+}
+preBuild.dependsOn installGitHooks

KTVAPI/Android/lib_ktvapi/src/main/java/io/agora/ktvapi/KTVApiImpl.kt

@@ -313,7 +313,7 @@ class KTVApiImpl : KTVApi, IMusicContentCenterEventHandler, IMediaPlayerObserver
     // 6、SoloSinger -》LeadSinger
     // 7、LeadSinger -》SoloSinger
     // 8、LeadSinger -》Audience
-    // 9、Cosinger -》LeadSinger
+    // 9、CoSinger -》LeadSinger
     var singerRole: KTVSingRole = KTVSingRole.Audience
     override fun switchSingerRole(
         newRole: KTVSingRole,
@@ -325,6 +325,7 @@ class KTVApiImpl : KTVApi, IMusicContentCenterEventHandler, IMediaPlayerObserver
         // 调整开关麦状态
         if ((oldRole == KTVSingRole.LeadSinger || oldRole == KTVSingRole.SoloSinger) && (newRole == KTVSingRole.CoSinger || newRole == KTVSingRole.Audience) && !isOnMicOpen) {
             mRtcEngine.muteLocalAudioStream(true)
+            mRtcEngine.adjustRecordingSignalVolume(100)
         } else if ((oldRole == KTVSingRole.Audience || oldRole == KTVSingRole.CoSinger) && (newRole == KTVSingRole.LeadSinger || newRole == KTVSingRole.SoloSinger) && !isOnMicOpen) {
             mRtcEngine.adjustRecordingSignalVolume(0)
             mRtcEngine.muteLocalAudioStream(false)
@@ -688,6 +689,7 @@ class KTVApiImpl : KTVApi, IMusicContentCenterEventHandler, IMediaPlayerObserver
     }
 
     override fun setLrcView(view: ILrcView) {
+        reportCallScenarioApi("setLrcView", JSONObject())
         this.lrcView = view
     }
 

KTVAPI/iOS/Classes/KTVApiImpl.swift

@@ -329,6 +329,7 @@ extension KTVApiImpl: KTVApiDelegate {
 
         if ((oldRole == .leadSinger || oldRole == .soloSinger) && (newRole == .coSinger || newRole == .audience) && isNowMicMuted) {
             apiConfig?.engine?.muteLocalAudioStream(true)
+            apiConfig?.engine?.adjustRecordingSignalVolume(100)
         } else if ((oldRole == .audience || oldRole == .coSinger) && (newRole == .leadSinger || newRole == .soloSinger) && isNowMicMuted) {
             apiConfig?.engine?.adjustRecordingSignalVolume(0)
             apiConfig?.engine?.muteLocalAudioStream(false)

KTVAPI/iOS/Example/KTVApiDemo/KTVApiDemo/KTVAPI/KTVApiImpl.swift

@@ -329,6 +329,7 @@ extension KTVApiImpl: KTVApiDelegate {
 
         if ((oldRole == .leadSinger || oldRole == .soloSinger) && (newRole == .coSinger || newRole == .audience) && isNowMicMuted) {
             apiConfig?.engine?.muteLocalAudioStream(true)
+            apiConfig?.engine?.adjustRecordingSignalVolume(100)
         } else if ((oldRole == .audience || oldRole == .coSinger) && (newRole == .leadSinger || newRole == .soloSinger) && isNowMicMuted) {
             apiConfig?.engine?.adjustRecordingSignalVolume(0)
             apiConfig?.engine?.muteLocalAudioStream(false)

KTVAPI/iOS/Example/KTVApiDemo/KTVApiDemo/KTVViewController.swift

@@ -44,7 +44,10 @@ class KTVViewController: UIViewController {
     let oriBtn: UIButton = UIButton()
     let accBtn: UIButton = UIButton()
     let leadBtn: UIButton = UIButton()
-    
+
+    let muteBtn: UIButton = UIButton()
+    let unmuteBtn: UIButton = UIButton()
+
     private var loadMusicCallBack:((Bool, String)->Void)?
 
     override func viewDidLoad() {
@@ -124,6 +127,20 @@ class KTVViewController: UIViewController {
         accBtn.setTitle("伴奏", for: .normal)
         accBtn.addTarget(self, action: #selector(accSing), for: .touchUpInside)
         view.addSubview(accBtn)
+        
+        //开麦
+        muteBtn.frame = CGRect(x: 10, y: 420, width: 100, height: 40)
+        muteBtn.backgroundColor = .gray
+        muteBtn.setTitle("开麦", for: .normal)
+        muteBtn.addTarget(self, action: #selector(mute), for: .touchUpInside)
+        view.addSubview(muteBtn)
+        
+        //关麦
+        unmuteBtn.frame = CGRect(x: 150, y: 420, width: 100, height: 40)
+        unmuteBtn.backgroundColor = .gray
+        unmuteBtn.setTitle("关麦", for: .normal)
+        unmuteBtn.addTarget(self, action: #selector(unmute), for: .touchUpInside)
+        view.addSubview(unmuteBtn)
 
     }
 
@@ -279,6 +296,15 @@ extension KTVViewController {
             SVProgressHUD.showInfo(withStatus: "当前身份不支持该操作")
         }
     }
+
+    @objc private func mute() {
+        self.ktvApi.muteMic(muteStatus: true)
+    }
+    
+    @objc private func unmute() {
+        self.ktvApi.muteMic(muteStatus: false)
+    }
+
 }
 
 extension KTVViewController: AgoraRtcEngineDelegate {