EasyPlayer-RTSP-Win-v3.0.19.0415

EasyDarwin · Apr 20, 2019 · 8376fcb · 8376fcb
1 parent a708832
commit 8376fcb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 26 deletions.
diff --git a/Bin/C++/EasyPlayer-RTSP.exe b/Bin/C++/EasyPlayer-RTSP.exe
diff --git a/Bin/C++/EasyPlayer-RTSPWebActiveX.ocx b/Bin/C++/EasyPlayer-RTSPWebActiveX.ocx
diff --git a/Bin/C++/Main_config.xml b/Bin/C++/Main_config.xml
@@ -4,8 +4,8 @@
 	<Font name="微软雅黑" size="15" italic="true"/>
 	<Font name="微软雅黑" size="15" />
 
-	<String text="EasyPlayer RTSP播放器" font="1" color="#FFFFFF" pos="0,0,40,7,300,42" id="1"/>
-	<String text="Version: 2.4.19.0414 Powered by EasyDarwin Team QQ交流群：544917793" font="2" color="#FFFFFF" pos="3,3,810,25,0,0" id="2"/>
+	<String text="EasyPlayer-RTSP v3.0" font="1" color="#FFFFFF" pos="0,0,40,7,300,42" id="1"/>
+	<String text="Version: 3.0.19.0415 Powered by EasyDarwin Team QQ交流群：544917793" font="2" color="#FFFFFF" pos="3,3,810,25,0,0" id="2"/>
 	<String text="Log" font="3" color="#000000" pos="3,3,40,125,5,105" id="3"/>
 	<String text="" font="3" color="#000000" pos="2,2,5,25,205,0" id="4"/>
 

diff --git a/Bin/C++/libEasyPlayer-RTSP.dll b/Bin/C++/libEasyPlayer-RTSP.dll
diff --git a/Src/C++/EasyPlayer/EasyPlayerDlg.cpp b/Src/C++/EasyPlayer/EasyPlayerDlg.cpp
@@ -125,7 +125,10 @@ BOOL CEasyPlayerDlg::OnInitDialog()
 	// TODO: 在此添加额外的初始化代码
 
 	CString strValidTime;
-	strValidTime.Format(_T("授权剩余时间 %d 天"), m_nValidTimes);
+	if(m_nValidTimes == EASY_ACTIVATE_SUCCESS)
+		strValidTime.Format(_T("EasyPlayer工具版，永久免费！"));
+	else
+		strValidTime.Format(_T("授权剩余时间 %d 天"), m_nValidTimes);
 	SetString(4, strValidTime );
 
 	CreateComponents();

diff --git a/Src/C++/libEasyPlayer/libEasyPlayerAPI.cpp b/Src/C++/libEasyPlayer/libEasyPlayerAPI.cpp
@@ -14,29 +14,6 @@ CChannelManager	*g_pChannelManager = NULL;
 LIB_EASYPLAYER_API int EasyPlayer_Init(char* key)
 {
 	int isEasyRTSPClientActivated = EasyRTSP_Activate(key);
-#if 0
-	switch(isEasyRTSPClientActivated)
-	{
-	case EASY_ACTIVATE_INVALID_KEY:
-		printf("EasyRTSPClient_KEY is EASY_ACTIVATE_INVALID_KEY!\n");
-		break;
-	case EASY_ACTIVATE_TIME_ERR:
-		printf("EasyRTSPClient_KEY is EASY_ACTIVATE_TIME_ERR!\n");
-		break;
-	case EASY_ACTIVATE_PROCESS_NAME_LEN_ERR:
-		printf("EasyRTSPClient_KEY is EASY_ACTIVATE_PROCESS_NAME_LEN_ERR!\n");
-		break;
-	case EASY_ACTIVATE_PROCESS_NAME_ERR:
-		printf("EasyRTSPClient_KEY is EASY_ACTIVATE_PROCESS_NAME_ERR!\n");
-		break;
-	case EASY_ACTIVATE_VALIDITY_PERIOD_ERR:
-		printf("EasyRTSPClient_KEY is EASY_ACTIVATE_VALIDITY_PERIOD_ERR!\n");
-		break;
-	case EASY_ACTIVATE_SUCCESS:
-		printf("EasyRTSPClient_KEY is EASY_ACTIVATE_SUCCESS!\n");
-		break;
-	}
-#endif
 
 	if(isEasyRTSPClientActivated <= 0)
 		return isEasyRTSPClientActivated;