From f1532873e3029b2fb17cb84c1b9da1e2f66247c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 02 九月 2021 10:43:38 +0800
Subject: [PATCH] 代码合并
---
HDL-ON_Android/HDL-ON_Android.csproj | 1
HDL-ON_Android/LeChengVideoActivity.cs | 15 +++++++
DLL/Shared.IOS.dll | 0
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs | 23 ++++++++---
HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs | 2 +
DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll | 0
HDL-ON_Android/Other/HDLONUtils.cs | 35 +++++++++++++++++
DLL/Shared.Droid.HDLWidget.dll | 0
DLL/Shared.IOS.TBL.dll | 0
DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll | 0
HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs | 2 +
DLL/Shared.IOS.xml | 35 +++++++++++++++--
12 files changed, 102 insertions(+), 11 deletions(-)
diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
index 3e29d06..38d92a5 100644
--- a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
+++ b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
Binary files differ
diff --git a/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll b/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
index 9e6c7d7..72bcc7c 100644
--- a/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
+++ b/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
Binary files differ
diff --git a/DLL/Shared.Droid.HDLWidget.dll b/DLL/Shared.Droid.HDLWidget.dll
index 95222a6..032a0df 100644
--- a/DLL/Shared.Droid.HDLWidget.dll
+++ b/DLL/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/DLL/Shared.IOS.TBL.dll b/DLL/Shared.IOS.TBL.dll
index 8816611..b91fe54 100644
--- a/DLL/Shared.IOS.TBL.dll
+++ b/DLL/Shared.IOS.TBL.dll
Binary files differ
diff --git a/DLL/Shared.IOS.dll b/DLL/Shared.IOS.dll
index afd5bd6..36127be 100644
--- a/DLL/Shared.IOS.dll
+++ b/DLL/Shared.IOS.dll
Binary files differ
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婊戝姩鍐茬獊瑙ｅ喅
+ </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浠ｈ〃涓嶆寚瀹氫笉鍘嬬缉</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>
diff --git a/HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs b/HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs
index d93069d..ca7ce90 100644
--- a/HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs
+++ b/HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs
@@ -148,6 +148,8 @@
string ss = Android.OS.Environment.ExternalStorageDirectory.Path + "/DCIM/Camera";
string path = ss + "/" + time + ".jpg";
mPhone.Snap(path);
+ //2021-09-01 澧炲姞鍙戦�佸箍鎾紝閫氱煡鍒锋柊鍥惧簱鐨勬樉绀�
+ HDLONUtils.SendBroadcastScanFile(this.Context, path);
}
}
}
diff --git a/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs b/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
index 7585efa..90ab019 100644
--- a/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
+++ b/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
@@ -307,6 +307,8 @@
string ss = Android.OS.Environment.ExternalStorageDirectory.Path + "/DCIM/Camera";
string path = ss + "/" + time + ".jpg";
mPhone.Snap(path);
+ //2021-09-01 澧炲姞鍙戦�佸箍鎾紝閫氱煡鍒锋柊鍥惧簱鐨勬樉绀�
+ HDLONUtils.SendBroadcastScanFile(this.Context, path);
}
}
else if (v.Equals(unlockImg))
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index f952702..4df5f13 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -180,6 +180,7 @@
<Compile Include="LeChengVideo\Form\MonitorFragment.cs" />
<Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" />
<Compile Include="LeChengVideoActivity.cs" />
+ <Compile Include="Other\HDLONUtils.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
diff --git a/HDL-ON_Android/LeChengVideoActivity.cs b/HDL-ON_Android/LeChengVideoActivity.cs
index 7cff4e5..0f426d0 100644
--- a/HDL-ON_Android/LeChengVideoActivity.cs
+++ b/HDL-ON_Android/LeChengVideoActivity.cs
@@ -210,6 +210,18 @@
}
}
+ ///// <summary>
+ ///// 鍙戦�佸箍鎾紝閫氱煡鍒锋柊鍥惧簱鐨勬樉绀�
+ ///// </summary>
+ ///// <param name="path"></param>
+ //void SendBroadcastScanFile(Context context, string path)
+ //{
+ // // 鍙戦�佸箍鎾紝閫氱煡鍒锋柊鍥惧簱鐨勬樉绀�
+ // Intent scanIntent = new Intent(Intent.ActionMediaScannerScanFile);
+ // scanIntent.SetData(Android.Net.Uri.FromFile(new File(path)));
+ // context.SendBroadcast(scanIntent);
+ //}
+
/// <summary>
/// 鎴浘
/// </summary>
@@ -221,6 +233,9 @@
int code = mPlayWindow.SnapShot(path);
if (code == 0)
{
+ //2021-09-01 澧炲姞鍙戦�佸箍鎾紝閫氱煡鍒锋柊鍥惧簱鐨勬樉绀�
+ HDLONUtils.SendBroadcastScanFile(this, path);
+
//Android.Provider.MediaStore.Images.Media.InsertImage(this.getContentResolver(), path, "ss", "ss");
Toast.MakeText(this, Resources.GetString(Resource.String.screenshot_success), ToastLength.Short).Show();
}
diff --git a/HDL-ON_Android/Other/HDLONUtils.cs b/HDL-ON_Android/Other/HDLONUtils.cs
new file mode 100644
index 0000000..d651bc7
--- /dev/null
+++ b/HDL-ON_Android/Other/HDLONUtils.cs
@@ -0,0 +1,35 @@
+锘縰sing System;
+using Android.Content;
+using Java.IO;
+
+namespace HDL_ON_Android
+{
+ /// <summary>
+ /// 甯哥敤鏂规硶宸ュ叿绫�
+ /// </summary>
+ public class HDLONUtils
+ {
+ public HDLONUtils()
+ {
+ }
+
+ /// <summary>
+ /// 鍙戦�佸箍鎾紝閫氱煡鍒锋柊鍥惧簱鐨勬樉绀�
+ /// </summary>
+ /// <param name="path"></param>
+ public static void SendBroadcastScanFile(Context context, string path)
+ {
+ try
+ {
+ // 鍙戦�佸箍鎾紝閫氱煡鍒锋柊鍥惧簱鐨勬樉绀�
+ Intent scanIntent = new Intent(Intent.ActionMediaScannerScanFile);
+ scanIntent.SetData(Android.Net.Uri.FromFile(new File(path)));
+ context.SendBroadcast(scanIntent);
+ }
+ catch
+ {
+ System.Console.WriteLine("鍙戦�佸箍鎾埛鏂板浘搴� catch");
+ }
+ }
+ }
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
index 2d86ddd..e5d1b40 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
@@ -41,6 +41,16 @@
Button btnCancel;
#endregion
+ /// <summary>
+ /// imageHeight
+ /// OutputYSize 400浠ｈ〃Y鍒嗚鲸鐜囬珮鐨勫�硷紝鎵�浠ユ渶缁堝緱鍒板浘鐗囩殑鍒嗚鲸鐜囦负锛�266*400
+ /// 0浠ｈ〃涓嶆寚瀹氫笉鍘嬬缉,鐩存帴淇濆瓨瑁佸壀鍚庣殑鍥剧墖锛岀洰鍓嶅彧瀵筰OS鏈夋晥 Android璁剧疆灏忎簬0鐨勮瘽榛樿800
+ /// </summary>
+#if __IOS__
+ const int imageHeight = 0;
+#else
+ const int imageHeight = 400;
+#endif
@@ -98,7 +108,7 @@
topView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor, Y = Application.GetRealHeight(188), X = Application.GetRealWidth(16), Width = Application.GetRealWidth(359) });
- #region 绀惧尯闂ㄧ閫氳
+#region 绀惧尯闂ㄧ閫氳
var communityRow = new FrameLayout()
{
Y = topView.Bottom,
@@ -147,7 +157,7 @@
editFaceInfo(switchStatus, action);
};
- #endregion
+#endregion
var btnTip = new Button()
@@ -435,7 +445,7 @@
CropImage.TakePicture((imagePath) =>
{
CropImageCallBack(imagePath, 1, imageName);
- }, imageName, 4, 6, 400);
+ }, imageName, 4, 6, imageHeight);
pictureOptionView.Parent.RemoveFromParent();
};
@@ -453,7 +463,7 @@
CropImage.SelectPicture((imagePath) =>
{
CropImageCallBack(imagePath, 2, imageName);
- }, imageName, 4, 6, 400);//OutputYSize鐩墠浠呭Android鏈変簺 400浠ｈ〃Y鐨勬渶澶氬垎杈ㄧ巼锛屾墍浠ユ渶缁堝緱鍒板浘鐗囩殑鍒嗚鲸鐜囦负锛�266*400
+ }, imageName, 4, 6, imageHeight);
pictureOptionView.Parent.RemoveFromParent();
};
@@ -485,14 +495,14 @@
CropImage.TakePicture((imagePath) =>
{
CropImageCallBack(imagePath, 2, imageName);
- }, imageName, 4, 6, 400);
+ }, imageName, 4, 6, imageHeight);
}
else
{
CropImage.SelectPicture((imagePath) =>
{
CropImageCallBack(imagePath, 1, imageName);
- }, imageName, 4, 6, 400);
+ }, imageName, 4, 6, imageHeight);
}
}
};
@@ -537,6 +547,7 @@
try
{
string base64string = Convert.ToBase64String(imageBytes);
+ //Utlis.WriteLine("涓婁紶鍥剧墖Length:" + imageBytes.Length + " base64锛�" + base64string);
var pack = new HttpServerRequest().FaceSetting(base64string);
if (pack != null)
{
--
Gitblit v1.8.0