From f1532873e3029b2fb17cb84c1b9da1e2f66247c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 02 九月 2021 10:43:38 +0800
Subject: [PATCH] 代码合并

---
 DLL/Shared.IOS.xml |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/DLL/Shared.IOS.xml b/DLL/Shared.IOS.xml
index 7c2ae1b..04be6ae 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婊戝姩鍐茬獊瑙e喅
+            </summary>
+            <param name="point"></param>
+            <param name="uievent"></param>
+            <returns></returns>
+        </member>
         <member name="M:Shared.PageLayout.MyPageLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
             <summary>
             鐐瑰嚮寮�濮�
@@ -1436,6 +1445,16 @@
         <member name="F:Shared.View.MouseUpEventHandler">
             <summary>
             鐐瑰嚮寮硅捣浜嬩欢
+            </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">
@@ -3119,17 +3138,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浠h〃涓嶆寚瀹氫笉鍘嬬缉</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浠h〃涓嶆寚瀹氫笉鍘嬬缉</param>
         </member>
         <member name="T:Shared.GestureLockView">
             <summary>

--
Gitblit v1.8.0