From 1498a62d1d44d715e310b42e3133aa8cdc6eec92 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 14 四月 2021 16:40:20 +0800
Subject: [PATCH] 2021-04-13
---
HDL_ON/UI/MainPage.cs | 94 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 83 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index c5a62b3..c10c1b8 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -20,7 +20,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0401";
+ public static string VersionString = "1.2.0413";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -67,6 +67,14 @@
///// </summary>
//public static int Company = 0;
+ /// <summary>
+ /// 鍙虫粦鍚庨��鎻愮ず鎸夐挳
+ /// </summary>
+ public static Button BtnBackIcon;
+ /// <summary>
+ /// 鍚庨��鍙虫粦浜嗗灏戣窛绂伙紝瓒呰繃涓�瀹氳窛绂绘墠瑙﹀彂鍚庨��浜嬩欢
+ /// </summary>
+ public static int StartX = 0;
/// <summary>
/// 鏄惁鍏ㄩ潰灞忔墜鏈�
/// </summary>
@@ -190,7 +198,7 @@
waitPage.RemoveFromParent();
BaseView.RemoveAll();
BasePageView = new PageLayout();
- BasePageView.ScrollEnabled = true;
+ BasePageView.ScrollEnabled = false;
BasePageView.IsShowPoint = false;
BasePageView.PageChange = (sender, e) =>
{
@@ -212,17 +220,81 @@
// BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
//}
};
- BasePageView.MouseDownEventHandler += (sender, e) =>
- {
- BasePageView.ScrollEnabled = true;
- };
- BasePageView.MouseUpEventHandler += (sender, e) =>
- {
- BasePageView.ScrollEnabled = false;
- };
BaseView.AddChidren(BasePageView);
-
+ var backView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(10),
+ Height = Application.GetRealHeight(440),
+ };
+ BaseView.AddChidren(backView);
+
+ BtnBackIcon = new Button()
+ {
+ X = -Application.GetRealWidth(100),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(88/2),
+ Height = Application.GetRealHeight(56/2),
+ UnSelectedImagePath = "Public/RightSlideBackIcon.png"
+ };
+ BaseView.AddChidren(BtnBackIcon);
+ backView.MouseMoveEventHandler = (sender, e) =>
+ {
+ if (BasePageView.ChildrenCount <= 1)
+ {
+ return;
+ }
+ MainPage.Log($"move:{e.X}");
+ if (StartX == 0 && e.X < 30) {
+ StartX = (int)e.X;
+ }
+ if (StartX < 30 )
+ {
+ if (e.X < Application.GetRealWidth(100))
+ {
+ BtnBackIcon.X = (int)e.X - Application.GetRealWidth(100);
+ }
+ }
+ };
+ backView.MouseDownEventHandler = (sender, e) =>
+ {
+ if (BasePageView.ChildrenCount <= 1)
+ {
+ return;
+ }
+ MainPage.Log($"down:{e.X}");
+ StartX = (int)e.X;
+ BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50);
+ };
+ backView.MouseUpEventHandler = (sender, e) => {
+ MainPage.Log($"up{e.X}");
+ StartX = 0;
+ BtnBackIcon.X = -Application.GetRealWidth(100);
+
+ if (e.X > 70)
+ {
+ if (BasePageView.ChildrenCount > 1)
+ {
+ BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
+ }
+ }
+ };
+ backView.MouseUpOutsideEventHandler=(sender, e) => {
+ MainPage.Log($"up{e.X}");
+ StartX = 0;
+ BtnBackIcon.X = -Application.GetRealWidth(100);
+
+ if (e.X > 70)
+ {
+ if (BasePageView.ChildrenCount > 1)
+ {
+ BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
+ }
+ }
+ };
+
+
//璺宠浆椤甸潰----
var UserBasePage = new UserPage();
BasePageView.AddChidren(UserBasePage);
--
Gitblit v1.8.0