CSD-14707

Author: sbd021

OpenLive-Windows/OpenLive/AGEngineEventHandler.cpp

@@ -320,4 +320,11 @@ void CAGEngineEventHandler::onConnectionInterrupted()
 
 void CAGEngineEventHandler::onUserEnableVideo(uid_t uid, bool enabled)
 {
+}
+
+void CAGEngineEventHandler::onLastmileQuality(int quality)
+{
+	if (m_hMainWnd != NULL)
+		::PostMessage(m_hMainWnd, WM_MSGID(EID_LASTMILE_QUALITY), quality, 0);
+
 }

OpenLive-Windows/OpenLive/AGEngineEventHandler.h

@@ -43,6 +43,8 @@ class CAGEngineEventHandler :
 	virtual void onConnectionInterrupted() override;
 
 	virtual void onUserEnableVideo(uid_t uid, bool enabled) override;
+
+	virtual void onLastmileQuality(int quality)override;
 private:
 	HWND		m_hMainWnd;
 };

OpenLive-Windows/OpenLive/AGEventDef.h

@@ -243,5 +243,5 @@ typedef struct _AGE_APICALL_EXECUTED
 
 #define EID_APICALL_EXECUTED					0x00000020
 
-
+#define EID_LASTMILE_QUALITY					0x00000021
 #endif

OpenLive-Windows/OpenLive/OpenLiveDlg.cpp

@@ -89,7 +89,7 @@ BEGIN_MESSAGE_MAP(COpenLiveDlg, CDialogEx)
     ON_MESSAGE(WM_MSGID(EID_NETWORK_QUALITY), &COpenLiveDlg::OnNetworkQuality)
 	ON_MESSAGE(WM_MSGID(EID_APICALL_EXECUTED), &COpenLiveDlg::OnEIDApiExecuted)
 	ON_MESSAGE(WM_MSGID(EID_ERROR), &COpenLiveDlg::OnEIDError)
-
+	ON_MESSAGE(WM_MSGID(EID_LASTMILE_QUALITY), &COpenLiveDlg::OnLastMileQuality)
 	ON_MESSAGE(WM_MSGID(EID_LEAVE_CHANNEL), &COpenLiveDlg::OnEIDLeaveChannel)
     ON_WM_CLOSE()
 END_MESSAGE_MAP()
@@ -435,3 +435,16 @@ LRESULT COpenLiveDlg::OnEIDLeaveChannel(WPARAM wParam, LPARAM lParam)
 	lpData = NULL;
 	return 0;
 }
+
+
+
+LRESULT COpenLiveDlg::OnLastMileQuality(WPARAM wParam, LPARAM lParam)
+{
+	int quality = wParam;
+
+	if (m_nNetworkQuality != quality) {
+		m_nNetworkQuality = quality;
+		InvalidateRect(CRect(16, 40, 48, 72), TRUE);
+	}
+	return 0;
+}

OpenLive-Windows/OpenLive/OpenLiveDlg.h

@@ -47,7 +47,7 @@ class COpenLiveDlg : public CDialogEx
 	afx_msg LRESULT OnEIDApiExecuted(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnEIDError(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnEIDLeaveChannel(WPARAM wParam, LPARAM lParam);
-
+	afx_msg LRESULT OnLastMileQuality(WPARAM wParam, LPARAM lParam);
 	DECLARE_MESSAGE_MAP()
 
 protected:

OpenLive-Windows/OpenLive/VideoDlg.cpp

@@ -364,7 +364,8 @@ void CVideoDlg::OnBnClickedBtnclose()
 	CAgoraObject::GetAgoraObject()->MuteLocalAudio(FALSE);
 	m_btnAudio.SwitchButtonStatus(CAGButton::AGBTN_NORMAL);
 
-	CAgoraObject::GetAgoraObject()->EnableScreenCapture(NULL, 0, NULL, FALSE);
+	if (CAgoraObject::GetAgoraObject()->IsScreenCaptureEnabled())
+		CAgoraObject::GetAgoraObject()->EnableScreenCapture(NULL, 0, NULL, FALSE);
 	m_btnScrCap.SwitchButtonStatus(CAGButton::AGBTN_NORMAL);
 
 	m_dlgChat.ShowWindow(SW_HIDE);