Skip to content

Commit

Permalink
V4.3.47204.0325
Browse files Browse the repository at this point in the history
  • Loading branch information
carsonzoom committed Mar 25, 2019
1 parent 725496b commit 11db240
Show file tree
Hide file tree
Showing 23 changed files with 322 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2019-03-25

* No interface changes for C# wrapper, please refer to [https://github.com/zoom/zoom-sdk-windows/blob/master/CHANGELOG.md](https://github.com/zoom/zoom-sdk-windows/blob/master/CHANGELOG.md) for changes in Windows SDK.

## 2019-01-23

* No interface changes for C# wrapper, please refer to [https://github.com/zoom/zoom-sdk-windows/blob/master/CHANGELOG.md](https://github.com/zoom/zoom-sdk-windows/blob/master/CHANGELOG.md) for changes in Windows SDK.
Expand Down
Binary file modified bin/zoom_sdk_dotnet_wrap.dll
Binary file not shown.
26 changes: 26 additions & 0 deletions bin/zoom_sdk_dotnet_wrap.dll.metagen
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,31 @@ Struct ZOOM_SDK_DOTNET_WRAP.H323DeviceType: AutoLayout, AnsiClass, Class, Public
ZOOM_SDK_DOTNET_WRAP.H323DeviceType H323DeviceType_Unknown = 0 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.H323DeviceType H323DeviceType_H323 = 1 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.H323DeviceType H323DeviceType_SIP = 2 : Public, Static, Literal, HasDefault
Interface ZOOM_SDK_DOTNET_WRAP.ICustomizedResourceHelperDotNetWrap: AutoLayout, AnsiClass, Class, Public, ClassSemanticsMask, Abstract, BeforeFieldInit
Methods:
AddCustomizedPictureResource(String, String): PrivateScope, Public, Virtual, HideBySig, VtableLayoutMask, Abstract
AddCustomizedStringResource(SDKCustomizedStringType, String): PrivateScope, Public, Virtual, HideBySig, VtableLayoutMask, Abstract
AddCustomizedURLResource(SDKCustomizedURLType, String): PrivateScope, Public, Virtual, HideBySig, VtableLayoutMask, Abstract
Struct ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType: AutoLayout, AnsiClass, Class, Public, Sealed, BeforeFieldInit
:System.Enum
Fields:
Int32 value__ : Public, SpecialName, RTSpecialName
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_LiveStream_MenuString_LiveOn_String = 0 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_LiveStream_MenuString_LiveView_String = 1 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_LiveStream_MenuString_LiveStop_String = 2 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_LiveStream_MenuString_CopyURL_String = 3 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_Title_App = 4 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_Title_ZoomVideo = 5 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_Title_FreeZoomVideo = 6 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_Title_ViewOnly_ZoomVideo = 7 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedStringType SDK_Customized_Title_ViewOnly_FreeZoomVideo = 8 : Public, Static, Literal, HasDefault
Struct ZOOM_SDK_DOTNET_WRAP.SDKCustomizedURLType: AutoLayout, AnsiClass, Class, Public, Sealed, BeforeFieldInit
:System.Enum
Fields:
Int32 value__ : Public, SpecialName, RTSpecialName
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedURLType SDKCustomizedURL_VITRULBG_HELP = 0 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedURLType SDKCustomizedURL_VITRULBG_LEARN_MORE = 1 : Public, Static, Literal, HasDefault
ZOOM_SDK_DOTNET_WRAP.SDKCustomizedURLType SDKCustomizedURL_SUPPORTURL = 2 : Public, Static, Literal, HasDefault
Interface ZOOM_SDK_DOTNET_WRAP.IAnnotationControllerDotNetWrap: AutoLayout, AnsiClass, Class, Public, ClassSemanticsMask, Abstract, BeforeFieldInit
Methods:
IsAnnoataionDisable(): PrivateScope, Public, Virtual, HideBySig, VtableLayoutMask, Abstract
Expand Down Expand Up @@ -1301,3 +1326,4 @@ Class ZOOM_SDK_DOTNET_WRAP.CZoomSDKeDotNetWrap: AutoLayout, AnsiClass, Class, Pu
GetAuthServiceWrap(): PrivateScope, Public, HideBySig
GetMeetingServiceWrap(): PrivateScope, Public, HideBySig
GetSettingServiceWrap(): PrivateScope, Public, HideBySig
RetrieveCustomizedResourceHelperWrap(): PrivateScope, Public, HideBySig
32 changes: 32 additions & 0 deletions zoom_sdk_c_sharp_wrap/customized_resource_helper_dotnet_wrap.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include "stdafx.h"
#include "customized_resource_helper_dotnet_wrap.h"
#include "zoom_sdk_dotnet_wrap_util.h"
#include "wrap/sdk_wrap.h"
namespace ZOOM_SDK_DOTNET_WRAP {

SDKError CCustomizedResourceHelperDotNetWrap::AddCustomizedPictureResource(String^ key_, String^ absolute_resource_path)
{
return (SDKError)ZOOM_SDK_NAMESPACE::CSDKExtWrap::GetInst().GetCustomizedResourceHelperWrap()
.AddCustomizedPictureResource(PlatformString2WChar(key_), PlatformString2WChar(absolute_resource_path));
}

SDKError CCustomizedResourceHelperDotNetWrap::AddCustomizedStringResource(SDKCustomizedStringType customizedType, String^ customizedString)
{
return (SDKError)ZOOM_SDK_NAMESPACE::CSDKExtWrap::GetInst().GetCustomizedResourceHelperWrap()
.AddCustomizedStringResource((ZOOM_SDK_NAMESPACE::SDKCustomizedStringType)customizedType, PlatformString2WChar(customizedString));
}

SDKError CCustomizedResourceHelperDotNetWrap::AddCustomizedURLResource(SDKCustomizedURLType customizedType, String^ customizedUrl)
{
return (SDKError)ZOOM_SDK_NAMESPACE::CSDKExtWrap::GetInst().GetCustomizedResourceHelperWrap()
.AddCustomizedURLResource((ZOOM_SDK_NAMESPACE::SDKCustomizedURLType)customizedType, PlatformString2WChar(customizedUrl));
}

CCustomizedResourceHelperDotNetWrap::CCustomizedResourceHelperDotNetWrap()
{
}

CCustomizedResourceHelperDotNetWrap::~CCustomizedResourceHelperDotNetWrap()
{
}
}
52 changes: 52 additions & 0 deletions zoom_sdk_c_sharp_wrap/customized_resource_helper_dotnet_wrap.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#pragma once
using namespace System;
#include "zoom_sdk_dotnet_wrap_def.h"
namespace ZOOM_SDK_DOTNET_WRAP {

public enum class SDKCustomizedStringType : int
{
SDK_Customized_LiveStream_MenuString_LiveOn_String = 0,///<The new string must end up with "%s" so that the menu item can show correctly. This type is used to define a string to replace the menu item ON %S on live streaming.
SDK_Customized_LiveStream_MenuString_LiveView_String,///<The new string must end up with "%s" so that the menu item can show correctly. This type is used to define a string to replace the menu item VIEW STREAM ON %S on live streaming.
SDK_Customized_LiveStream_MenuString_LiveStop_String,///<The new string must be a pure string so that it can show correctly. This type is used to define a string to replace the menu item STOP LIVE STREAM on live streaming.
SDK_Customized_LiveStream_MenuString_CopyURL_String,///<The new string must be a pure string so that it can show correctly. This type is used to define a string to replace the menu item COPY STREAMING LINK on live streaming.
SDK_Customized_Title_App, ///<The new string must be a pure string so that it can show correctly. This type is used to define a string to replace the title of the meeting video UI.
SDK_Customized_Title_ZoomVideo, ///<The new string must be the same format as "Zoom Participant ID: %s Meeting ID: %s" so that it can show correctly. This type is used to define a string to replace the title of the meeting video UI.
SDK_Customized_Title_FreeZoomVideo, ///<The new string must be the same format as "Zoom Participant ID: %s %d-Minutes Meeting ID:%s" so that it can show correctly. This type is used to define a string to replace the title of the meeting video UI when the user is free user and in view-only status.
SDK_Customized_Title_ViewOnly_ZoomVideo, ///<The new string must end up with "%s" so that it can show correctly. This type is used to define a string to replace the title of the meeting video UI.
SDK_Customized_Title_ViewOnly_FreeZoomVideo, ///<The new string must be the same format as "Zoom %d-Minutes Meeting ID: %s" so that it can show correctly. This type is used to define a string to replace the title of the meeting video UI when the user is free user and in view-only status.
};

public enum class SDKCustomizedURLType : int
{
SDKCustomizedURL_VITRULBG_HELP, ///<Set the custom help URL in the virtual background tab page.
SDKCustomizedURL_VITRULBG_LEARN_MORE,///<Set the custom Learn More URL in the virtual background tab page.
SDKCustomizedURL_SUPPORTURL, ///<Set the Support URL in the meeting.
};

public interface class ICustomizedResourceHelperDotNetWrap
{
public:
SDKError AddCustomizedPictureResource(String^ key_, String^ absolute_resource_path);
SDKError AddCustomizedStringResource(SDKCustomizedStringType customizedType, String^ customizedString);
SDKError AddCustomizedURLResource(SDKCustomizedURLType customizedType, String^ customizedUrl);
};

private ref class CCustomizedResourceHelperDotNetWrap sealed: public ICustomizedResourceHelperDotNetWrap
{
// TODO: Add your methods for this class here.
public:
static property CCustomizedResourceHelperDotNetWrap^ Instance
{
CCustomizedResourceHelperDotNetWrap^ get() { return m_Instance; }
}

virtual SDKError AddCustomizedPictureResource(String^ key_, String^ absolute_resource_path);
virtual SDKError AddCustomizedStringResource(SDKCustomizedStringType customizedType, String^ customizedString);
virtual SDKError AddCustomizedURLResource(SDKCustomizedURLType customizedType, String^ customizedUrl);

private:
CCustomizedResourceHelperDotNetWrap();
virtual ~CCustomizedResourceHelperDotNetWrap();
static CCustomizedResourceHelperDotNetWrap^ m_Instance = gcnew CCustomizedResourceHelperDotNetWrap;
};
}
5 changes: 3 additions & 2 deletions zoom_sdk_c_sharp_wrap/wrap/common_include.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "../h/setting_service_interface.h"
#include "../h/premeeting_service_interface.h"
#include "../h/calender_service_interface.h"
#include "../h/customized_resource_helper_interface.h"
#include "../h/meeting_service_components/meeting_annotation_interface.h"
#include "../h/meeting_service_components/meeting_audio_interface.h"
#include "../h/meeting_service_components/meeting_breakout_rooms_interface.h"
Expand All @@ -35,6 +36,7 @@
#include "../h/setting_service_interface.h"
#include "../h/premeeting_service_interface.h"
#include "../h/calender_service_interface.h"
#include "../h/customized_resource_helper_interface.h"
#include "../h/meeting_service_components/meeting_annotation_interface.h"
#include "../h/meeting_service_components/meeting_audio_interface.h"
#include "../h/meeting_service_components/meeting_breakout_rooms_interface.h"
Expand All @@ -60,6 +62,7 @@
#include "../../zoom_sdk/include/setting_service_interface.h"
#include "../../zoom_sdk/include/premeeting_service_interface.h"
#include "../../zoom_sdk/include/calender_service_interface.h"
#include "../../zoom_sdk/include/customized_resource_helper_interface.h"
#include "../../zoom_sdk/include/meeting_service_components/meeting_annotation_interface.h"
#include "../../zoom_sdk/include/meeting_service_components/meeting_audio_interface.h"
#include "../../zoom_sdk/include/meeting_service_components/meeting_breakout_rooms_interface.h"
Expand Down Expand Up @@ -91,7 +94,6 @@ inline void myOutputDebugString(const char* format, ...)
vsnprintf(szData, 2048, format, args);

OutputDebugStringA(szData);
OutputDebugStringA("\n");
va_end(args);
}
inline void myOutputDebugStringW(const wchar_t* format, ...)
Expand All @@ -103,7 +105,6 @@ inline void myOutputDebugStringW(const wchar_t* format, ...)
_vsnwprintf(szData, 2048, format, args);

OutputDebugStringW(szData);
OutputDebugStringA("\n");
va_end(args);
}

Expand Down
69 changes: 69 additions & 0 deletions zoom_sdk_c_sharp_wrap/wrap/customized_resource_helper_wrap.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#pragma once
#include "customized_resource_helper_wrap.h"
BEGIN_ZOOM_SDK_NAMESPACE
SDKError ICustomizedResourceHelperWrap::AddCustomizedPictureResource(const wchar_t* key_, const wchar_t* absolute_resource_path)
{
if (key_ && absolute_resource_path)
{
cache_customized_pic_map.insert(std::make_pair(key_, absolute_resource_path));
}
return SDKERR_SUCCESS;
}
SDKError ICustomizedResourceHelperWrap::AddCustomizedStringResource(SDKCustomizedStringType customizedType, const wchar_t* customizedString)
{
if (customizedString)
{
cache_customized_str_map.insert(std::make_pair(customizedType, customizedString));
}
return SDKERR_SUCCESS;
}

SDKError ICustomizedResourceHelperWrap::AddCustomizedURLResource(SDKCustomizedURLType customizedType, const wchar_t* customizedUrl)
{
if (customizedType)
{
cache_customized_url_map.insert(std::make_pair(customizedType, customizedUrl));
}
return SDKERR_SUCCESS;
}

void ICustomizedResourceHelperWrap::ApplyAll()
{
ZOOM_SDK_NAMESPACE::ICustomizedResourceHelper* pObj(NULL);
CSDKImpl::GetInst().RetrieveCustomizedResourceHelper(&pObj);
if (pObj)
{
{
std::map<std::wstring, std::wstring>::iterator iter_pic = cache_customized_pic_map.begin();
while (cache_customized_pic_map.end() != iter_pic)
{
pObj->AddCustomizedPictureResource(iter_pic->first.c_str(), iter_pic->second.c_str());
++iter_pic;
}
}


{
std::map<SDKCustomizedStringType, std::wstring>::iterator iter_str = cache_customized_str_map.begin();
while (cache_customized_str_map.end() != iter_str)
{
pObj->AddCustomizedStringResource(iter_str->first, iter_str->second.c_str());
++iter_str;
}
}

{
std::map<SDKCustomizedURLType, std::wstring>::iterator iter_url = cache_customized_url_map.begin();
while (cache_customized_url_map.end() != iter_url)
{
pObj->AddCustomizedURLResource(iter_url->first, iter_url->second.c_str());
++iter_url;
}
}

cache_customized_pic_map.clear();
cache_customized_str_map.clear();
cache_customized_url_map.clear();
}
}
END_ZOOM_SDK_NAMESPACE
20 changes: 20 additions & 0 deletions zoom_sdk_c_sharp_wrap/wrap/customized_resource_helper_wrap.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#pragma once
#include "common_include.h"
#include <map>
#include <string>
BEGIN_ZOOM_SDK_NAMESPACE
class ICustomizedResourceHelperWrap : public ICustomizedResourceHelper
{
public:
static ICustomizedResourceHelperWrap& GetInst() { static ICustomizedResourceHelperWrap inst; return inst; };
virtual SDKError AddCustomizedPictureResource(const wchar_t* key_, const wchar_t* absolute_resource_path);
virtual SDKError AddCustomizedStringResource(SDKCustomizedStringType customizedType, const wchar_t* customizedString);
virtual SDKError AddCustomizedURLResource(SDKCustomizedURLType customizedType, const wchar_t* customizedUrl);

void ApplyAll();
private:
std::map<std::wstring, std::wstring> cache_customized_pic_map;
std::map<SDKCustomizedStringType, std::wstring> cache_customized_str_map;
std::map<SDKCustomizedURLType, std::wstring> cache_customized_url_map;
};
END_ZOOM_SDK_NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
#include "meeting_annotation_wrap.h"
#include "../meeting_service_wrap.h"
BEGIN_ZOOM_SDK_NAMESPACE
IAnnotationController* InitIAnnotationControllerFunc(void* nouse, IMeetingServiceWrap* pOwner)
ZOOM_SDK_NAMESPACE::IAnnotationController* InitIAnnotationControllerFunc(IMeetingAnnotationSupportEvent* pEvent, ZOOM_SDK_NAMESPACE::IMeetingServiceWrap* pOwner)
{
if (pOwner && pOwner->GetSDKObj())
{
ZOOM_SDK_NAMESPACE::IAnnotationController* pObj = pOwner->GetSDKObj()->GetAnnotationController();
if (pObj)
{
pObj->SetEvent(pEvent);
}
return pObj;
}

return NULL;
}

void UninitIAnnotationControllerFunc(IAnnotationController* obj)
void UninitIAnnotationControllerFunc(ZOOM_SDK_NAMESPACE::IAnnotationController* obj)
{
if (obj)
{
obj->SetEvent(NULL);
}

}

Expand All @@ -37,5 +45,13 @@ IMPL_FUNC_1(IAnnotationController, Undo, SDKError, SDKViewType, viewtype, SDKERR
IMPL_FUNC_1(IAnnotationController, Redo, SDKError, SDKViewType, viewtype, SDKERR_UNINITIALIZE)
//virtual ICustomizedAnnotationController* GetCustomizedAnnotationController() = 0;
IMPL_FUNC_0(IAnnotationController, GetCustomizedAnnotationController, ICustomizedAnnotationController*, NULL)
//virtual SDKError DisableViewerAnnotation(SDKViewType viewtype, bool bDisable) = 0;
IMPL_FUNC_2(IAnnotationController, DisableViewerAnnotation, SDKError, SDKViewType, viewtype, bool, bDisable, SDKERR_UNINITIALIZE)
//virtual SDKError IsViewerAnnotationDisabled(SDKViewType viewtype, bool& bDisabled) = 0;
IMPL_FUNC_2(IAnnotationController, IsViewerAnnotationDisabled, SDKError, SDKViewType, viewtype, bool&, bDisable, SDKERR_UNINITIALIZE)
//virtual SDKError CanDisableViewerAnnotation(SDKViewType viewtype, bool& bCan) = 0;
IMPL_FUNC_2(IAnnotationController, CanDisableViewerAnnotation, SDKError, SDKViewType, viewtype, bool&, bCan, SDKERR_UNINITIALIZE)
//virtual SDKError CanDoAnnotation(SDKViewType viewtype, bool& bCan) = 0;
IMPL_FUNC_2(IAnnotationController, CanDoAnnotation, SDKError, SDKViewType, viewtype, bool&, bCan, SDKERR_UNINITIALIZE)

END_ZOOM_SDK_NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
#include "../common_include.h"
BEGIN_ZOOM_SDK_NAMESPACE
class IMeetingServiceWrap;
IAnnotationController* InitIAnnotationControllerFunc(void* nouse, IMeetingServiceWrap* pOwner);
IAnnotationController* InitIAnnotationControllerFunc(IMeetingAnnotationSupportEvent* pEvent, IMeetingServiceWrap* pOwner);
void UninitIAnnotationControllerFunc(IAnnotationController* obj);

BEGIN_CLASS_DEFINE(IAnnotationController)
BEGIN_CLASS_DEFINE_WITHCALLBACK(IAnnotationController, IMeetingAnnotationSupportEvent)
NORMAL_CLASS(IAnnotationController)
INIT_UNINIT_WITHEVENT_AND_OWNSERVICE(IAnnotationController, IMeetingServiceWrap)

virtual SDKError SetEvent(IMeetingAnnotationSupportEvent* pEvent)
{
external_cb = pEvent;
return SDKERR_SUCCESS;
}
//virtual bool IsAnnoataionDisable() = 0;
DEFINE_FUNC_0(IsAnnoataionDisable, bool)
//virtual SDKError StartAnnotation(SDKViewType viewtype, int left, int top) = 0;
Expand All @@ -29,7 +34,17 @@ DEFINE_FUNC_1(Undo, SDKError, SDKViewType, viewtype)
DEFINE_FUNC_1(Redo, SDKError, SDKViewType, viewtype)
//virtual ICustomizedAnnotationController* GetCustomizedAnnotationController() = 0;
DEFINE_FUNC_0(GetCustomizedAnnotationController, ICustomizedAnnotationController*)
//virtual SDKError DisableViewerAnnotation(SDKViewType viewtype, bool bDisable) = 0;
DEFINE_FUNC_2(DisableViewerAnnotation, SDKError, SDKViewType, viewtype, bool, bDisable)
//virtual SDKError IsViewerAnnotationDisabled(SDKViewType viewtype, bool& bDisabled) = 0;
DEFINE_FUNC_2(IsViewerAnnotationDisabled, SDKError, SDKViewType, viewtype, bool&, bDisable)
//virtual SDKError CanDisableViewerAnnotation(SDKViewType viewtype, bool& bCan) = 0;
DEFINE_FUNC_2(CanDisableViewerAnnotation, SDKError, SDKViewType, viewtype, bool&, bCan)
//virtual SDKError CanDoAnnotation(SDKViewType viewtype, bool& bCan) = 0;
DEFINE_FUNC_2(CanDoAnnotation, SDKError, SDKViewType, viewtype, bool&, bCan)

//virtual void onSupportAnnotationStatus(unsigned int userid, bool bSupportAnnotation) = 0;
CallBack_FUNC_2(onSupportAnnotationStatus, unsigned int, userid, bool, bSupportAnnotation)

END_CLASS_DEFINE(IAnnotationController)
END_ZOOM_SDK_NAMESPACE
Loading

0 comments on commit 11db240

Please sign in to comment.