Skip to content

Commit

Permalink
Dev/aichat 5.11.0 wu (#1184)
Browse files Browse the repository at this point in the history
* Dev/ipa size (#1057)

* feat: Remove the fu beauty resource pack

* feat: add FURender podspec

* feat: remove unused config in podspec

* feat: modify photo picker pod file

* feat: use system photo picker

* feat: set preview alpha value

* fix: modify FURender podspec

* fix: fix build error

* fix: Modify fu.podspec FURender.podspec

* fix: remove unused code

* fix:minor changes

---------

Co-authored-by: qinhui <>
Co-authored-by: wushengtao <[email protected]>

* Dev/all 5.0.0 ios (#1062)

* update logic

* [FIX] restore project old bundle id

* feat: upgrade ktv to rtm syncmanager

* fix: minor changes

* fix:  enter seat indicator view visible fixed

* Dev/all 5.0.0 hezhengqing (#954)

* update logic

* [FIX] restore project old bundle id

---------

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

* Dev/all 5.0.0 ios ktv (#956)

* feat: upgrade ktv to rtm syncmanager

* fix: minor changes

* fix:  enter seat indicator view visible fixed

* fix: minor change

* [FIX] login icon

* fix: minor changes

* fix: update seat format fixed

* fix: filter duplicate keys

* fix: fix compile

* fix: user count display fixed

* fix: switch song bug fixed & update log

* fix: song owner enable switch song when preload music fail

* fix:  add more condition for update play song status

* fix: remove unused code

* fix: cancel preload when switch  song playing

* Dev/all 5.0.0 ios ktv (#961)

* feat: upgrade ktv to rtm syncmanager

* fix: minor changes

* fix:  enter seat indicator view visible fixed

* fix: minor change

* fix: minor changes

* fix: update seat format fixed

* fix: filter duplicate keys

* fix: fix compile

* fix: user count display fixed

* fix: switch song bug fixed & update log

* fix: song owner enable switch song when preload music fail

* fix:  add more condition for update play song status

* fix: remove unused code

* fix: cancel preload when switch  song playing

* fix: upgrade rtm syncmanager (#962)

* fix: ktv error toast fixed

* fix: user count fixed

* fix: user count fixed

* fix: clean seat user info when lock acquired

* [FEAT] auto upload log in scene

* [FEAT] upload log with backend config

* [FIX] remove LSTTimer

* [FEAT] voice room scene upload log

* [FEAT] about app version

* [FEAT] upgrade SDK to version 4.3.1

* [FIX] agora dav1d link flag

* [FIX] debug mode ui

* feat: upgrade rtm syncmanager

* fix: upgrade show service

* fix: subscribe interaction manager

* fix:  pk user list fixed

* fix: pk bug fiexed

* fix: user enter fixed

* fix: join/leave tips fixed

* fix: disable button fixed

* fix: reload invite list if recv changed

* [FEAT] local rtm 2.2.0 framework

* fix: room list count update fixed

* fix: invite & apply fixed

* fix: invite&apply bugs

* fix: update display name

* fix: update err toast

* fix: update room & join room bug fixed

* fix: join room fixed

* fix: linking bug fixed

* fix: update expire view

* Dev/scene/all 5.0.0 pkg thin (#976)

* fix: update read me

* [KTV][Android]add readme.

* update KTV README

* remove huangxin info in ReadME

* Update gradle.properties

* remove Android readme

* update iOS README

* add jenkins ci.

* fix jenkins ci.

* fix jenkins ci.

* fix jenkins ci.

* [Android]update version name and apk name.

* update jenkins ci.

* [Android]update apk name.

* fix: crash

* fix: minor changes

* implements KTVApis

* fix:  missing chorus view count down

* faet: add keycenter

* change userNo values to userId

* fix: replace rtc uid to user no

* fix: co-singer pause & resume player

* fix: minor changes

* add chorus logic

* add chorus logic

* fix: ischorus status incorrect

* fix: stop timer while chorus did start

* fix: add stop chorus timer reason

* feat: sync voice pitch

* 更新SyncManager v2版本

* refactor: optimize seat view reload

* feat: update ktv log

* update networkManager

* update soul sdk and merge bugfix in ktv release branch

* fix: add log

* fix: update voiceIdentify

* feat: add voice identify

* update interface

* fix: revert syncmanager

* fix: revert en resource in ktv

* refactor: setup voice pitch

* fix: replace userNo to userId

* fix: remove user incorrect

* fix: minor changes

* feat: update ignore file

* feat: share log files

* fix: remove idfv

* fix: revert remove

* fix chours bugs

* remove mjrefresh and yytext

* fix: minor changes

* refactor: remove MJExtension

* fix: update playerPublish

* remove codeView

* update logic

* move display lrc logic to ktvApiImpl

* fix: update player publish status in chorus

* fix: show toast while  pwd error

* fix: play token generate incorrect

* fix: ex channel audio push/subscribe incorrect

* refactor: update log

* fix room subscribe bugs

* fix delete room bug

* refactor: remove unused code

* fix lrc no display bugs

* refactor: add enum for song status

* refactor: update media option

* fix: update chorus status

* fix: session config crash on thread

* [Android]update version to 2.0.0

* fix exit room bug

* [Common][Android]add EntLogger.

* [KTV][Android]update Logger.

* [Voice][Android]update Logger.

* feat: migration to syncmanager v2

* update syncManager version to 2.2.0

* feat: add log config

* fix: migration to syncmanager v2

* fix: compile error

* fix: photo authorization

* fix: main thread checker

* fix bugs in chours

* fix: sync player status  fixed

* fix: reset ktv api status if co singer leave seat

* fix ltc display bugs

* fix: singer leave seat incorrect

* coSinger control musicTrackMode itself

* fix: sync player status

* fix: setting view cache data

* fix: origin/acc status fixed

* sync mediaPlayerState

* change default audioTrack to aac

* fix: ignore invalid cmd

* fix: song title visible incorrect

* fix: lrc reset & stop

* fix: cache sound sound effect View

* feat: add log

* fix leave chrous bug

* fix: remove "creator" param

* fix: score view visible problem while owner reopen the room

* fix: chorus aec fixed

* fix: export caches logs

* fix:  optimize chorus aec

* fix: ntp sync

* fix: ntp sync

* fix: adjust co-singer volume

* fix: adjust remote user volume

* fix: adjust remote volume in setting menu

* adjust remote volume

* fix:  optimize ktvapi

* fix: minor changes

* fix: rejoin chanel ex

* fix: modify song list result count

* fix: update log

* fix: remove debug toast

* fix: mcc song result count fixed

* fix: co singer visible acc/orig & setting button

* adjust ktv logic

* update SyncManager

* fix: sync music test

* fix: sync button status of choose song list

* fix: crash

* fix: minor changes

* unmute mic for roomOwner

* disable mpk seek in chrous

* update native sdk

* fix anr

* fix: remove unused code

* fix: play stats fixed

* fix: remove 'enableLocalAudio' & 'muteLocalAudioStream'

* fix: localPlayerPosition incorrect

* fix: play song delay 500ms  after player completed

* remove  'play_pos_change_callback'

* fix: minor changes

* fix chorus sync

* feat: add debug view for ktv

* add debugMode switch

* fix: enable.md = false

* fix chours sync

* fix chorus sync

* fix: sync music

* fix: acc reset if change song

* fix:  position fixed

* fix: remove "md" & "agc "

* remove agc & md related private parameters

* fix: update scenarios policy

* fix: revert  audio scenario policy

* disable nasa2

* fix: update params

* update sdk

* fix settings processBar

* feat: remove yycache & migration user info cache folder

* always set player's volume to 50 for solo & chorus scenario

* fix: adjust player volume to 50 if become singer

* fix: update scenario policy

* fix pitch

* fix: voice pitch setter policy updated

* fix: update remote playerback volume policy

* fix: remove some ui views

* [KTV][Android]hide buttons.

* fix: sort bugs

* fix: add log

* fix: song list deleted fail

* fix: add log

* fix auto leave room

* fix: make sure recv data stream after load song success to fix start lrc fail

* fix: minor changes

* fix merge bugs

* Revert "Feat/scene/ktv android chorus v2"

* Revert "Feat/scene/ktv 2.1.1 ios"

* optimize readme (#504)

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

* Feat/scene/all android 2.1.0 (#508)

* Dev/secure android (#505)

* [Android]fix the secure problems.

* [Android]fix the permission problems in KTV.

* [Android]perfect the permission leak logic.

* [Android]perfect the permission requests.

* [Android]fix ENT-530.

* [Android]fix permission request problem.

* [Android]fix permission request problems(ENT-534/ENT-535).

* Feat/scene/show android 1.1.0 (#507)

* [Show][Android]first commit.

* [Show][Android]perfect room service logic and ui.

* [ShowLive][Android]add top layout and bottom layout to live detail page.

* [ShowLive][Android]fix permission bug.

* [Android]1.add user service and ui; 2.add message service and ui.

* [ShowLive][Android]add dialogs including setting, beauty, picture quality, beauty.

* [Android]fix common title view display bug.

* [Android]perfect live preview activity.

* [Android]Integrated bytedance beauty sdk.

* [Android]add bugly.

* add pk and linking in service

* add pk and linking ui

* [ShowLive][Android]perfect setting of quality, statistic and voice effect.

* [ShowLive][Android]add README and change app id.

* add link logic

* [ShowLive][Android]fix beauty aar build problem.

* fix bugs in pk and link ui

* add link logic

* fix link logic

* fix link logic

* [ShowLive][Android]Optimize beauty.

* [ShowLive][Android]add advance setting.

* [ShowLive][Android]fix room info problem.

* optimize link logic

* optimize pk logic

* optimize pk settings

* [Android]fix bottom dialogs bug and etc.

* [ShowLive][Android]adjust bottom layout in live detail room.

* [ShowLive][Android]fix bueaty defalut params bug.

* [ShowLive][Android]update beauty resource version.

* fix link bugs

* optimize resource name for release

* [Android]fix cherry-pick problem.

* optimize link code

* [ShowLive][Android]fix room bugs and advance setting bug.

* [ShowLive][Android]fix bueaty bug.

* add pk logic

* add contentInspect

* add pk logic

* [ShowLive][Android]Add missing image.

* [ShowLive][Android]perfect alert dialog, bottom layout and etc.

* [ShowLive][Android]perfect preset config and video render speech when entering room.

* fix bugs in link and pk

* [ShowLive][Android]perfect preset config.

* add count time for pk and link

* fix spell error

* fix bugs in link and pk

* fix rtc audio

* add audio moderation

* fix enableContent extrainfo

* [ShowLive][Android]adjust ui for cyg.

* [ShowLive][Android]fix problems of capture resolution and sr.

* fix bugs

* add muteAudio logic in service

* [ShowLive][Android]limit ndk abi.

* [ShowLive][Android]fix method name.

* [ShowLive][Android]fix method name.

* disable ktv entry

* fix bugs in link and pk

* [Show][Android]reset beauty when creating room(ENT-216).

* [Show][Android]fix beauty effect bug(ENT-215).

* [Show][Android]fix beauty effect bug(ENT-214).

* [Show][Android]fix room end problem(ENT-220/ENT-238).

* [Show][Android]fix text input bug(ENT-210/ENT-208).

* [Show][Android]fix text input bug and etc(ENT-207/ENT-209/ENT-212).

* [Show][Android] fix audio setting error(ENT-213).

* [Show][Android]fix statistic display bug(ENT-239).

* fix bugs in pk and link

* [Show][Android]add sense time beauty.

* fix bugs when app shutdown

* fix spell error in RoomDetail and fix pk bugs

* [Show][Android]perfect sense time beauty.

* [Show][Android]remove bytedance beauty and update README.

* fix bugs for pk and link

* [Show][Android]fix bugs(ENT-267/ENT-255/ENT-279/ENT-262/ENT-214/ENT-266).

* [Show][Android]fix service reconnect bug(ENT-273/ENT-277).

* fix pkInvitation after relinking

* fix reset in service

* fix micro status bug in settings

* [Show][Android]fix user count bug(ENT-262).

* [Show][Android]fix room bug(ENT-277/ENT-262/ENT-293).

* [Show][Android]fix video config bug(ENT-294/ENT-295/ENT-296/ENT-297).

* [Show][Android]fix video config bug while switching live role.

* [Show][Android]adjust beauty params.

* [Show][Android]fix camera and beauty bug.

* [Show][Android]update rtc sdk.

* [Show][Android]fix camera and timer bug(ENT-277)

* [Show][Android]fix room close time

* fix crash when stop linking

* fix crash when click link button

* [Show][Android][KK] update beauty config.

* [Show][Android][KK]Update video config.

* [Show][Android][KK]fix beauty bug.

* [Show][Android]update show name in app.

* [Show][Android]hide scenes except the show.

* [Show][Android]add virtual background.

* [Show][Android]add live room page switcher.

* [Show][Android]fix live room page switcher bug.

* [Show][Android]add first video frame time logger.

* [Show][Android]feat:Before entering the room, you need to select configuration information

* [Show][Android]feat:In the audience scenario, the advanced setting function has been added

* [Show][Android]fix:In the audience settings page, block the "Close Page" button

* [Show][Android]add video quick swicher.

* [Show][Android]perfect video switcher.

* [Show][Android]add fake room data and fix video switcher.

* [Show][Android]perfect fake room data and video switcher.

* [Show][Android]add living end layout and fix service bug.

* [Show][Android]update sync manager version and fix bugs.

* [Show][Android]perfect cloud player and fix bugs.

* [Show][Android]fix:Copywriting revisions

* [Show][Android]fix:Delete 180P and add 480P

* [Show][Android]feat:Added resolution for the Statistics module

* [Show][Android]fix video render bug.

* [Show][Android]fix:Modify the recommended configuration

* [Show][Android]fix:Modify the configuration on the audience side

* [Show][Android]fix pk bug while switching video and etc.

* [Show][Android]fix beauty bug.

* [Show][Android]repair statistic display.

* [Show][Android]perfect video view render and fix bugs.

* [Show][Android]fix:Anchor & Viewer Video configuration modification

* [Show][Android]fix:Review Code

* [Show][Android]fix:Low-end phones do not allow image quality enhancement to be turned on

* [Show][Android]fix:Added prompts

* [Show][Android]adjust fake room urls.

* [Show][Android]fix video switch render bug.

* [Show][Android]adjust robot sync logic.

* [Show][Android]fix timer bug and etc.

* [Show][Android]fix robot room bug and etc.

* [Show][Android]change living background.

* fix:解决开关麦bug

* fix:解决开关摄像头bug

* fix:切换后台bug

* fix:上麦限制机器人房间

* fix:PK邀请限制机器人房间

* feat:新增绿幕UI

* feat:新增绿幕逻辑

* fix:解决开关麦bug

* fix:解决开关摄像头bug

* fix:切换后台bug

* fix:上麦限制机器人房间

* fix:PK邀请限制机器人房间

* feat:新增绿幕UI

* feat:新增绿幕逻辑

* feat:分辨率文案修改,修改实时数据显示规则

* feat:整理代码

* feat:实时数据修改 ---- 编码帧率、接收帧率

* feat:实时数据修改 ---- 编码分辨率、接收分辨率

* feat:实时数据修改

* feat:实时数据修改 --- 新增默认值

* fix deleteScene for ENT-345

* feat:高级设置页面修改

* fix:删除抖音logo

* [Show][Android]add local sdk config.

* [Show][Android]fix: background music bug.

* fix render

* fix:美化 ---- 调整 ---- 默认选中无

* fix:数据持久化

* fix:数据持久化

* fix:数据持久化

* fix:数据持久化

* fix:极速直播

* fix:极速直播参数修改

* fix:高级参数显示调整

* fix:高级参数显示调整

* add debug settings dialog

* fix:高级参数显示调整

* add audience debug settings

* add mirrorMode/renderMode in debugSettings

* [Show][Android]fix resolution display bug(ENT-369).

* fix:解决设置超分bug

* fix:解决编码分辨率bug

* fix:高级参数显示调整

* fix:解决设置超分bug

* fix:解决编码分辨率bug

* fix:完善README文档

* fix:PK 摄像头开关bug

* fix:PK 麦克风bug

* fix:解决帧率采集bug

* [Show][Android]perfect video switch logic.

* [Show][Android]upgrade rtc sdk to 4.1.1.

* fix:解决PK过程中不展示数据bug

* fix:删除编码分辨率30、60

* fix debugSettings

* fix:解决连麦数据bug

* fix:解决fps bug

* [Show][Android]fix bottom full dialog bug in MIUI or HORNOR phone.

* fix debugSettings mirrorMode

* [Show][Android]fix video render bug when switching video(ENT-399).

* update SyncManager

* [Show][Android]fix leave room bug when pking and effect music bug(ENT-385).

* fix debug settings

* fix:解决PK过程中不展示数据bug

* fix:删除编码分辨率30、60

* fix:解决连麦数据bug

* fix:解决fps bug

* fix debug settings

* [Show][Android] fix exit room reset SR

* [Show][Android]perfect video switch and fix some bugs.

* [Show][Android]fix sr bug.

* [Show][Android]fix audience latency level bug.

* [Fix][Show] fix bug

* [Feat][Common] add report api

* [Feat][App]add scene report

* [Fix][Common] report scene name

* [Fix][Common] report scene name

* [Fix][App] fix phone number limit

* [Fix][Show] pk close sr

* feat:绿幕开启后新增提示

* [Fix][Show] fix pk bug https://jira.agoralab.co/browse/FT-234?filter=-1

* [Show][Android]fix beauty bug(FT-273).

* [Show][Android]fix statistic bug(FT-270).

* [Show][Android]fix video setting bug(FT-263).

* [Fix][Show]FT-241: end pk/linking ui bug

* [Fix][Show] fix open/close video

* [Fix][Show]fix setting dialog video ui

* [Show][Android]replace voice effect files to reduce the apk size.

* [Fix][Show] fix setting dialog video ui

* [Fix][Show]fix pk ui

* [Fix][Show] linking / pk default open video

* [Fix][Show] audience linking hide music&& beauty button

* [Fix][Show] fix beauty crash

* [Show][Android]perfect sense time beauty effect.

* [Show][Android]fix texture buffer dispose bug.

* [Fix][Show] fix activity null,

* [Fix][Show] fix upLinkBps,downLinkBps

* [Feat][Show] update readme

* [Feat][Show] update readme

---------

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

* Feat/scene/voice android 2.1.0 (#506)

* update audio config

* [FEAT] AIAEC & AIAGC subpage

* [FEAT] chatroom setting implement

* [FEAT] chat room setting title description

* [FIX] checkbox value change

* [FIX] disable room member's best voice setting option

* [FIX] first dialog hide when subpage show

* [FIX] new room AIAEC AIAGC default value

* [FIX] vailed load AIAEC extension

* [Voice][Android]add voice spatial module.

* fix:语聊房入口封面修改

* update SyncManager to V2

* time up exit room dialog

* remove imkit and gift\chat view

* [FEAT] about App

* [FIX] merge code

* fix:去除空间音频房间内的输入框

* fix:创建房间UI修改

* fix:解决返回按钮bug

* fix:隐藏排行榜

* fix:3D空间音频UI修改

* fix:3D空间音频引导页

* add gift notice function

* add syncManager impl to voice_spatial module

* fix bugs in deleteRoom

* fix robot bugs

* [Voice][Android]add apng lib.

* update showSubtitleView chatroomId change to owner.nickName

* [FEAT] room voice sample

* fix:删除音效选择页

* [FEAT] play AEC sample music

* fix bugs in micSeat

* fix:删除2D相关代码

* add Audience list

* add gift notice function

* fix bugs in room list

* update showSubtitleView chatroomId change to owner.nickName

* add Audience list

* [FEAT] spatial audio logic in RTC engine

* modify mic seat

* fix onseat logic

* remove chatUid

* [FIX] Apng auto play

* remove useless code

* feat:展示引导页

* [Voice][Android]fix voice play anim bug.

* [Voice][Android]fix login bug.

* update mic logic distinguish userMicStatus

* add 20 mins time up ui

* fix:修改错误的文案

* modify robot controller

* [FEAT] chat room spatial logic

* [FEAT] robot spatial audio

* add robot enable dialog

* [FEAT] spatial audio sync position & EQ setting

* [FIX] about app

* Create room optimization

* [FIX] spatial voice location sync

* [FIX] spatial audio setting

* fix bug Can not perform this action after onSaveInstanceState

* fix:头像资源迁移到common

* fix:删除发现页

* fix:强势竖屏

* [FIX] spatial audio logic

* sync for EQ settings

* rtc api for EQ settings

* [FIX] spatial audio

* [FIX] push robot audio

* [FIX] spatial audio bug fix

* fix service bugs

* [FIX] spatial audio bugs

* fix EQ

* update syncManager

* [FIX] add spatial audio user forward arrow

* fix mic

* [FIX] update position update dration

* modify EQ slider

* [FIX] spatial center set arrow default direction

* [Voice][Android]fix player spatial voice bug.

* [FIX] center seat gesture contrl

* [FIX] user at index 0 quite room to leave seat

* fix sendStreamMessage

* fix bug MicClickAction.Mute remove micStatus

* fix bugs in spatialAudio

* [FIX] spatial send location to remote

* [FIX] robot air fader coefficient

* [FIX] setup remote mic spatial location

* add debugMode switch

* [FEAT] dump debug mode

* [FEAT] spatial voice readme

* [FEAT] delete old voice readme

* [FIX] FT-194 FT-187 FT-185

* [FIX] FT-178

* [FIX] audio setting dialog text content

* [FIX] spatial voice bugs

* [FIX] spatial voice scene bugs

* fix bug show memberList and inviteList avatar show exceptions

* [Voice][Android]fix mic controller bug(FT-219).

* [FIX] chat room bugs fix

* [Voice][Android]fix invitation bug(FT-191).

* [FIX] room seat sync

* [FIX] voice room bugs

* [FIX] bot bugs

* [FIX] spatial point sync timer update

* [FIX] app id config

* [FIX] gradle app key handle

* [FIX] agora app key readme

* [FIX] voice & spatial voice readme

* [FIX] voice chat readme

* [FIX] update readme

* [FEAT] new file layer for sub scene voice & voice spatial

* [FEAT] update server host

* [FEAT] move version number from mine page to about us page

* Feat/scene/voice android 2.1.0 zw bugfix (#474)

* [voiceChat][fix] FT-360  mute mic bug

* [Fix][VoiceChat] FT-362 owner leave room

* [Fix][VoiceChat] FT-364 apply/invite mic bug

* [FEAT] scene versions in about us page

* [FIX] update readme

* [FIX] chat room app name

* [FIX] about page setup app info logic

* [FIX] AINS mode off value

* [FIX] remove about page router

* [FIX] CI lint error

* [FIX] fix some bugs

* [FIX] full screen keyboard layout

* [FIX] bugs

* [FIX] update chat version

* [FIX] this version last bug

* [FIX] update readme

* [FIX] update voice chat room readme

* [FIX] update readme

* [FIX] update readme

* [FIX] add lock mic kick off

* [FEAT] add change log

* [FIX] accept mic request logic with ios

* [FIX] adapt device of android 12

* fix bug mute mic (#502)

* fix bug Can not perform this action after onSaveInstanceState

* fix bug MicClickAction.Mute remove micStatus

* fix bug show memberList and inviteList avatar show exceptions

* Remove redundant dependencies

* fix bug mute mic

* [Android]fix merge bug.

---------

Co-authored-by: HeZhengQing <[email protected]>
Co-authored-by: leo_msi <[email protected]>
Co-authored-by: CYG <[email protected]>
Co-authored-by: apex-wang <[email protected]>
Co-authored-by: HugoChaan <[email protected]>
Co-authored-by: alienzh <[email protected]>

* Update versionCtrl.properties

* Update gradle.properties

* [Android]update README and scenes config.

* Revert "Revert "Feat/scene/ktv android chorus v2"" (#513)

This reverts commit 473373cfe4e7551ff1166e4b358415258f153004.

* [Android]fix ktv bug with 4.1.1 sdk.

* adjust app name

* hide show demo in settings.gradle

* fix readme

---------

Co-authored-by: CYG <[email protected]>
Co-authored-by: leo_msi <[email protected]>
Co-authored-by: zhangwei <[email protected]>
Co-authored-by: HeZhengQing <[email protected]>
Co-authored-by: apex-wang <[email protected]>
Co-authored-by: HugoChaan <[email protected]>

* Feat/scene/all ios merge (#509)

* leaveroom

leaveroom

* fix 切换场景绑定机器人的问题

* 优化

* fix agora entertain 2.1.0 bugs

fix agora entertain 2.1.0 bugs

* fix  静音问题

* 解决房主点击底部静音按钮无效问题

* 修改连麦ui

* 修改机器人关闭后还在播放的问题

* room destroyed alert

room destroyed alert

* 添加如果使用引导弹窗逻辑

* members count fix

members count fix

* fix  开启机器人状态同步问题

* fix 语音播放混乱的问题

* feat: add event report

* fix: filter duplicate connection status callback

* fix: report correct event

* fix: crash

* fix bugs

fix bugs

* fix  上下麦逻辑问题

* 修改弹窗方式

* fix  英文音频文件问题

* fix bug

fix bug

* fix bug

* change eq alert icon

change eq alert icon

* 修改mpk 每次播放重新设置参数

* change middle to medium

change middle to medium

* 优化

* 实时数据优化

* fix: update cache key for image/localized key

* 绿幕新增弹窗提示

* fix: network status callback fixed

* 解决镜像问题

* 解决20分钟后主播没有真正结束房间

* fix 用户自己静音问题

* fix bug

* fix bugs 2023 0228

fix bugs 2023 0228

* fix 蓝机器人播放声音小的问题

* fix 邀请列表只能邀请一次的问题

* fix 只能弹一个窗的问题

* fix  音频中英文的问题

* 设置默认超分倍数,pk和连麦时按钮状态刷新

* fix连麦实时数据刷新问题

* 添加README

* fix 普通语聊房听众列表下拉刷新,菊花不消失的问题

* 鉴黄防止crash

* fix 安卓加入房间弹出修改公告的问题

* 修复镜像和pk用户名错误问题

* fix  普通语聊房获取不到公告的问题

* fix ui bugs

fix ui bugs

* fix: fix FT-304

* fix: update project

* fix 用户静麦后解除不了的问题

* fix 邀请上麦房主也弹窗的问题

* fix: remove network error toast

* fix

* fix 观众端播放音频问题

* deinit call self can't release

deinit call self can't release

* joinScene之前reset syncManager

* fix mute mic bug

fix mute mic bug

* 隐藏人声模糊功能

* fix 房主静音状态不同步的问题

* 修改机器人数量

* fix 弹窗问题

* fix judgement error

fix judgement error

* fix bug

* fix 空气衰减参数的问题

* 解决与安卓连麦问题

* 更新脚本

* 修改bundle id

* 更新脚本

* 更新脚本

* 更新脚本

* 更新脚本

* 更新脚本

* 更新脚本

* 更新脚本

* 更新plist

* 更新plist

* 更新plist

* 更新plist

* fix bug

fix bug

* send gift bug

send gift bug

* 更新kencenter

* 修改plist文件

* ..

* ...

* ..

* about me push

about me push

* change name

change name

* fix pop and about me push hidden tab bar

fix pop and about me push hidden tab bar

* update sign

* update

* ..

* update sign

* 添加自动更新build number

* fix: xcproject minor changes

* update build number

* fix: crash fixed

* feat: remove 'IQKeyboardManager'

* update angle

* 更新脚本

* update sign

* 修改空间音频播放地址

* 添加资源包下载功能

* update podfile

* update modify_podfile

* update modify_podfile

* fix: update key center

* fix: add desc for key center

* fix normal voice chatroom bug (#471)

fix normal voice chatroom bug

* [FEAT] IM key empty toast

* [FIX] IM key error toast

* [FEAT] debug mode trigger

* [FIX] update host URL

* fix bugs 2023 0315 0945 (#472)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* feat: change display name & version

* fix: update version

* fix bugs (#476)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix: ains = -1

* fix: update app name

* fix bugs (#478)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix: start bugly after license agree

* ..

* update archive

* fix: update ci

* fix: update ci script

* fix: update setup bugly policy

* fix: update keycenter

* fix: remove unused code

* fix: update code sign

* fix: update code sign

* update script

* update REAME

* fix: remove rtm kit to fix use network before agree lic

* fix: authorized check

* 退出房间时清理信息

* fix: udpate audio/video authorization policy for ktv

* 释放service

* fix normal voice chatroom bug (#483)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* fix: chatroom authorized policy fixed

* fix: authorized check policy update

* Feat/scene/voicechat ios (#484)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix: update keycenter

* fix: rename property

* ..

* update script

* update script

* update script

* update script

* update script

* update script

* fix https://jira.agoralab.co/browse/FT-395 and 380 (#487)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* update exportPlist file

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update exportplist file

* update script

* update script

* update script

* fix owner mute self issue (#488)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room (#489)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* update script

* Feat/scene/voicechat ios (#491)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* update exportplist file path

* forbid join too many  (#492)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* update keycenter

* update keycenter

* isUserInteractionEnabled open (#493)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* update script

* update script

* update script

* update script

* update script

* update script

* fix invite mic sync android  (#498)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* fix invite mic sync android

fix invite mic sync android

* update member_list  (#499)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* fix invite mic sync android

fix invite mic sync android

* update member_list

update member_list

* fix iOS and Android interworking

* fix kick off user bug

* Commits on Apr 3, 2023 FT-400 FT-399 toast bug fixs (#500)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* fix invite mic sync android

fix invite mic sync android

* update member_list

update member_list

* FT-400 FT-399 toast bug fixs

FT-400 FT-399 toast bug fixs

* fix 被踢后还能移动麦位的bug

* fix 空间音频更新麦位信息问题

* fix kick user too room clean mic status bug  (#503)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* fix invite mic sync android

fix invite mic sync android

* update member_list

update member_list

* FT-400 FT-399 toast bug fixs

FT-400 FT-399 toast bug fixs

* fix kick user too room clean mic status bug

fix kick user too room clean mic status bug

* fix sendStreamData bug

* update script

* fix 说话问题

* fix: ci script update

* fix: rename keycenter

* update script

* update export plist file

* fix 换麦问题

* fix 麦位逻辑

* fix 麦克风和安卓不同步的问题

* fix: revert scene version display

* fix: compile error

* Feat/scene/all ios merge show fp (#514)

* 解除debug页面与正常设置的相互依赖

* 删掉mjrefresh

* 整理代码

* readme 忽略.lic

* readme修改

* 路径修改

* 路径修改

* 修改readme

* 上传截图

* reademe完善

* 修改readme和颜色

* fix: update keycenter

* fix: compile fail

* fix: rename app name

* Update README.md

* Feat/scene/all ios merge show fp (#516)

* 解除debug页面与正常设置的相互依赖

* 删掉mjrefresh

* 整理代码

* readme 忽略.lic

* readme修改

* 路径修改

* 路径修改

* 修改readme

* 上传截图

* reademe完善

* 修改readme和颜色

* readme和机器人参数

* 修改baseServerUrl为正式服务

---------

Co-authored-by: 朱继超 <[email protected]>
Co-authored-by: zhaoyongqiang <[email protected]>
Co-authored-by: yiwangwuqianfjp <[email protected]>
Co-authored-by: cleven <[email protected]>
Co-authored-by: HeZhengQing <[email protected]>
Co-authored-by: chenpark <[email protected]>

* fix iOS link (#519)

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

* [Android]perfect cloud player config. (#518)

* [Android]perfect cloud player config.

* [Android]fix cloud player bug.

* [Android]update show readme.

* Feat/scene/all ios merge show fp (#517)

* fix 语音播放混乱的问题

* feat: add event report

* fix: filter duplicate connection status callback

* fix: report correct event

* fix: crash

* fix bugs

fix bugs

* fix  上下麦逻辑问题

* 修改弹窗方式

* fix  英文音频文件问题

* fix bug

fix bug

* fix bug

* change eq alert icon

change eq alert icon

* 修改mpk 每次播放重新设置参数

* change middle to medium

change middle to medium

* 优化

* 实时数据优化

* fix: update cache key for image/localized key

* 绿幕新增弹窗提示

* fix: network status callback fixed

* 解决镜像问题

* 解决20分钟后主播没有真正结束房间

* fix 用户自己静音问题

* fix bug

* fix bugs 2023 0228

fix bugs 2023 0228

* fix 蓝机器人播放声音小的问题

* fix 邀请列表只能邀请一次的问题

* fix 只能弹一个窗的问题

* fix  音频中英文的问题

* 设置默认超分倍数,pk和连麦时按钮状态刷新

* fix连麦实时数据刷新问题

* 添加README

* fix 普通语聊房听众列表下拉刷新,菊花不消失的问题

* 鉴黄防止crash

* fix 安卓加入房间弹出修改公告的问题

* 修复镜像和pk用户名错误问题

* fix  普通语聊房获取不到公告的问题

* fix ui bugs

fix ui bugs

* fix: fix FT-304

* fix: update project

* fix 用户静麦后解除不了的问题

* fix 邀请上麦房主也弹窗的问题

* fix: remove network error toast

* fix

* fix 观众端播放音频问题

* deinit call self can't release

deinit call self can't release

* joinScene之前reset syncManager

* fix mute mic bug

fix mute mic bug

* 隐藏人声模糊功能

* fix 房主静音状态不同步的问题

* 修改机器人数量

* fix 弹窗问题

* fix judgement error

fix judgement error

* fix bug

* fix 空气衰减参数的问题

* 解决与安卓连麦问题

* 更新脚本

* 修改bundle id

* 更新脚本

* 更新脚本

* 更新脚本

* 更新脚本

* 更新脚本

* 更新脚本

* 更新脚本

* 更新plist

* 更新plist

* 更新plist

* 更新plist

* fix bug

fix bug

* send gift bug

send gift bug

* 更新kencenter

* 修改plist文件

* ..

* ...

* ..

* about me push

about me push

* change name

change name

* fix pop and about me push hidden tab bar

fix pop and about me push hidden tab bar

* update sign

* update

* ..

* update sign

* 添加自动更新build number

* fix: xcproject minor changes

* update build number

* fix: crash fixed

* feat: remove 'IQKeyboardManager'

* update angle

* 更新脚本

* 解除debug页面与正常设置的相互依赖

* update sign

* 删掉mjrefresh

* 整理代码

* 修改空间音频播放地址

* 添加资源包下载功能

* update podfile

* update modify_podfile

* update modify_podfile

* fix: update key center

* fix: add desc for key center

* fix normal voice chatroom bug (#471)

fix normal voice chatroom bug

* readme 忽略.lic

* readme修改

* 路径修改

* 路径修改

* [FEAT] IM key empty toast

* [FIX] IM key error toast

* 修改readme

* 上传截图

* [FEAT] debug mode trigger

* [FIX] update host URL

* fix bugs 2023 0315 0945 (#472)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* feat: change display name & version

* fix: update version

* fix bugs (#476)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix: ains = -1

* fix: update app name

* fix bugs (#478)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* reademe完善

* fix: start bugly after license agree

* ..

* update archive

* fix: update ci

* fix: update ci script

* fix: update setup bugly policy

* fix: update keycenter

* fix: remove unused code

* fix: update code sign

* fix: update code sign

* update script

* update REAME

* fix: remove rtm kit to fix use network before agree lic

* fix: authorized check

* 退出房间时清理信息

* fix: udpate audio/video authorization policy for ktv

* 释放service

* fix normal voice chatroom bug (#483)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* fix: chatroom authorized policy fixed

* fix: authorized check policy update

* Feat/scene/voicechat ios (#484)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix: update keycenter

* fix: rename property

* ..

* update script

* update script

* update script

* update script

* update script

* update script

* fix https://jira.agoralab.co/browse/FT-395 and 380 (#487)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* update exportPlist file

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update script

* update exportplist file

* update script

* update script

* update script

* fix owner mute self issue (#488)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room (#489)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* update script

* Feat/scene/voicechat ios (#491)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* update exportplist file path

* forbid join too many  (#492)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* update keycenter

* update keycenter

* isUserInteractionEnabled open (#493)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* update script

* update script

* update script

* update script

* update script

* update script

* fix invite mic sync android  (#498)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* fix invite mic sync android

fix invite mic sync android

* update member_list  (#499)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* fix invite mic sync android

fix invite mic sync android

* update member_list

update member_list

* fix iOS and Android interworking

* fix kick off user bug

* Commits on Apr 3, 2023 FT-400 FT-399 toast bug fixs (#500)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* fix invite mic sync android

fix invite mic sync android

* update member_list

update member_list

* FT-400 FT-399 toast bug fixs

FT-400 FT-399 toast bug fixs

* fix 被踢后还能移动麦位的bug

* fix 空间音频更新麦位信息问题

* fix kick user too room clean mic status bug  (#503)

* fix normal voice chatroom bug

fix normal voice chatroom bug

* fix spatial audio partial bugs

fix spatial audio partial bugs

* fix invite

fix invite

* fix invite index

fix invite index

* fit apply request for android

fit apply request for android

* fix bugs

fix bugs

* fix bugs password alert

fix bugs password alert

* fix play sound bug and toast bug

fix play sound bug and toast bug

* announcement alert fix

announcement alert fix

* fix https://jira.agoralab.co/browse/FT-395 and 380

fix https://jira.agoralab.co/browse/FT-395 and 380

* fix owner mute self issue

fix owner mute self issue

* Throttler create room

Throttler create room

* join room throttle 1s

join room throttle 1s

* forbid join too many

forbid join too many

* isUserInteractionEnabled open

isUserInteractionEnabled open

* fix invite mic sync android

fix invite mic sync android

* update member_list

update member_list

* FT-400 FT-399 toast bug fixs

FT-400 FT-399 toast bug fixs

* fix kick user too room clean mic status bug

fix kick user too room clean mic status bug

* fix sendStreamData bug

* update script

* fix 说话问题

* fix: ci script update

* fix: rename keycenter

* update script

* update export plist file

* fix 换麦问题

* fix 麦位逻辑

* fix 麦克风和安卓不同步的问题

* fix: revert scene version display

* fix: compile error

* 修改readme和颜色

* Feat/scene/all ios merge show fp (#514)

* 解除debug页面与正常设置的相互依赖

* 删掉mjrefresh

* 整理代码

* readme 忽略.lic

* readme修改

* 路径修改

* 路径修改

* 修改readme

* 上传截图

* reademe完善

* 修改readme和颜色

* fix: update keycenter

* fix: compile fail

* fix: rename app name

* Update README.md

* readme和机器人参数

* 修改baseServerUrl为正式服务

* 修改readme和cloudplayer参数

* 添加CloudPlayerKey和secret

* 修改readme图片地址

---------

Co-authored-by: zhaoyongqiang <[email protected]>
Co-authored-by: wushengtao <[email protected]>
Co-authored-by: 朱继超 <[email protected]>
Co-authored-by: cleven <[email protected]>
Co-authored-by: HeZhengQing <[email protected]>
Co-authored-by: chenpark <[email protected]>

* 1: update README 2: Disable sideslip return (#520)

* 1: update README 2: Disable sideslip return

* update README

---------

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

* Feat/scene/ktv android 2.3.0 (#522)

* change Log.d to KTVLogger

* optimize time up exit room logic

* optimize time up exit logic and ui

* add reconnect cases

* modify singing score logic

* update syncManager version

* only extract the real lyrics file from zip package

* update lyrics view to 1.0.24

* update lyrics view to 1.0.25

* modify UI

* retry download lrc

* update latest karaoke view

* fix converting issue from double to float

* code format

* fix backaround corners

* support jumping over the intro of song

* modify skip lude ui

* modify skip lude

* add logs and optimize ktvApiImpl

* move time up logic into Service

* add combo view

* initial commit for grade view

* reset grade view when song changed

and update new lyrics view

* update latest karaoke view

* fine tune ui & modify the threshold 70 for grade B

* fix merge bug

* fix:完善markdown

* fix:完善markdown

* fix:完善markdown

* apply latest karaoke view

* update karaoke view to 1.1.0-beta.8

* update karaoke view to 1.1.0-beta.11

* fix lrcView crash

* adjust setProgress

* adjust setProgress

* fix ui

* fix merge bug

* fix pitch when mutemic

* update karaoke view to 1.1.0-beta.12

* update version to 1.1.0-beta.15

* make the text size smaller

* update version to 1.1.0-beta.16

* fine tune ui

* ui bug fix for grade view

* ui enhancement for 18:9 screen

* fix:完善markdown

* fix:完善markdown

* fix:完善markdown

* fix:编译bug解决

* fix:解决空指针bug

* fix:解决UI Bug

* update version to 1.1.0-beta.19

make particles animation more vivid
make the scoring inflecting the true level of singing

* Update build.gradle

* fix merge bug

* fix bugs in ktv 2.2

* fix merge bugs

* fix score for chorus

* fix ui issues/ENT-438/ENT-424

* fix ENT-447

* voice dialog

* fix preload song when reConnecting

* fix:KTV点歌排序问题

* fix 20min limits leave room

* fix:KTV点歌做滑动

* fix:解决ViewPager2嵌套ViewPager2滑动冲突

* fix:ViewPager2与Tab联动

* fix ui issues/ENT-453/ENT-452

* fix:逻辑代码迁移到Fragment

* fine-tune lyrics ui

* fix:点歌逻辑完善

* fix:空指针bug修复

* fix:fragment懒加载

* music player controller ui refacting

* fix crash when ui/onLayout not ready

* reset ui for switch original/accompaniment

* fix:音效UI修改

* fix:音效UI修改

* fix:音效UI修改

* optimize choose logic

* v3.0.0_ktv

* optimize ktvApi

* add debugMode

* fix volume control

* optimize ktv api

* fix UI

* add UI pic for v3.0.0

* fix chorus ui

* fix bugs

* optimize ktvApi

* optimize ktv api

* optimize ktv api

* add scoring level/offset for debug (#470)

* optimize ktv api

* optimize ktv api

* fix bugs

* fix:解决showLoadingView bug (#469)

* fix:文档修改 (#468)

* fix corner case

* Dev/guohai/ktv android (#473)

* do more checking for lyrics file

avoid fatal error when lyrics invalid

* add missed checking

* per request from product, fine-tune ui/ux

* adjust application id

* fix logic bugs

* hide find fragment

* modify lrcControl view

* fix issue ENT-470 (#475)

* fix ptich

* update version to 1.1.1-beta.4 & ui fine-tune (#477)

* optimize ktv api

* fix ktv api

* fix version

* fix default bg

* add leading lines and enable pause for karaoke view (#479)

* optimize token

* optimize token

* fix chorus score view

* fix choose song dialog

* fix ENT-436 (#481)

Per request from product team, do not show combo view for first one

* fix bugs

* fix lrc line space

* update native sdk to 4.0.0.132.1

* fix compile bugs

* change application id

* change application id

* fix chorus view score sync

* modify readme (#482)

modify ci for download hw-audio.jar

* adjust remote volume to 40

* optimize readme

* optimize readme

* optimize readme (#486)

optimize readme

* fix continuorus click bugs

* audience show score and combo

* fix ANR in onPositionChanged

* fix issues/ENT-526/ENT-525 (#490)

* fix issues/ENT-526/ENT-525

and karaoke sdk version

* refine comments

* fix chorus score display

* Make lyrics delay for 200ms (#494)

* Make lyrics delay for 200ms

* refine comments

* refine comments

* fix setAudioScenario

* add safety check (#495)

* new feature for ntp sync (#497)

* new feature for ntp sync

* change sync limit to 80

---------

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

* fixn ntp sync and update sdk version (#501)

* fixn ntp sync and update sdk version

* fix code annotation

* fix songMode

---------

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

* add BLUE_TOOTH permission

* remove sync score in ktvapi

* optimize interface name in KTVAPI

* switchRole auto

* fix for ntp sync

* move parameters into ktvapi

* add songId

* unregister audio frame observer in ktvapi release

* fix sync thread to threadPool

* fix bugs foe chorus

* fix thread pool

* update sdk

* fix threadpool in ktvapi

* fix readme

* remove useless files

* modify app name

* fix hw-audiokit.jar download location

---------

Co-authored-by: CYG <[email protected]>
Co-authored-by: Hai Guo <[email protected]>
Co-authored-by: leo_msi <[email protected]>
Co-authored-by: xucz <[email protected]>

* Feat/scene/all android 3.0.0 (#553)

* Feat/scene/all android 3.0.0 zw (#526)

* [Android]adapter to rtc sdk 4.1.1.4 version

* [Android]add report

* [Android] hide mine page version

* [Android] add yl、ylkj、show the permission leak logic

* [Android] update app version

* [Android] update sdk to 4.1.1.5 , cherry pick show-1.1.2 optimization (#527)

* [Android] update sdk to 4.1.1.5 , cherry pick show-1.1.2 optimization

* [Android] changed start AboutUsActivity to route

* [Android] resolve yl,ylkj topview (#528)

* fix chat room ui

* update ktv api

* [Android]fix show mirror bug(ENT-639).

* [Fix][android] full dialog hide navigationbar FT-439

* [Fix][Android] turn off beauty not working。  FT-443

* [Fix][Android] show music volume not working FT-441

* [Fix][Android] fixbug audience linking no camera permission . FT-444

* [Fix][Android] fixbug pk reject. FT-442

* [Fix][Android] fixbug Requesting permission to record during live stream.

* [Fix][Android] Enlarge the clickable area of the chat input box.

* [Fix][Android]
1.do not hide the virtual navigation bar,
2.update full dialog
FT-

* [Fix][Android] report dialog ui

* [Fix][Android] update report dialog & close room icon

* [FIX] spatial voice bugs

* [Fix][Android] update downDelay

* [Fix][Android] port activity FT-445

* add parameters

* [Fix][Android] change token expire time to 25 minutes (Greater than 20 minutes.)

* [FIX] ENT-651  ENT-653

* [Fix][Android]audience linking audio permission

* [Fix][Android]FT-443 bottomSheetDialog theme

* [Android]fix sticker mirror bug.

* [Fix][Android] xiaomi report dialog statusbar color

* [Fix][Android] report dialog bg

* [FIX] ENT-672

* fix NMS-12484 and modify KTVApi

* Feat/scene/all android 3.0.1 (#541)

* [Android]update person collection url

* [FIX] ENT-686 cancel hands up apply

* [FIX] ENT-689 mic seat audio mute

* [Android][Fix] webview title & go back

* [Android]change host auienceLatencyLevel to ultra while joining pk channel.

* add demo pic into readme

* add demo pic into readme

* optimize ktvapi

* [Android][Fix] enter home page report device data

* fix ktvapi

* fix ktvapi

* [Android]update collection checklist url

* [Fix][Android] showLive 1v1 pk add parameters : isInteractiveAudience

* [FIX] local user microphone state

* [Android]update pk statistic down delay parameter.

* [Fix][Android] fixbugs ent-736,ent-737

* fix ntp

* [Fix][Android] fixs robot start cloud player

* update sdk to 4.1.1.8

* Feat/scene/show android 3.0.0 1.2 (#549)

* [Android][show] 超级画质

* merge singBattle feature

* fix enableContentInspect

* fix Android Show Debug Settings ER

* [Android]ui 弹框适配

* [Android] show:fix 兼容iOS 房间详情部…
  • Loading branch information
24 people authored Oct 21, 2024
1 parent 794465c commit 114bd0c
Show file tree
Hide file tree
Showing 20 changed files with 135 additions and 70 deletions.
3 changes: 3 additions & 0 deletions iOS/AgoraEntScenarios/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
isDebugMode = false
}

AppContext.shared.isDebugMode = isDebugMode
AppContext.shared.appId = KeyCenter.AppId
AppContext.shared.certificate = KeyCenter.Certificate ?? ""
AppContext.shared.hostUrl = KeyCenter.HostUrl
Expand All @@ -51,6 +52,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
AppContext.shared.hyAPIKey = KeyCenter.HyAPIKey ?? ""
AppContext.shared.hyAPISecret = KeyCenter.HyAPISecret ?? ""

AppContext.shared.aichatAgentHost = isDebugMode ? KeyCenter.AIChatAgentServerDevUrl : KeyCenter.AIChatAgentServerUrl

AGResourceManagerContext.shared.displayLogClosure = { text in
asyncToMainThread {
CommonLogger.default_info(text, tag: "ResourceManager")
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

"aichat_common_greeting"="今天有什么能帮到你?";
"aichat_custom_greeting"="今天有什么想要聊聊的?";

"aichat_interrupt_success"="打断成功!我在听,请讲";
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ extension AIChatBotImplement: AIChatBotServiceProtocol {

public class AIChatUserAgentDeleteNetworkModel: AUINetworkModel {

public var username = VLUserCenter.user.id
public var username = AppContext.shared.getAIChatUid()

public var toDeleteUsername = "" {
didSet {
Expand All @@ -305,10 +305,10 @@ public class AIChatUserAgentDeleteNetworkModel: AUINetworkModel {

public override init() {
super.init()
self.host = "https://ai-chat-service-staging.sh3t.agoralab.co"
self.host = AppContext.shared.aichatAgentHost
// AppContext.shared.hostUrl
self.method = .delete
self.interfaceName = "/v1/projects/\(AppContext.shared.appId)/chat/users/\(VLUserCenter.user.id)/toDeleteAgent/"
self.interfaceName = "/v1/projects/\(AppContext.shared.appId)/chat/users/\(AppContext.shared.getAIChatUid())/toDeleteAgent/"
}

public override func parse(data: Data?) throws -> Any? {
Expand All @@ -331,11 +331,11 @@ public class AIChatUserCreateNetworkModel: AUINetworkModel {

public var userType: UInt32 = 0 //0普通用户 1 agent机器人 2群组用户

public var username = VLUserCenter.user.id
public var username = AppContext.shared.getAIChatUid()

public override init() {
super.init()
self.host = "https://ai-chat-service-staging.sh3t.agoralab.co"
self.host = AppContext.shared.aichatAgentHost
// AppContext.shared.hostUrl
self.method = .post
self.interfaceName = "/v1/projects/\(AppContext.shared.appId)/chat/users"
Expand Down Expand Up @@ -368,13 +368,13 @@ public class AIChatUpdateUserInfoNetworkModel: AUINetworkModel {

public var ext = ""

public var username = VLUserCenter.user.id
public var username = AppContext.shared.getAIChatUid()

public var birth = "female-chengshu"

public override init() {
super.init()
self.host = "https://ai-chat-service-staging.sh3t.agoralab.co"
self.host = AppContext.shared.aichatAgentHost
// AppContext.shared.hostUrl
self.method = .put
self.interfaceName = "/v1/projects/\(AppContext.shared.appId)/chat/metadata/user/"
Expand Down Expand Up @@ -410,16 +410,14 @@ public class AIChatAddFriendNetworkModel: AUINetworkModel {

public var friendId = "" {
didSet {
self.interfaceName = "/v1/projects/\(AppContext.shared.appId)/chat/users/\(VLUserCenter.user.id)/contacts/users/\(self.friendId)"
self.interfaceName = "/v1/projects/\(AppContext.shared.appId)/chat/users/\(AppContext.shared.getAIChatUid())/contacts/users/\(self.friendId)"
}
}

public override init() {
super.init()
self.host = "https://ai-chat-service-staging.sh3t.agoralab.co"
self.host = AppContext.shared.aichatAgentHost
}


}


Expand All @@ -428,7 +426,7 @@ public class AIChatTTSNetworkModel: AUINetworkModel {
public var voiceId: String = ""
public override init() {
super.init()
self.host = "https://ai-chat-service-staging.sh3t.agoralab.co"
self.host = AppContext.shared.aichatAgentHost
self.interfaceName = "/v1/projects/\(AppContext.shared.appId)/voice/tts"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public class AIChatImplement: NSObject {
}

func login(token: String,completion: @escaping (Error?) -> Void) {
AgoraChatClient.shared().login(withUsername: VLUserCenter.user.id, agoraToken: token) { [weak self] (userID, error) in
AgoraChatClient.shared().login(withUsername: AppContext.shared.getAIChatUid(), agoraToken: token) { [weak self] (userID, error) in
SVProgressHUD.dismiss()
if error != nil {
if error?.code == .userAlreadyLoginSame {
Expand Down Expand Up @@ -204,7 +204,7 @@ extension AIChatImplement: AgoraChatManagerDelegate {

class AIChatTokenGenerator: AUINetworkModel {

var uid = VLUserCenter.user.id
var uid = AppContext.shared.getAIChatUid()

var expire = UInt32(60*60*24)

Expand All @@ -213,7 +213,7 @@ class AIChatTokenGenerator: AUINetworkModel {
override init() {
super.init()
self.method = .post
self.host = "https://ai-chat-service-staging.sh3t.agoralab.co"
self.host = AppContext.shared.aichatAgentHost
self.interfaceName = "/v1/projects/\(AppContext.shared.appId)/chat/token"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import AgoraCommon
class AIChatAgentNetworkModel: AUINetworkModel {
override init() {
super.init()
self.host = AppContext.agentServerUrl
self.host = AppContext.agentServerUrl()
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class AIChatViewModel: NSObject {

public private(set) var bots: [AIChatBotProfileProtocol] = []

private let sttChannelId = "aiChat_\(VLUserCenter.user.id)_\(UUID().uuidString)".md5() ?? ""
private let sttChannelId = "aiChat_\(AppContext.shared.getAIChatUid())_\(UUID().uuidString)".md5() ?? ""

private var selectedBotId = ""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AIChatAgentService: NSObject {
greeting: String?,
context: [[String:Any]]?,
completion: AgentRequestCompletion?) {
let uid = VLUserCenter.user.id
let uid = AppContext.shared.getAIChatUid()
let model = AIChatAgentStartModel(appId: appId, channelName: channelName)
model.uid = NSNumber(string: uid )
model.prompt = prompt
Expand Down Expand Up @@ -57,7 +57,7 @@ class AIChatAgentService: NSObject {
}

func stopAgent(completion: AgentRequestCompletion?) {
let uid = VLUserCenter.user.id
let uid = AppContext.shared.getAIChatUid()
let model = AIChatAgentStopModel(appId: appId, channelName: channelName)
model.request { error, data in
completion?(nil, error)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,13 @@ class AIChatRTCService: NSObject {
rtcKit.setDefaultAudioRouteToSpeakerphone(true)
rtcKit.muteLocalAudioStream(true)
rtcKit.muteLocalAudioStream(true)
rtcKit.setParameters ("{\"che.audio.sf.nsEnable\":1}")
rtcKit.setParameters ("{\"che.audio.sf.ainsToLoadFlag\" :1}")
rtcKit.setParameters ("{\"che.audio.sf.nsngAlgRoute\":12}")
rtcKit.setParameters ("{\"che.audio.sf.nsngPredefAgg\" :10}")
rtcKit.setParameters("{\"che.audio.sf.enabled\":true}")
rtcKit.setParameters("{\"che.audio.sf.ainlpToLoadFlag\":1}")
rtcKit.setParameters("{\"che.audio.sf.nlpAlgRoute\":1}")
rtcKit.setParameters("{\"che.audio.sf.ainsToLoadFlag\":1}")
rtcKit.setParameters("{\"che.audio.sf.nsngAlgRoute\":12}")
rtcKit.setParameters("{\"che.audio.sf.ainsModelPref\":11}")
rtcKit.setParameters("{\"che.audio.sf.ainlpModelPref\":11}")
rtcKit.setAudioScenario(.gameStreaming)
rtcKit.setAudioProfile(.default)
self.rtcKit = rtcKit
Expand All @@ -49,14 +52,14 @@ class AIChatRTCService: NSObject {

extension AIChatRTCService: AIChatRTCServiceProtocol {
func addDelegate(channelName: String, delegate: AgoraRtcEngineDelegate) {
let uid = Int(VLUserCenter.user.id) ?? 0
let uid = Int(AppContext.shared.getAIChatUid()) ?? 0
aichatPrint("addDelegate[\(channelName)] uid:\(uid)", context: "AIChatRTCService")
let connection = AgoraRtcConnection(channelId: channelName, localUid: uid)
rtcKit?.addDelegateEx(delegate, connection: connection)
}

func removeDelegate(channelName: String, delegate: AgoraRtcEngineDelegate) {
let uid = Int(VLUserCenter.user.id) ?? 0
let uid = Int(AppContext.shared.getAIChatUid()) ?? 0
aichatPrint("removeDelegate[\(channelName)] uid:\(uid)", context: "AIChatRTCService")
let connection = AgoraRtcConnection(channelId: channelName, localUid: uid)
rtcKit?.removeDelegateEx(delegate, connection: connection)
Expand All @@ -71,7 +74,7 @@ extension AIChatRTCService: AIChatRTCServiceProtocol {
option.autoSubscribeAudio = false
option.clientRoleType = .audience

let uid = Int(VLUserCenter.user.id) ?? 0
let uid = Int(AppContext.shared.getAIChatUid()) ?? 0
let connection = AgoraRtcConnection(channelId: channelName, localUid: uid)
let ret = rtcKit.joinChannelEx(byToken: token,
connection: connection,
Expand All @@ -83,7 +86,7 @@ extension AIChatRTCService: AIChatRTCServiceProtocol {
}

func updateRole(channelName: String, role: AgoraClientRole) {
let uid = Int(VLUserCenter.user.id) ?? 0
let uid = Int(AppContext.shared.getAIChatUid()) ?? 0
aichatPrint("updateRole[\(channelName)] role:\(role.rawValue)", context: "AIChatRTCService")
let connection = AgoraRtcConnection(channelId: channelName, localUid: uid)

Expand All @@ -103,15 +106,15 @@ extension AIChatRTCService: AIChatRTCServiceProtocol {
}

func muteLocalAudioStream(channelName: String, isMute: Bool) {
let uid = Int(VLUserCenter.user.id) ?? 0
let uid = Int(AppContext.shared.getAIChatUid()) ?? 0
aichatPrint("muteAudio[\(channelName)] isMute:\(isMute)", context: "AIChatRTCService")
let connection = AgoraRtcConnection(channelId: channelName, localUid: uid)
rtcKit?.muteLocalAudioStreamEx(isMute, connection: connection)
}

func leaveChannel(channelName: String) {
aichatPrint("leaveChannel[\(channelName)]", context: "AIChatRTCService")
let uid = Int(VLUserCenter.user.id) ?? 0
let uid = Int(AppContext.shared.getAIChatUid()) ?? 0
let connection = AgoraRtcConnection(channelId: channelName, localUid: uid)
rtcKit?.leaveChannelEx(connection)
dataStreamIdMap[channelName] = nil
Expand All @@ -132,7 +135,7 @@ extension AIChatRTCService: AIChatRTCServiceProtocol {
let config = AgoraDataStreamConfig()
var result: Int32 = 0

let uid = Int(VLUserCenter.user.id) ?? 0
let uid = Int(AppContext.shared.getAIChatUid()) ?? 0
let connection = AgoraRtcConnection(channelId: channelName, localUid: uid)
var dataStreamId = dataStreamIdMap[channelName] ?? 0
if dataStreamId == 0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,21 @@ class AIChatLogger: NSObject {
}

extension AppContext {
static var agentServerUrl = "https://ai-chat-service-staging.sh3t.agoralab.co"
static private var _agentServerUrl: String?
static private var _rtcService: AIChatRTCService?
static private var _audioTextConvertorService: AIChatAudioTextConvertorService?
static private var _speechManager:SpeechManager?

static func agentServerUrl() -> String {
if let url = _agentServerUrl {
return url
}

let url = AppContext.shared.aichatAgentHost
_agentServerUrl = url
return url
}

static func rtcService() -> AIChatRTCService? {
if let service = _rtcService {
return service
Expand Down Expand Up @@ -77,6 +87,7 @@ extension AppContext {
}

static func destory() {
_agentServerUrl = nil
_rtcService?.destory()
_rtcService = nil

Expand All @@ -85,4 +96,9 @@ extension AppContext {

_speechManager = nil
}

func getAIChatUid() -> String {
let uid = Int(VLUserCenter.user.id) ?? 0
return "\(isDebugMode ? uid + 1000000 : uid)"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ final class ChatBotViewController: UIViewController {
welcomeText = AIChatBotImplement.commonBotWelcomeMessage[id] ?? welcomeText
}
}
let welcomeMessage = AgoraChatMessage(conversationID: bot.botId, from: bot.botId, to: VLUserCenter.user.id, body: AgoraChatTextMessageBody(text: welcomeText), ext: nil)
let welcomeMessage = AgoraChatMessage(conversationID: bot.botId, from: bot.botId, to: AppContext.shared.getAIChatUid(), body: AgoraChatTextMessageBody(text: welcomeText), ext: nil)
welcomeMessage.direction = .receive
conversation?.insert(welcomeMessage, error: nil)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ extension CreateIntelligenceViewController: UITextFieldDelegate {
let alertMessage = AgoraChatMessage(conversationID: bot.botId, body: AgoraChatCustomMessageBody(event: "AIChat_alert_message", customExt: nil), ext: ["something":"智能体创建成功"])
self.createClosure?(bot)
conversation?.insert(alertMessage, error: nil)
let welcomeMessage = AgoraChatMessage(conversationID: bot.botId, from: bot.botId, to: VLUserCenter.user.id, body: AgoraChatTextMessageBody(text: "您好,我是\(bot.botName),很高兴为您服务。"), ext: nil)
let welcomeMessage = AgoraChatMessage(conversationID: bot.botId, from: bot.botId, to: AppContext.shared.getAIChatUid(), body: AgoraChatTextMessageBody(text: "您好,我是\(bot.botName),很高兴为您服务。"), ext: nil)
welcomeMessage.direction = .receive
conversation?.insert(welcomeMessage, error: nil)
DispatchQueue.main.async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class CreateIntelligentGroupViewController: UIViewController {
func fillItems() {
self.items.removeAll()
self.items.append(contentsOf: [
AIChatGroupUserProfile(id: VLUserCenter.user.id, name: VLUserCenter.user.name, avatar: VLUserCenter.user.headUrl, type: .normal),
AIChatGroupUserProfile(id: AppContext.shared.getAIChatUid(), name: VLUserCenter.user.name, avatar: VLUserCenter.user.headUrl, type: .normal),
AIChatGroupUserProfile(id: "6", name: "添加智能体", avatar: "", type: .add)
])
self.collectionView.reloadData()
Expand Down Expand Up @@ -185,7 +185,7 @@ class CreateIntelligentGroupViewController: UIViewController {
let bot = AIChatBotProfile()
bot.botId = userId
bot.botName = self.nameTextField.text ?? ""
if let botIcon = self.items.filter{$0.type == .normal && VLUserCenter.user.id != $0.id}.first?.avatar {
if let botIcon = self.items.filter{$0.type == .normal && AppContext.shared.getAIChatUid() != $0.id}.first?.avatar {
bot.botIcon = VLUserCenter.user.headUrl+","+botIcon
}
DispatchQueue.main.async {
Expand Down Expand Up @@ -233,7 +233,7 @@ extension CreateIntelligentGroupViewController: UICollectionViewDataSource,UICol
case .add: self.addUser()
case .remove: self.removeUser()
case .normal:
if VLUserCenter.user.id != item.id {
if AppContext.shared.getAIChatUid() != item.id {
self.items.remove(at: indexPath.row)
collectionView.reloadData()
}
Expand Down Expand Up @@ -399,7 +399,7 @@ class IntelligenceCell: UICollectionViewCell {
} else {
self.symbol.image = nil

if item.id == VLUserCenter.user.id {
if item.id == AppContext.shared.getAIChatUid() {
self.removeBadge.isHidden = true
} else {
self.removeBadge.isHidden = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class GroupManagerViewController: UIViewController {
func fillItems() {
self.items.removeAll()
self.items.append(contentsOf: [
AIChatGroupUserProfile(id: VLUserCenter.user.id, name: VLUserCenter.user.name, avatar: VLUserCenter.user.headUrl, type: .normal)
AIChatGroupUserProfile(id: AppContext.shared.getAIChatUid(), name: VLUserCenter.user.name, avatar: VLUserCenter.user.headUrl, type: .normal)
])
let (name,ids) = self.service.groupInfo(groupId: self.groupId)
self.nameTextField.text = name
Expand Down
Loading

0 comments on commit 114bd0c

Please sign in to comment.