Merge pull request #3 from Init-INK/master

添加小班课功能
starrtc · Jun 24, 2019 · 4c8d849 · 4c8d849
2 parents 62e7379 + 5ee170b
commit 4c8d849
Show file tree

Hide file tree

Showing 47 changed files with 293 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # starrtc windows示例程序
 
 
-![主界面](assets/主界面.png)
+![主界面](assets/demo.png)
 
 本产品完全免费，并且提供免费的私有部署服务端程序，支持全部功能，并提供第三方拉流、推流功能。
 
@@ -28,9 +28,12 @@ https://github.com/starrtc/starrtc-server
 
 IM
 ====
-![IM_一对一](assets/IM_一对一.png)
+![IM_一对一](assets/IM_OneToOne.png)
 
-![聊天室](assets/聊天室.png)
+聊天室
+====
+
+![聊天室](assets/Chatroom.png)
 
 VOIP视频通话
 ====
@@ -39,17 +42,29 @@ VOIP视频通话
 
 多人会议
 ====
-![多人会议](assets/多人会议.png)
+![多人会议](assets/Meeting.png)
 
 
 互动直播
 ====
-![互动直播](assets/互动直播.png)
+![互动直播](assets/Live.png)
 
 
 监控
 ====
-![监控](assets/监控.png)
+![监控](assets/Monitor.png)
+
+语音聊天室
+====
+![语音聊天室](assets/AudioChatroom.png)
+
+内网直连
+====
+
+小班课
+====
+![监控](assets/MinClass.png)
+
 
 更新记录
 =====

diff --git a/assets/AudioChatroom.png b/assets/AudioChatroom.png
diff --git a/assets/聊天室.png → assets/Chatroom.png b/assets/聊天室.png → assets/Chatroom.png
diff --git a/assets/IM_一对一.png → assets/IM_OneToOne.png b/assets/IM_一对一.png → assets/IM_OneToOne.png
diff --git a/assets/互动直播.png → assets/Live.png b/assets/互动直播.png → assets/Live.png
diff --git a/assets/多人会议.png → assets/Meeting.png b/assets/多人会议.png → assets/Meeting.png
diff --git a/assets/MinClass.png b/assets/MinClass.png
diff --git a/assets/监控.png → assets/Monitor.png b/assets/监控.png → assets/Monitor.png
diff --git a/assets/demo.png b/assets/demo.png
diff --git a/assets/主界面.png b/assets/主界面.png
diff --git a/release/starrtc-demo/libstarRTC.dll b/release/starrtc-demo/libstarRTC.dll
diff --git a/release/starrtc-demo/starrtccoreDll.dll b/release/starrtc-demo/starrtccoreDll.dll
diff --git a/release/starrtc-demo/starrtcdemo.exe b/release/starrtc-demo/starrtcdemo.exe
diff --git a/starrtcdemo/starrtcdemo/CAudioChatroomDlg.cpp b/starrtcdemo/starrtcdemo/CAudioChatroomDlg.cpp
diff --git a/starrtcdemo/starrtcdemo/CChatroomDlg.cpp b/starrtcdemo/starrtcdemo/CChatroomDlg.cpp
diff --git a/starrtcdemo/starrtcdemo/CDataControl.cpp b/starrtcdemo/starrtcdemo/CDataControl.cpp
@@ -89,7 +89,11 @@ DWORD WINAPI GetCameraDataThread(LPVOID p)
 		Mat frame;
 
 		CImage image;
-		pDataControl->addUpId();
+		if (pDataControl->m_bInsertData)
+		{
+			pDataControl->addUpId();
+		}
+
 		while (pDataControl->m_bExit == false && pDataControl->m_bStop == false)
 		{
 			cap >> frame;

diff --git a/starrtcdemo/starrtcdemo/CDataShowView.h b/starrtcdemo/starrtcdemo/CDataShowView.h
@@ -22,7 +22,7 @@ class CDataShowView
 	int getUserCount();
 	string changeShowStyle(string strUserId, bool bBigPic);
 	void setDrawRect(CRect drawRect);
-	void setShowPictures();
+	virtual void setShowPictures();
 	void drawPic(YUV_TYPE type, string userId, int w, int h, uint8_t* videoData, int videoDataLen);
 	void drawPic(string userId, int w, int h, CImage image);
 public:

diff --git a/starrtcdemo/starrtcdemo/CInterfaceUrls.cpp b/starrtcdemo/starrtcdemo/CInterfaceUrls.cpp
@@ -115,7 +115,7 @@ void CInterfaceUrls::demoRequestMiniClassList(list<ChatroomInfo>& listData, CUse
 {
 	listData.clear();
 	string strData = "appid=";
-	strData = strData + pUserManager->m_ServiceParam.m_strAgentId.c_str();
+	strData = strData + "stargWeHN8Y7";
 
 	CString strContent = "";
 	CHttpClient httpClient;
@@ -415,6 +415,19 @@ void CInterfaceUrls::demoRequestAudioLiveList(list<ChatroomInfo>& listData, CUse
 					{
 						livePro.m_strCreaterId = data[i]["Creator"].asCString();
 					}
+					if (data[i].isMember("liveState"))
+					{
+						string strStatus = data[i]["liveState"].asCString();
+						if (strStatus == "1")
+						{
+							livePro.m_bLive = true;
+						}
+						else
+						{
+							livePro.m_bLive = false;
+						}
+					}
+
 
 					listData.push_back(livePro);
 				}
@@ -452,7 +465,7 @@ void CInterfaceUrls::demoReportAudioLive(string liveID, string liveName, string
 //上报小班课
 void CInterfaceUrls::demoReportMiniClass(string liveID, string liveName, string creatorID, CUserManager* pUserManager)
 {
-	string url = REPORT_MINI_CLASS_INFO_URL + "?ID=" + liveID + "&Name=" + liveName + "&Creator=" + creatorID + "&appid=" + pUserManager->m_ServiceParam.m_strAgentId;
+	string url = REPORT_MINI_CLASS_INFO_URL + "?ID=" + liveID + "&Name=" + liveName + "&Creator=" + creatorID + "&appid=" + "stargWeHN8Y7";
 	string strData = "";
 	std::string strVal = "";
 	std::string strErrInfo = "";

diff --git a/starrtcdemo/starrtcdemo/CMinClassDataShowView.cpp b/starrtcdemo/starrtcdemo/CMinClassDataShowView.cpp
@@ -0,0 +1,41 @@
+#include "stdafx.h"
+#include "CMinClassDataShowView.h"
+
+
+CMinClassDataShowView::CMinClassDataShowView()
+{
+}
+
+
+CMinClassDataShowView::~CMinClassDataShowView()
+{
+}
+
+void CMinClassDataShowView::setShowPictures()
+{
+	CUpUserInfo* pUpUserInfo = NULL;
+	int useIndex = 1;
+	EnterCriticalSection(&m_critPicture);
+	int nSize = (int)m_upUserInfoArr.size();
+	CRect rect = m_DrawRect;
+
+	int nHeight = (int)(rect.Height()*0.25f);
+	if (nSize > 4)
+	{
+		nHeight = (int)(rect.Height()/ (float)nSize);
+	}
+
+	for (int i = 0; i < nSize; i++)
+	{
+		CRect smallRect;
+		smallRect.left = rect.left;
+		smallRect.top = rect.top + i *nHeight;
+		smallRect.right = rect.right;
+		smallRect.bottom = smallRect.top + nHeight;
+		m_upUserInfoArr[i]->m_showRect = smallRect;
+		m_upUserInfoArr[i]->m_pPictureControl->MoveWindow(smallRect);
+		m_upUserInfoArr[i]->m_pPictureControl->ShowWindow(SW_SHOW);
+
+	}
+	LeaveCriticalSection(&m_critPicture);
+}
diff --git a/starrtcdemo/starrtcdemo/CMinClassDataShowView.h b/starrtcdemo/starrtcdemo/CMinClassDataShowView.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "CDataShowView.h"
+class CMinClassDataShowView :
+	public CDataShowView
+{
+public:
+	CMinClassDataShowView();
+	virtual ~CMinClassDataShowView();
+
+	virtual void setShowPictures();
+};
+
diff --git a/starrtcdemo/starrtcdemo/CMinClassDlg.cpp b/starrtcdemo/starrtcdemo/CMinClassDlg.cpp
diff --git a/starrtcdemo/starrtcdemo/CMinClassDlg.h b/starrtcdemo/starrtcdemo/CMinClassDlg.h
diff --git a/starrtcdemo/starrtcdemo/CMinClassListDlg.cpp b/starrtcdemo/starrtcdemo/CMinClassListDlg.cpp
diff --git a/starrtcdemo/starrtcdemo/CMinClassListDlg.h b/starrtcdemo/starrtcdemo/CMinClassListDlg.h
diff --git a/starrtcdemo/starrtcdemo/CMultipleMeetingDialog.cpp b/starrtcdemo/starrtcdemo/CMultipleMeetingDialog.cpp
diff --git a/starrtcdemo/starrtcdemo/CStarRTCMenuDialog.cpp b/starrtcdemo/starrtcdemo/CStarRTCMenuDialog.cpp
diff --git a/starrtcdemo/starrtcdemo/CStarRTCMenuDialog.h b/starrtcdemo/starrtcdemo/CStarRTCMenuDialog.h
diff --git a/starrtcdemo/starrtcdemo/CStarWhitePanel.cpp b/starrtcdemo/starrtcdemo/CStarWhitePanel.cpp
@@ -0,0 +1,71 @@
+#include "stdafx.h"
+#include "CStarWhitePanel.h"
+
+
+CStarWhitePanel::CStarWhitePanel()
+{
+	m_bDraw = false;
+	m_bLaserOn = false;
+}
+
+
+CStarWhitePanel::~CStarWhitePanel()
+{
+	m_bDraw = false;
+}
+BEGIN_MESSAGE_MAP(CStarWhitePanel, CStatic)
+	ON_WM_LBUTTONDOWN()
+	ON_WM_MOUSEMOVE()
+	ON_WM_LBUTTONUP()
+	//ON_WM_PAINT()
+END_MESSAGE_MAP()
+
+
+void CStarWhitePanel::OnLButtonDown(UINT nFlags, CPoint point)
+{
+	// TODO: 在此添加消息处理程序代码和/或调用默认值
+	AfxMessageBox("111");
+	m_bDraw = true;
+	m_StartPoint = point;
+	CStatic::OnLButtonDown(nFlags, point);
+}
+
+
+void CStarWhitePanel::OnMouseMove(UINT nFlags, CPoint point)
+{
+	// TODO: 在此添加消息处理程序代码和/或调用默认值
+	CClientDC dc(this);
+	if (m_bDraw)
+	{
+		dc.MoveTo(m_StartPoint);
+		dc.LineTo(point);
+		m_StartPoint = point;
+	}
+	CStatic::OnMouseMove(nFlags, point);
+}
+
+
+void CStarWhitePanel::OnLButtonUp(UINT nFlags, CPoint point)
+{
+	// TODO: 在此添加消息处理程序代码和/或调用默认值
+	m_bDraw = false;
+	CStatic::OnLButtonUp(nFlags, point);
+}
+//
+//
+//void CStarWhitePanel::OnPaint()
+//{
+//	CPaintDC dc(this); 
+//	//dc.SetBkMode(TRANSPARENT);
+//}
+//
+//打开激光笔
+void CStarWhitePanel::laserPenOn()
+{
+	m_bLaserOn = true;
+}
+//关闭激光笔
+void CStarWhitePanel::laserPenOff()
+{
+	m_bLaserOn = false;
+}
diff --git a/starrtcdemo/starrtcdemo/CStarWhitePanel.h b/starrtcdemo/starrtcdemo/CStarWhitePanel.h
@@ -0,0 +1,27 @@
+#pragma once
+#include <afxwin.h>
+
+
+class CStarWhitePanel :
+	public CStatic
+{
+public:
+	CStarWhitePanel();
+	~CStarWhitePanel();
+	DECLARE_MESSAGE_MAP()
+	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
+	//afx_msg void OnPaint();
+public:
+	//´ňżŞź¤šâąĘ
+	void laserPenOn();
+	//šŘąŐź¤šâąĘ
+	void laserPenOff();
+
+private:
+	bool m_bDraw;
+	bool m_bLaserOn;
+	CPoint m_StartPoint;
+};
+
diff --git a/starrtcdemo/starrtcdemo/CWhitePanelDlg.cpp b/starrtcdemo/starrtcdemo/CWhitePanelDlg.cpp
diff --git a/starrtcdemo/starrtcdemo/CWhitePanelDlg.h b/starrtcdemo/starrtcdemo/CWhitePanelDlg.h
diff --git a/starrtcdemo/starrtcdemo/IWhitePanelCallback.h b/starrtcdemo/starrtcdemo/IWhitePanelCallback.h
@@ -0,0 +1,22 @@
+#pragma once
+#include "WhitePanelActionType.h"
+#include "atltypes.h"
+class CScreenPoint
+{
+public:
+	double x;
+	double y;
+};
+
+class CWhitePanelInfo
+{
+public:
+	WHITE_PANEL_ACTION type;
+	CScreenPoint point;
+	int lineColor;
+};
+class IWhitePanelCallback
+{
+public:
+	virtual void actionCallback(WHITE_PANEL_ACTION type, CScreenPoint& point, int lineColor) = 0;
+};
diff --git a/starrtcdemo/starrtcdemo/WhitePanelActionType.h b/starrtcdemo/starrtcdemo/WhitePanelActionType.h
@@ -0,0 +1,20 @@
+#pragma once
+
+
+enum WHITE_PANEL_ACTION {
+	WHITE_PANEL_EMPTY,          //0 无
+	WHITE_PANEL_START,          //1 笔画起点
+	WHITE_PANEL_MOVE,           //2 笔画移动
+	WHITE_PANEL_END,            //3 笔画终点
+	WHITE_PANEL_REVOKE,         //4 撤销
+	WHITE_PANEL_SERIAL,         //5
+	WHITE_PANEL_CLEAR,          //6 清除
+	WHITE_PANEL_CLEAR_ACK,      //7 清除反馈
+	WHITE_PANEL_SYNC_REQUEST,   //8 同步请求
+	WHITE_PANEL_SYNC,           //9 同步
+	WHITE_PANEL_SYNC_PREPARE,   //10 同步准备
+	WHITE_PANEL_SYNC_PREPARE_ACK,//11 同步准备反馈
+	WHITE_PANEL_LASER_PEN,      //12 激光笔
+	WHITE_PANEL_LASER_PEN_END,  //13 激光笔结束
+	WHITE_PANEL_FILE            //14 文件
+};
diff --git a/starrtcdemo/starrtcdemo/chatDB.db b/starrtcdemo/starrtcdemo/chatDB.db
diff --git a/starrtcdemo/starrtcdemo/param.ini b/starrtcdemo/starrtcdemo/param.ini
diff --git a/starrtcdemo/starrtcdemo/resource.h b/starrtcdemo/starrtcdemo/resource.h
diff --git a/starrtcdemo/starrtcdemo/starrtcdemo.aps b/starrtcdemo/starrtcdemo/starrtcdemo.aps
diff --git a/starrtcdemo/starrtcdemo/starrtcdemo.rc b/starrtcdemo/starrtcdemo/starrtcdemo.rc
diff --git a/starrtcdemo/starrtcdemo/starrtcdemo.vcxproj b/starrtcdemo/starrtcdemo/starrtcdemo.vcxproj
@@ -249,6 +249,9 @@
     <ClInclude Include="CLiveUserInfo.h" />
     <ClInclude Include="CLocalDataControlListener.h" />
     <ClInclude Include="CMessageBean.h" />
+    <ClInclude Include="CMinClassDataShowView.h" />
+    <ClInclude Include="CMinClassDlg.h" />
+    <ClInclude Include="CMinClassListDlg.h" />
     <ClInclude Include="CMultipleMeetingDialog.h" />
     <ClInclude Include="CNewDlg.h" />
     <ClInclude Include="CPicControl.h" />
@@ -264,23 +267,26 @@
     <ClInclude Include="CSoundManager.h" />
     <ClInclude Include="CSqliteDB.h" />
     <ClInclude Include="CStarRTCMenuDialog.h" />
+    <ClInclude Include="CStarWhitePanel.h" />
     <ClInclude Include="CUserInformation.h" />
     <ClInclude Include="CVoipDataShowView.h" />
     <ClInclude Include="CVoipDlg.h" />
     <ClInclude Include="CVoipP2PDlg.h" />
     <ClInclude Include="CvvImage.h" />
+    <ClInclude Include="CWhitePanelDlg.h" />
     <ClInclude Include="HttpClient.h" />
     <ClInclude Include="IButtonCallback.h" />
     <ClInclude Include="IShowLiveCallback.h" />
     <ClInclude Include="ISoundCallback.h" />
-    <ClInclude Include="json\json.h" />
+    <ClInclude Include="IWhitePanelCallback.h" />
     <ClInclude Include="PlaySound.h" />
     <ClInclude Include="RecodeSound.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="starrtcdemo.h" />
     <ClInclude Include="starrtcdemoDlg.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
+    <ClInclude Include="WhitePanelActionType.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CAudioChatroomDlg.cpp" />
@@ -301,6 +307,9 @@
     <ClCompile Include="CInterfaceUrls.cpp" />
     <ClCompile Include="CLiveProgram.cpp" />
     <ClCompile Include="CMessageBean.cpp" />
+    <ClCompile Include="CMinClassDataShowView.cpp" />
+    <ClCompile Include="CMinClassDlg.cpp" />
+    <ClCompile Include="CMinClassListDlg.cpp" />
     <ClCompile Include="CMultipleMeetingDialog.cpp" />
     <ClCompile Include="CNewDlg.cpp" />
     <ClCompile Include="CPicControl.cpp" />
@@ -314,10 +323,12 @@
     <ClCompile Include="CSoundManager.cpp" />
     <ClCompile Include="CSqliteDB.cpp" />
     <ClCompile Include="CStarRTCMenuDialog.cpp" />
+    <ClCompile Include="CStarWhitePanel.cpp" />
     <ClCompile Include="CVoipDataShowView.cpp" />
     <ClCompile Include="CVoipDlg.cpp" />
     <ClCompile Include="CVoipP2PDlg.cpp" />
     <ClCompile Include="CvvImage.cpp" />
+    <ClCompile Include="CWhitePanelDlg.cpp" />
     <ClCompile Include="HttpClient.cpp" />
     <ClCompile Include="PlaySound.cpp" />
     <ClCompile Include="RecodeSound.cpp" />