fix issue

Author: sbd021

data/locale/Ru-RU.ini

@@ -109,5 +109,5 @@ Plugin.Settings.Error.EmptyUrl="URL запроса пуст. Заполните
 Basic.Main.Agora.Invalid.CameraToken = "Ошибка подключения камеры к каналу, возможно, неверный appid/канал, недопустимый или просроченный токен и т. Д."
 Basic.Main.Agora.Empty.CameraToken = "Ошибка присоединения камеры к каналу, токен камеры пуст."
 Plugin.Settings.Log.Interval="Audio and Video log interval(seconds)"
-Basic.Setting.Video.Buffer.Interval="Время задержки стрима (макс. 10 мин.)"
+Basic.Setting.Video.Buffer.Interval="Время задержки стрима (макс. 5 мин.)"
 Second="секунда "

data/locale/de-DE.ini

@@ -109,5 +109,5 @@ Plugin.Settings.Error.EmptyUrl="Anfrage-URL ist leer. Geben Sie eine gültige ht
 Basic.Main.Agora.Invalid.CameraToken="Kamera-Verbindung fehlgeschlagen, möglicherweise ungültige Appid, ungültiger Kanal, ungültiger Token, abgelaufener Token usw."
 Basic.Main.Agora.Empty.CameraToken="Kamera-Verbindung fehlgeschlagen, Kamera-Token ist leer."
 Plugin.Settings.Log.Interval="Audio and Video log interval(seconds)"
-Basic.Setting.Video.Buffer.Interval="Stream-Verzögerung(max.: 10 min.)"
+Basic.Setting.Video.Buffer.Interval="Stream-Verzögerung(max.: 5 min.)"
 Second="zweite"

data/locale/en-US.ini

@@ -110,5 +110,5 @@ Basic.Main.Agora.Invalid.CameraToken="Camera Join Channel Failed, maybe invalid
 Basic.Main.Agora.Empty.CameraToken="Camera Join Channel Failed, camera token is empty."
 Plugin.Settings.Log.Interval="Audio and Video log interval(seconds)"
 Basic.Settings.SetAudioProfile="Set Audio Profile"
-Basic.Setting.Video.Buffer.Interval="Video Buffer Time(Maximum 10 minitues)"
+Basic.Setting.Video.Buffer.Interval="Video Buffer Time(Maximum 5 minitues)"
 Second="Seconds"

data/locale/es-ES.ini

@@ -109,5 +109,5 @@ Plugin.Settings.Error.EmptyUrl="La URL de la solicitud está vacía. Complete un
 Basic.Main.Agora.Invalid.CameraToken="Falló la activación de la cámara del canal, puede ser appid no válido, canal no válido, token no válido, token caducado, etc."
 Basic.Main.Agora.Empty.CameraToken="Falló la activación de la cámara del canal, el token de la cámara está vacío."
 Plugin.Settings.Log.Interval="Audio and Video log interval(seconds)"
-Basic.Setting.Video.Buffer.Interval="duración de la caché de transmisión (máx.: 10 minutos)"
+Basic.Setting.Video.Buffer.Interval="duración de la caché de transmisión (máx.: 5 minutos)"
 Second="Segundos"

data/locale/zh-CN.ini

@@ -110,5 +110,5 @@ Basic.Main.Agora.Invalid.CameraToken="摄像头加入频道失败，摄像头Tok
 Basic.Main.Agora.Empty.CameraToken="摄像头加入频道失败，摄像头Token为空"
 Plugin.Settings.Log.Interval="音视频日志时间间隔（秒）"
 Basic.Settings.SetAudioProfile="设置Audio Profile"
-Basic.Setting.Video.Buffer.Interval="视频缓存时间(最长10分钟)"
+Basic.Setting.Video.Buffer.Interval="视频缓存时间(最长5分钟)"
 Second="秒"

data/locale/zh-TW.ini

@@ -111,5 +111,5 @@ Basic.Main.Agora.Invalid.CameraToken="攝像頭加入頻道失敗，攝像頭Tok
 Basic.Main.Agora.Empty.CameraToken="攝像頭加入頻道失敗，攝像頭Token爲空"
 Plugin.Settings.Log.Interval="音視頻日志時間間隔（秒）"
 Basic.Settings.SetAudioProfile="設置Audio Profile"
-Basic.Setting.Video.Buffer.Interval="視頻緩存時間（最長時間10分鐘）"
+Basic.Setting.Video.Buffer.Interval="視頻緩存時間（最長時間5分鐘）"
 Second="秒"

installer/agora-tool-obs-3.6.200.nsi renamed to installer/agora-tool-obs-3.8.200.nsi

@@ -14,7 +14,7 @@ ManifestDPIAware true
 
 !ifndef APPVERSION
 !define APPVERSION "26.0.2"
-!define SHORTVERSION "3.6.200"
+!define SHORTVERSION "3.8.200"
 !endif
 
 ; Additional script dependencies

src/forms/AgoraSettings.ui

@@ -112,9 +112,9 @@
             <property name="geometry">
              <rect>
               <x>0</x>
-              <y>-112</y>
+              <y>-137</y>
               <width>679</width>
-              <height>570</height>
+              <height>573</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -426,7 +426,7 @@
                         </size>
                        </property>
                        <property name="maximum">
-                        <number>600</number>
+                        <number>300</number>
                        </property>
                        <property name="displayIntegerBase">
                         <number>10</number>
@@ -1182,8 +1182,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>696</width>
-              <height>420</height>
+              <width>655</width>
+              <height>319</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_50">

src/forms/window-agora-main.cpp

@@ -15,7 +15,7 @@
 #if !defined(WIN32)
 #include <dispatch/dispatch.h>
 #endif
-#define AGORA_TOOL_VERSION "21.12.31.19.00"
+#define AGORA_TOOL_VERSION "22.04.29.19.45"
 using namespace std;
 
 bool DisplayResizeEvent::eventFilter(QObject *obj, QEvent *event)
@@ -218,7 +218,7 @@ AgoraBasic::~AgoraBasic()
 		config_set_bool(globalAgoraConfig, "AgoraTool", "savePersist", m_settings.savePersist);
 		config_set_string(globalAgoraConfig, "AgoraTool", "InformationUrl", m_settings.information_url.c_str());
 
-		config_set_bool(globalAgoraConfig, "AgoraTool", "SendOBSCamera", m_settings.bSendObsCamera);
+		config_set_bool(globalAgoraConfig, "AgoraTool", "SendOBSCamera", false);
 		config_set_int(globalAgoraConfig, "AgoraTool", "CameraEncWidth", m_settings.plugin_camera_width);
 		config_set_int(globalAgoraConfig, "AgoraTool", "CameraEncHeight", m_settings.plugin_camera_height);
 		config_set_int(globalAgoraConfig, "AgoraTool", "CameraEncFPS", m_settings.plugin_camera_fps);
@@ -371,7 +371,7 @@ void AgoraBasic::InitBasicConfig()
 			m_settings.camera_token = config_get_string(globalAgoraConfig, "AgoraTool", "CameraToken");
 
 		if (config_has_user_value(globalAgoraConfig, "AgoraTool", "SendOBSCamera"))
-			m_settings.bSendObsCamera = config_get_bool(globalAgoraConfig, "AgoraTool", "SendOBSCamera");
+			m_settings.bSendObsCamera = false;//config_get_bool(globalAgoraConfig, "AgoraTool", "SendOBSCamera");
 		if (config_has_user_value(globalAgoraConfig, "AgoraTool", "CameraEncWidth"))
 			m_settings.plugin_camera_width = config_get_int(globalAgoraConfig, "AgoraTool", "CameraEncWidth");
 		if (config_has_user_value(globalAgoraConfig, "AgoraTool", "CameraEncHeight"))
@@ -814,6 +814,7 @@ void AgoraBasic::JoinChannel(std::string token)
 	joinFailedTimer.start(10000);
 	blog(LOG_INFO, "agora token:%s", m_settings.token.c_str());
 	rtcEngine->SetVideoBuffer(m_settings.videoInterval);
+	
 	rtcEngine->JoinChannel(m_settings.token.c_str()
 		, m_settings.channelName.c_str(), m_settings.uid, m_settings.setAudioProfile ,m_settings.bDualStream,
 		!m_settings.muteAllRemoteAudioVideo, !m_settings.muteAllRemoteAudioVideo,
@@ -1029,8 +1030,12 @@ void AgoraBasic::on_streamButton_clicked()
 		StopAgoraOutput();
 
 		rtcEngine->LeaveChannel();
-		if (joinFailed)
+		if (joinFailed) {
 			rtcEngine->SetJoinFlag(false);
+			RtcStats stats;
+			onLeaveChannel_slot(stats);
+		}
+		
 		if (m_settings.bSendObsCamera) 
 			rtcEngine->LeaveChannelCamera();
 
@@ -1399,7 +1404,7 @@ void AgoraBasic::onConnectionStateChanged_slot(int state, int reason)
 			break;
 		}
 		joinFailedTimer.stop();
-
+		rtcEngine->SetJoinFlag(true);
 		QMessageBox::critical(NULL, "Error", info.c_str());
 		on_streamButton_clicked();
 		joinFailed = false;
@@ -1437,7 +1442,7 @@ void AgoraBasic::onCameraConnectionStateChanged_slot(int state, int reason)
 			break;
 		}
 		joinFailedTimer.stop();
-
+		rtcEngine->SetJoinFlag(true);
 		QMessageBox::critical(NULL, "Error", info.c_str());
 
 		on_streamButton_clicked();

src/forms/window-agora-settings.cpp

@@ -128,7 +128,7 @@ AgoraSettings::AgoraSettings(QWidget *parent)
 	index = 0;
 	ui->cmbRecordChannelSetup->setItemText(0, tr("Mono"));
 	ui->cmbRecordChannelSetup->setItemText(1, tr("Stereo"));
-
+	ui->chkObsCamera->hide();
 	AgoraToolSettings settings;
 	main->GetAgoraSetting(settings);
 	if (settings.audioChannel == 2)
@@ -1030,6 +1030,20 @@ void AgoraSettings::showEvent(QShowEvent *event)
 	ui->lineEditUID->setEnabled(bEnabled);
 	ui->lineEditCameraUID->setEnabled(bEnabled);
 	ui->lineEditCameraToken->setEnabled(bEnabled);
+	ui->chkObsCamera->setEnabled(bEnabled);
+	ui->chkAudioHighQuality->setEnabled(bEnabled);
+	ui->chkSetAudioProfile->setEnabled(bEnabled);
+	ui->cmbRecordChannelSetup->setEnabled(bEnabled);
+	ui->chkDualStream->setEnabled(bEnabled);
+
+	ui->spinSecond->setEnabled(bEnabled);
+	ui->recordSampleRate->setEnabled(bEnabled);
+	
+	ui->lineEditAgoraRTmp->setEnabled(bEnabled);
+	ui->lineEditAgoraRtmpBitrate->setEnabled(bEnabled);
+	ui->lineEditAgoraRtmpFPS->setEnabled(bEnabled);
+	ui->lineEditAgoraRtmpWidth->setEnabled(bEnabled);
+	ui->lineEditAgoraRtmpHeight->setEnabled(bEnabled);
 }
 
 /*typedef void(*obs_source_audio_capture_t)(void *param, obs_source_t *source,