From cd70a2a8a2bdebf51259d8f39ed110a34b9be9e5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 14:50:21 +0800
Subject: [PATCH] 修改启动屏幕
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs | 189 +++++++++++++++--------------------------------
1 files changed, 60 insertions(+), 129 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index 31e0814..bc53c1a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -16,6 +16,11 @@
Button btnAddMember;
Button btnScan;
EditText etMemberAccount;
+ EditText etMemberName;
+ /// <summary>
+ /// 浜鸿劯鐓х墖鏁版嵁
+ /// </summary>
+ string base64string;
Action backAction;
@@ -31,7 +36,6 @@
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember)).LoadTopView();
-
if (Entity.DB_ResidenceData.Instance.SupportFacePass)
{
var btnMemberName = new Button()
@@ -46,7 +50,7 @@
};
bodyView.AddChidren(btnMemberName);
- var etMemberName = new EditText()
+ etMemberName = new EditText()
{
Y = btnMemberName.Bottom,
X = Application.GetRealWidth(16),
@@ -120,8 +124,6 @@
};
bodyView.AddChidren(btnMemberFaceTitle);
-
-
var btnAddFace = new Button()
{
Gravity = Gravity.CenterHorizontal,
@@ -141,11 +143,12 @@
EventHandler<MouseEventArgs> eFaceHandler = (sender, e) =>
{
+ Application.HideSoftInput();
if (OnAppConfig.Instance.FaceManagementTip)
{
OnAppConfig.Instance.FaceManagementTip = true;
OnAppConfig.Instance.SaveConfig();
- LoadPictureOptionView();
+ LoadPictureOptionView(btnAddFace);
return;
}
@@ -166,7 +169,7 @@
};
dialog.AddChidren(contentView);
- Button btnTitle = new Button()
+ Button btnTitle2 = new Button()
{
Y = Application.GetRealHeight(16),
Height = Application.GetRealHeight(30),
@@ -176,13 +179,13 @@
IsBold = true,
TextID = StringId.FaceProtocolPrompt,
};
- contentView.AddChidren(btnTitle);
+ contentView.AddChidren(btnTitle2);
Button btnMsg = new Button()
{
Gravity = Gravity.CenterHorizontal,
Height = Application.GetRealHeight(35),
- Y = btnTitle.Bottom,
+ Y = btnTitle2.Bottom,
Width = Application.GetRealHeight(200),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
@@ -190,6 +193,10 @@
Text = " 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�",
IsMoreLines = true,
};
+ if(Language.CurrentLanguage != "Chinese")
+ {
+ btnMsg.Text = " In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully";
+ }
contentView.AddChidren(btnMsg);
Button btnMsg1 = new Button()
@@ -204,6 +211,11 @@
Text = " 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�",
IsMoreLines = true,
};
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnMsg1.Text = " 'On Pro Face Information Collection Protocol'";
+ }
+
contentView.AddChidren(btnMsg1);
Button btnMsg2 = new Button()
@@ -218,20 +230,24 @@
Text = " 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙ｅ苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�",
IsMoreLines = true,
};
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnMsg2.Text = " If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.";
+ }
contentView.AddChidren(btnMsg2);
- Button btnLine = new Button()
+ Button btnLine2 = new Button()
{
Y = Application.GetRealHeight(149),
Height = Application.GetRealHeight(1),
Width = Application.GetRealWidth(270 / 2),
BackgroundColor = CSS.CSS_Color.DividingLineColor,
};
- contentView.AddChidren(btnLine);
+ contentView.AddChidren(btnLine2);
Button btnCancel = new Button()
{
- Y = btnLine.Bottom,
+ Y = btnLine2.Bottom,
Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(43),
TextAlignment = TextAlignment.Center,
@@ -246,7 +262,7 @@
Button btnConfirm = new Button()
{
X = btnCancel.Right,
- Y = btnLine.Y,
+ Y = btnLine2.Y,
Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
@@ -262,11 +278,11 @@
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
dialog.Show();
- btnCancel.MouseUpEventHandler += (sender, e) =>
+ btnCancel.MouseUpEventHandler += (sender2, e2) =>
{
dialog.Close();
};
- btnMsg1.MouseUpEventHandler += (sender, e) =>
+ btnMsg1.MouseUpEventHandler += (sender2, e2) =>
{
string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html";
if (Language.CurrentLanguage != "Chinese")
@@ -277,11 +293,11 @@
dialog.Close();
};
- btnConfirm.MouseUpEventHandler = (sender, e) => {
+ btnConfirm.MouseUpEventHandler = (sender2, e2) => {
dialog.Close();
OnAppConfig.Instance.FaceManagementTip = true;
OnAppConfig.Instance.SaveConfig();
- LoadPictureOptionView();
+ LoadPictureOptionView(btnAddFace);
};
};
@@ -303,7 +319,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
IsBold = true,
TextAlignment = TextAlignment.Center,
- TextID = StringId.ConfirmInvitation,
+ TextID = StringId.Confirm,
};
bodyView.AddChidren(btnAddMember);
@@ -321,7 +337,7 @@
}
else
{
- var btnTitle = new Button()
+ var btnTitle2 = new Button()
{
Y = Application.GetRealHeight(70),
X = Application.GetRealWidth(16),
@@ -331,11 +347,11 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.NewMemberAccount,
};
- bodyView.AddChidren(btnTitle);
+ bodyView.AddChidren(btnTitle2);
etMemberAccount = new EditText()
{
- Y = btnTitle.Bottom,
+ Y = btnTitle2.Bottom,
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(356),
Height = Application.GetRealHeight(40),
@@ -371,7 +387,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
IsBold = true,
TextAlignment = TextAlignment.Center,
- TextID = StringId.ConfirmInvitation,
+ TextID = StringId.Confirm,
};
bodyView.AddChidren(btnAddMember);
@@ -435,7 +451,7 @@
/// <summary>
/// 鍔犺浇鍥炬爣閫夋嫨閫夐」
/// </summary>
- void LoadPictureOptionView()
+ void LoadPictureOptionView(Button btnAddFace)
{
var pView = new FrameLayout()
{
@@ -527,8 +543,14 @@
var imageName = Guid.NewGuid().ToString();
CropImage.TakePicture((imagePath) =>
{
- CropImageCallBack(imagePath, 1, imageName);
- }, imageName, 4, 6, imageHeight);
+ if (imagePath != null)
+ {
+ var imageBytes = getFaceImageBytes(imagePath);
+ btnAddFace.ImageBytes = imageBytes;
+ base64string = Convert.ToBase64String(imageBytes);
+ }
+
+ }, imageName, 6, 6, imageHeight);
pictureOptionView.Parent.RemoveFromParent();
};
@@ -545,120 +567,29 @@
//var imageName = scene.sid;
CropImage.SelectPicture((imagePath) =>
{
- CropImageCallBack(imagePath, 2, imageName);
- }, imageName, 4, 6, imageHeight);
+ if (imagePath != null)
+ {
+ var imageBytes = getFaceImageBytes(imagePath);
+ btnAddFace.ImageBytes = imageBytes;
+ base64string = Convert.ToBase64String(imageBytes);
+ }
+ }, imageName, 6, 6, imageHeight);
pictureOptionView.Parent.RemoveFromParent();
};
}
-
/// <summary>
- /// 瑁佸壀瀹岀収鐗囧洖璋冿紝缁熶竴澶勭悊
+ /// 鑾峰彇鏈湴閫夊彇鐨勪汉鑴告暟鎹�
/// </summary>
- /// <param name="imagePath">瑁佸壀鍚庣殑鐪熷疄璺緞</param>
- /// <param name="imageSource">鐓х墖鏉ユ簮锛�1锛氭媿鐓э紱2锛氬浘搴�</param>
- void CropImageCallBack(string selectImagePath, int imageSource, string imageName)
+ /// <param name="selectImagePath"></param>
+ /// <returns></returns>
+ byte[] getFaceImageBytes(string selectImagePath)
{
- if (string.IsNullOrEmpty(selectImagePath) == true)
- {
- return;
- }
- //涓婁紶鎴愬姛鍒板洖璋�
- Action<bool> uploadSuccessAction = (isSuccess) =>
- {
- //鐐瑰嚮閲嶆柊褰曞叆浜嬩欢
- Action action = () =>
- {
- if (!isSuccess)
- {
- if (imageSource == 1)
- {
- CropImage.TakePicture((imagePath) =>
- {
- CropImageCallBack(imagePath, 2, imageName);
- }, imageName, 4, 6, imageHeight);
- }
- else
- {
- CropImage.SelectPicture((imagePath) =>
- {
- CropImageCallBack(imagePath, 1, imageName);
- }, imageName, 4, 6, imageHeight);
- }
- }
- };
-
- if (isSuccess)
- {
- //ReadFaceInfo(false);
- }
-
- Application.RunOnMainThread(() =>
- {
- var page = new FaceSettingResultPage(action);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage(isSuccess);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- };
- //涓婁紶鍥剧墖鍒颁簯绔�
- UploadImage(selectImagePath, uploadSuccessAction);
- }
-
- /// <summary>
- /// 涓婁紶鍥剧墖鏂规硶
- /// </summary>
- /// <param name="selectImagePath">瑁佸壀鍚庣殑鍥剧墖璺緞</param>
- /// <param name="imageView"></param>
- /// <param name="uploadResultAction"></param>
- void UploadImage(string selectImagePath, Action<bool> uploadResultAction)
- {
- try
- {
- //1.璇诲彇瑁佸壀鍚庣殑鍥剧墖锛岀劧鍚庡垹闄�
- var imageBytes = Shared.IO.FileUtils.ReadFile(selectImagePath);
- System.IO.File.Delete(selectImagePath);
-
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
- //寮�濮嬩笂浼�
- new Thread(() =>
- {
- try
- {
- string base64string = Convert.ToBase64String(imageBytes);
- //Utlis.WriteLine("涓婁紶鍥剧墖Length:" + imageBytes.Length + " base64锛�" + base64string);
- var pack = new HttpServerRequest().FaceSetting(base64string);
- if (pack != null)
- {
- Utlis.WriteLine("涓婁紶缁撴灉锛�" + pack.message);
- uploadResultAction?.Invoke(pack.Code == StateCode.SUCCESS);
- }
- }
- catch (Exception ex)
- {
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- if (waitPage != null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
- });
- }
- })
- { IsBackground = true }.Start();
- }
- catch (Exception ex)
- {
- MainPage.Log(ex.Message);
- }
+ var imageBytes = Shared.IO.FileUtils.ReadFile(selectImagePath);
+ System.IO.File.Delete(selectImagePath);
+ return imageBytes;
}
}
--
Gitblit v1.8.0