From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone
---
DLL/Shared.IOS.xml | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/DLL/Shared.IOS.xml b/DLL/Shared.IOS.xml
index 7c2ae1b..76c018c 100644
--- a/DLL/Shared.IOS.xml
+++ b/DLL/Shared.IOS.xml
@@ -965,6 +965,15 @@
鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
</summary>
</member>
+ <member name="M:Shared.PageLayout.MyPageLayout.HitTest(CoreGraphics.CGPoint,UIKit.UIEvent)">
+ <summary>
+ 2021-04-21
+ UIScrollView鍜孶IControl婊戝姩鍐茬獊瑙ｅ喅
+ </summary>
+ <param name="point"></param>
+ <param name="uievent"></param>
+ <returns></returns>
+ </member>
<member name="M:Shared.PageLayout.MyPageLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
<summary>
鐐瑰嚮寮�濮�
@@ -1438,6 +1447,16 @@
鐐瑰嚮寮硅捣浜嬩欢
</summary>
</member>
+ <member name="F:Shared.View.MouseUpOutsideEventHandler">
+ <summary>
+ 鐐瑰嚮寮硅捣浜嬩欢 UpOutside
+ </summary>
+ </member>
+ <member name="F:Shared.View.MouseLongEventHandler">
+ <summary>
+ 闀挎寜鐐瑰嚮浜嬩欢
+ </summary>
+ </member>
<member name="F:Shared.View.SizeChangeEventHandler">
<summary>
澶у皬鍙樺寲浜嬩欢
@@ -1700,6 +1719,12 @@
<summary>
鍔犺浇鏈湴HTML
</summary>
+ </member>
+ <member name="M:Shared.WebView.LoadHTMLString(System.String)">
+ <summary>
+ 鍔犺浇Html鏍囩鐨勫瘜鏂囨湰
+ </summary>
+ <param name="htmlStr"></param>
</member>
<member name="T:Shared.WebView.OnWKNavigationDelegate">
<summary>
@@ -3119,17 +3144,23 @@
</member>
<member name="M:Shared.CropImage.TakePicture(System.Action{System.String},System.String,System.Int32,System.Int32,System.Int32)">
<summary>
- 鎷嶇収
+ 鎷嶇収瑁佸浘鐗�
</summary>
- <param name="callback">鍥炶皟鍑芥暟</param>
- <param name="fileName">鏂囦欢鍚�</param>
+ <param name="callback">鍥炶皟鍥剧墖璺緞</param>
+ <param name="fileName">鎸囧畾鍥剧墖鏂囦欢鍚�</param>
+ <param name="mRATIO_X">瀹介珮姣旓細瀹�</param>
+ <param name="mRATIO_Y">瀹介珮姣旓細瀹介珮</param>
+ <param name="OutputYSize">鎸囧畾鍒嗚鲸鐜囬珮鐨勫�硷紝0浠ｈ〃涓嶆寚瀹氫笉鍘嬬缉</param>
</member>
<member name="M:Shared.CropImage.SelectPicture(System.Action{System.String},System.String,System.Int32,System.Int32,System.Int32)">
<summary>
閫夋嫨鍥剧墖
</summary>
- <param name="callback">鍥炶皟鍑芥暟</param>
- <param name="fileName">鏂囦欢鍚�</param>
+ <param name="callback">鍥炶皟鍥剧墖璺緞</param>
+ <param name="fileName">鎸囧畾鍥剧墖鏂囦欢鍚�</param>
+ <param name="mRATIO_X">瀹介珮姣旓細瀹�</param>
+ <param name="mRATIO_Y">瀹介珮姣旓細瀹介珮</param>
+ <param name="OutputYSize">鎸囧畾鍒嗚鲸鐜囬珮鐨勫�硷紝0浠ｈ〃涓嶆寚瀹氫笉鍘嬬缉</param>
</member>
<member name="T:Shared.GestureLockView">
<summary>
--
Gitblit v1.8.0