Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.4.0 electronplusrn #3739

Merged
merged 5 commits into from
Aug 15, 2024
Merged

4.4.0 electronplusrn #3739

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fb9445
temp
Cilla-luodan Aug 14, 2024
908b023
1
Cilla-luodan Aug 14, 2024
5a5db99
1
Cilla-luodan Aug 15, 2024
8fcc891
review comments
Cilla-luodan Aug 15, 2024
cb56800
1
Cilla-luodan Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dita/RTC-NG/API/api_irtcengine_setlocalrendermode2.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@
<p>初始化本地用户视图后，你可以调用该方法更新本地用户视图的渲染和镜像模式。该方法只影响本地用户看到的视频画面，不影响本地视频的发布。</p>
</section>
<section id="timing" deliveryTarget="details">
<title><ph props="native unreal bp electron rn flutter">调用时机</ph></title>
<ul props="native unreal bp electron rn flutter"><li>请在调用 <xref keyref="setupLocalVideo" /> 方法初始化本地视图后，调用该方法。</li>
<title>调用时机</title>
<ul>
<li props="native unreal bp electron unity flutter">请在调用 <xref keyref="setupLocalVideo" /> 方法初始化本地视图后，调用该方法。</li>
<li>你可以在通话中多次调用该方法，多次更新本地用户视图的显示模式。</li></ul>
</section>
<section id="restriction" deliveryTarget="details">
Expand Down
20 changes: 5 additions & 15 deletions dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@
(void)message;
}</codeblock>
<codeblock props="bp" outputclass="language-cpp">DECLARE_DYNAMIC_MULTICAST_DELEGATE_FourParams(FOnExtensionError, FString, provider, FString, extension, int, error, FString, message);</codeblock>
<codeblock props="electron" outputclass="language-typescript">onExtensionError?(
provider: string,
extension: string,
<codeblock props="electron" outputclass="language-typescript">onExtensionErrorWithContext?(
context: ExtensionContext,
error: number,
message: string
): void;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public virtual void OnExtensionErrorWithContext(ExtensionContext context, int error, string message){}</codeblock>
<codeblock props="rn" outputclass="language-typescript">onExtensionError?(
provider: string,
extension: string,
<codeblock props="rn" outputclass="language-typescript">onExtensionErrorWithContext?(
context: ExtensionContext,
error: number,
message: string
): void;</codeblock>
Expand All @@ -48,18 +46,10 @@
<title>参数</title>
<parml>
<plentry id="context">
<pt props="cpp apple">context</pt>
<pt props="cpp apple framework">context</pt>
<pt props="android">extContext</pt>
<pd>插件上下文信息，详见 <xref keyref="ExtensionContext"/>。</pd>
</plentry>
<plentry conkeyref="setExtensionProperty/vendor" props="framework">
<pt />
<pd />
</plentry>
<plentry props="framework">
<pt>extension</pt>
<pd>插件的名称。</pd>
</plentry>
<plentry>
<pt>error</pt>
<pd>错误码。详见插件服务商提供的插件文档。</pd>
Expand Down
19 changes: 4 additions & 15 deletions dita/RTC-NG/API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@
(void)value;
}</codeblock>
<codeblock props="bp" outputclass="language-cpp">DECLARE_DYNAMIC_MULTICAST_DELEGATE_FourParams(FOnExtensionEvent, FString, provider, FString, extension, FString, key, FString, value);</codeblock>
<codeblock props="electron" outputclass="language-typescript"> onExtensionEvent?(
provider: string,
extension: string,
<codeblock props="electron" outputclass="language-typescript">onExtensionEventWithContext?(
context: ExtensionContext,
key: string,
value: string
): void;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){}</codeblock>
<codeblock props="rn" outputclass="language-typescript"> onExtensionEvent?(
provider: string,
extension: string,
<codeblock props="rn" outputclass="language-typescript">onExtensionEventWithContext?(
context: ExtensionContext,
key: string,
value: string
): void;</codeblock>
Expand All @@ -51,15 +49,6 @@
<pt />
<pd />
</plentry>
<plentry conkeyref="setExtensionProperty/vendor" props="framework">
<pt />
<pd />
</plentry>
<plentry id="extension">
<pt props="unreal bp unity electron rn cs">extension</pt>
<pt props="flutter">extName</pt>
<pd>插件名称。</pd>
</plentry>
<plentry conkeyref="setExtensionProperty/key">
<pt />
<pd />
Expand Down
13 changes: 3 additions & 10 deletions dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
(void)context;
}</codeblock>
<codeblock props="bp" outputclass="language-cpp">DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnExtensionStarted, FString, provider, FString, extension);</codeblock>
<codeblock props="electron" outputclass="language-typescript"> onExtensionStarted?(provider: string, extension: string): void;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ }</codeblock>
<codeblock props="rn" outputclass="language-typescript"> onExtensionStarted?(provider: string, extension: string): void;</codeblock>
<codeblock props="electron" outputclass="language-typescript">onExtensionStartedWithContext?(context: ExtensionContext): void;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ }</codeblock>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里多加了一个 unity 的原型

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不该在分支间横跳，然后引入冲突解决的时候引入了冗余的 😭

<codeblock props="rn" outputclass="language-typescript">onExtensionStartedWithContext?(context: ExtensionContext): void;</codeblock>
<codeblock props="flutter" outputclass="language-dart">final void Function(ExtensionContext context)? onExtensionStartedWithContext;</codeblock>
<codeblock props="reserve" outputclass="language-cpp"></codeblock></p>
</section>
Expand All @@ -36,15 +38,6 @@
<pt />
<pd />
</plentry>
<plentry conkeyref="setExtensionProperty/vendor" props="framework">
<pt />
<pd />
</plentry>
<plentry props="framework">
<pt props="unreal bp unity electron rn cs">extension</pt>
<pt props="flutter">extName</pt>
<pd>插件名称。</pd>
</plentry>
</parml> </section>
</refbody>
</reference>
12 changes: 2 additions & 10 deletions dita/RTC-NG/API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
(void)context;
}</codeblock>
<codeblock props="bp" outputclass="language-cpp">DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnExtensionStopped, FString, provider, FString, extension);</codeblock>
<codeblock props="electron" outputclass="language-typescript"> onExtensionStopped?(provider: string, extension: string): void;</codeblock>
<codeblock props="electron" outputclass="language-typescript">onExtensionStoppedWithContext?(context: ExtensionContext): void;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public virtual void OnExtensionStoppedWithContext(ExtensionContext context){ }</codeblock>
<codeblock props="rn" outputclass="language-typescript"> onExtensionStopped?(provider: string, extension: string): void;</codeblock>
<codeblock props="rn" outputclass="language-typescript">onExtensionStoppedWithContext?(context: ExtensionContext): void;</codeblock>
<codeblock props="flutter" outputclass="language-dart">final void Function(ExtensionContext context)? onExtensionStoppedWithContext;</codeblock>
<codeblock props="reserve" outputclass="language-cpp"></codeblock></p>
</section>
Expand All @@ -36,14 +36,6 @@
<pt />
<pd />
</plentry>
<plentry conkeyref="setExtensionProperty/vendor" props="framework">
<pt />
<pd />
</plentry>
<plentry conkeyref="onExtensionEventWithContext/extension" props="framework">
<pt />
<pd />
</plentry>
</parml> </section>
</refbody>
</reference>
Loading
Loading