增加日志

live_get_push_pull_address/live_get_push_pull_address.vcxproj

@@ -23,7 +23,7 @@
     <ProjectGuid>{5AD086E3-FAFF-4992-9204-DC166A2F3F6A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>livegetpushpulladdress</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

thirdparty/curl/http_client.cpp

@@ -7,7 +7,8 @@
 
 #pragma comment(lib, "libcurl.lib")
 
-static const std::string kUrl = "http://test-api.live.offcncloud.com/api/v1/board";
+//static const std::string kUrl = "http://test-api.live.offcncloud.com/api/v1/board";
+static const std::string kUrl = "http://api.live.offcncloud.com/api/v1/board";
 
 ZgHttpClient::ZgHttpClient()
 	:curl_(NULL),

thirdparty/curl/http_request.cpp

@@ -49,6 +49,8 @@ bool HttpRequest::LogIn(std::string userid, std::string password, std::string &t
 	headers["zgl-clientversion"] = "3.1.1";
 
 	//"https://test-api.live.offcncloud.com/api/v1/users"
+
+	HttpRequest::GetInstance()->web_server_url_ = "https://api.live.offcncloud.com";
 	std::string req = HttpRequest::GetInstance()->web_server_url_ + "/api/v1/users";
 	std::string response;
 	if (!client.Post(req, params, headers, response))

wb_rebuild/filereader.cpp

@@ -73,6 +73,10 @@ int CFileReader::OpenFile(std::string filePath, std::string key/* = ""*/, int nT
 		av_dict_set_int(&format_opts, "cryptkey_extend_len", 16, AV_DICT_MATCH_CASE);
 		av_dict_set(&format_opts, "cryptkey_extend", aes_128_key_value_.c_str(), AV_DICT_MATCH_CASE);
 	}
+
+	//支持播放本地m3u8
+	av_dict_set(&format_opts, "protocol_whitelist", "file,crypto,http,https,tcp,tls", 0);
+
 	//禁用 HLS 使用多个链接拉取ts文件逻辑，多链接拉取有bug例如，正在播放第二个文件的中间时 取拉取第四个文件，拉取失败时会导致第二个文件剩下的数据无法播放
 	av_dict_set(&format_opts, "http_multiple", "0", 0);
 	int nRet = avformat_open_input(&m_inFormatContext, filePath.c_str(), 0, &format_opts);

wb_rebuild/rebuild_manager.cpp

@@ -138,7 +138,14 @@ void RebuildManager::CallBackWhiteBoardData(AVPacket &pkt)
 			std::string req((char *)info.m_pData + 6, info.m_nDataSize - 6);
 
 			int index = *(int *)(info.m_pData + 6 + 8);
-			printf("whitebaord's data index = %d\n", index);
+
+			//canvas id
+			char *p = (char *)info.m_pData + 32;
+			char tmp[32] = { 0 };
+			memcpy(tmp, p, 24);
+
+			printf("whitebaord's data index = %d, canvasid = %s\n", index, tmp);
+
 
 			if (m_pMqtt)
 			{