csd-14707

Author: sbd021

OpenLive-Windows/.gitignore

@@ -352,3 +352,4 @@ ASALocalRun/
 *.exe
 *.out
 *.app
+sdk/

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

@@ -84,7 +84,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()
@@ -153,6 +153,7 @@ BOOL COpenLiveDlg::OnInitDialog()
 	m_lpAgoraObject->SetMsgHandlerWnd(GetSafeHwnd());
 	CAgoraObject::GetEngine()->setChannelProfile(CHANNEL_PROFILE_LIVE_BROADCASTING);
 	CAgoraObject::GetAgoraObject()->EnableVideo(TRUE);
+	CAgoraObject::GetAgoraObject()->EnableLastmileTest(TRUE);
 	CAgoraObject::GetAgoraObject()->SetClientRole(CLIENT_ROLE_BROADCASTER);
 
 	SetBackgroundImage(IDB_DLG_MAIN);
@@ -339,7 +340,7 @@ LRESULT COpenLiveDlg::OnJoinChannel(WPARAM wParam, LPARAM lParam)
 {
 	IRtcEngine		*lpRtcEngine = CAgoraObject::GetEngine();
 	CAgoraObject	*lpAgoraObject = CAgoraObject::GetAgoraObject();
-
+	lpAgoraObject->EnableLastmileTest(FALSE);
 	CString strChannelName = m_dlgEnterChannel.GetChannelName();
 
 	m_dlgVideo.MoveWindow(0, 0, 960, 720, 1);
@@ -430,3 +431,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

@@ -48,6 +48,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

@@ -362,7 +362,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);

OpenLive-Windows/README.md

@@ -1,4 +1,4 @@
-# Open Live Windows
+# Open Live Windows
 
 *其他语言版本： [简体中文](README.zh.md)*
 
@@ -16,35 +16,42 @@ This demo is written in **C++**
 
 A tutorial demo can be found here: [Agora-Windows-Tutorial-1to1](https://github.com/AgoraIO/Basic-Video-Call/tree/master/One-to-One-Video/Agora-Windows-Tutorial-1to1)
 
-## Running the App
+  
+## Developer Environment Requirements
+* VC++ 2013(or higher)
+* Windows 7(or higher)
+
+## Running the sample program
 First, create a developer account at [Agora.io](https://dashboard.agora.io/signin/), and obtain an App ID. define the APP_ID with your App ID.
 
-#define APP_ID _T("Your App ID")
+    #define APP_ID _T("Your App ID")
 
 If you don't want to modify the code part, you can create an AppId.ini file under Debug/Release. Modify the appId value to the App ID you just applied.
 
-#[AppID]
-
-#AppID=xxxxxxxxxxxxxxxxxxx
+    [AppID]
+    AppID=xxxxxxxxxxxxxxxxxxx
 
 Next, download the **Agora Video SDK** from [Agora.io SDK](https://www.agora.io/en/download/). Unzip the downloaded SDK package and copy the **sdk** to the project folder(the old one may be over written).
 
 Finally, Open OpenLive.sln with your VC++ 2013(or higher) and build all solution and run.
 
-Note：
+**Note：**
+
   1. After the program is compiled, if the program "xxx\xxx\xxx\Debug\Language\English.dll" cannot be started when running the program, 
       please select the OpenLive project in the Solution Explorer and right click. In the pop-up menu bar, select "Set as startup project" to solve. Then run the program again.
   2. You may encounter crash when running this demo under debug mode. Please run this demo under release mode.
-  
-## Developer Environment Requirements
-* VC++ 2013(or higher)
-* Windows 7(or higher)
 
-## Connect Us
 
+## Contact us
+- For potential issues, you may take a look at our [FAQ](https://docs.agora.io/en/faq) first
+- Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
+- Would like to see how Agora SDK is used in more complicated real use case? Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase)
+- Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)
 - You can find full API document at [Document Center](https://docs.agora.io/en/)
-- You can file bugs about this demo at [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
+- If you encounter problems during integration, you can ask question in [Developer Forum](https://stackoverflow.com/questions/tagged/agora.io)
+- You can file bugs about this sample at [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
 
+ 
 ## License
 
 The MIT License (MIT).

OpenLive-Windows/README.zh.md

@@ -1,4 +1,4 @@
-# Open Live Windows
+# Open Live Windows
 
 *Read this in other languages: [English](README.md)*
 
@@ -16,40 +16,39 @@
 
 你也可以在这里查看入门版的示例项目：[Agora-Windows-Tutorial-1to1](https://github.com/AgoraIO/Basic-Video-Call/tree/master/One-to-One-Video/Agora-Windows-Tutorial-1to1)
 
-## 运行示例程序
-首先在 [Agora.io 注册](https://dashboard.agora.io/cn/signup/) 注册账号，并创建自己的测试项目，获取到 App ID。将 APP_ID宏定义内容改为刚才申请的 App ID
+## 运行环境
+* VC++ 2013(或更高版本)
+* Windows 7(或更高版本)
 
 
-#define APP_ID _T("Your App ID")
+## 运行示例程序
+首先在 [Agora.io 注册](https://dashboard.agora.io/cn/signup/) 注册账号，并创建自己的测试项目，获取到 App ID。将 APP_ID宏定义内容改为刚才申请的 App ID
 
+    #define APP_ID _T("Your App ID")   
 
 如果你不想修改代码部分,你可以在在Debug/Release下创建一个AppId.ini文件.修改appId的值为刚才申请的App ID
 
-#[AppID]
-
-#AppID=xxxxxxxxxxxxxxxxxxx
+    [AppID]
+    AppID=xxxxxxxxxxxxxxxxxxx
 
 
 然后在 [Agora.io SDK](https://www.agora.io/cn/download/) 下载 **视频通话 + 直播 SDK**，解压后将其中的 **sdk** 复制到本项目目录下（并覆盖原有旧目录）。
 
 最后使用 VC++2013 打开 OpenLive.sln，编译整个解决方案即可运行
 
-Note:
+**注意:**
+
   1. 程序编译后，在运行程序时如若出现：无法启动程序"xxx\xxx\xxx\Debug\Language\English.dll"的错误提示，
       请在解决方案资源管理器中选中OpenLive 项目，并右击，在弹出的菜单栏中选择 "设为启动项目"，即可解决。之后重新运行程序即可。
   2. 本开源项目在 debug 模式下运行可能会出现崩溃，请在 release 模式下运行。
 
-## 运行环境
-* VC++ 2013(或更高版本)
-* Windows 7(或更高版本)
-
 ## 联系我们
 
 - 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
 - 如果在集成中遇到问题，你可以到 [开发者社区](https://dev.agora.io/cn/) 提问
 - 如果有售前咨询问题，可以拨打 400 632 6626，或加入官方Q群 12742516 提问
 - 如果需要售后技术支持，你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
-- 如果发现了示例代码的bug，欢迎提交 [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
+- 如果发现了示例代码的bug，欢迎提交 [issue](https://github.com/AgoraIO/Basic-Video-Broadcasting/issues)
 
 ## 代码许可