From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 305 --------------------------------------------------
1 files changed, 0 insertions(+), 305 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 151ee2f..ef20fb3 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -793,311 +793,6 @@
action(curItemKey);
}
};
-
-
-
- return;
-
- // Button lastButton = new Button();
- //Dialog dialog = new Dialog();
- //var pView = new FrameLayout()
- //{
- // BackgroundColor = CSS_Color.DialogTransparentColor1,
- //};
- //dialog.AddChidren(pView);
-
- //var itemCount = items.Count;
- //var optionBaseViewHeight = ((itemCount > 3 ? itemCount : 3) + 1) * Application.GetRealHeight(50);
- //var optionBaseView = new FrameLayout()
- //{
- // //Y = Application.GetRealHeight(439),
- // Y = Application.GetRealHeight(647) - optionBaseViewHeight,
- // Gravity = Gravity.CenterHorizontal,
- // Width = Application.GetRealWidth(343),
- // //Height = Application.GetRealHeight(208),
- // Height = optionBaseViewHeight,
- // //AnimateSpeed = 0.3f,
- // //Animate = Animate.DownToUp,
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- // Radius = (uint)Application.GetRealWidth(12),
- //};
- //pView.AddChidren(optionBaseView);
-
- //var topView = new FrameLayout()
- //{
- // Gravity = Gravity.CenterHorizontal,
- // Width = Application.GetRealWidth(343),
- // Height = Application.GetRealHeight(50),
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- // Radius = (uint)Application.GetRealWidth(12),
- //};
- //optionBaseView.AddChidren(topView);
-
- //var btnTitle = new Button()
- //{
- // Gravity = Gravity.CenterHorizontal,
- // TextAlignment = TextAlignment.Center,
- // Width = Application.GetRealWidth(100),
- // TextID = StringId.SceneDelay,
- // IsBold = true,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- //};
- //topView.AddChidren(btnTitle);
-
- //var btnCancel = new Button()
- //{
- // X = Application.GetRealWidth(21),
- // Width = Application.GetRealWidth(100),
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.PromptingColor1,
- // TextSize = CSS_FontSize.TextFontSize,
- // TextID = StringId.Cancel,
- //};
- //topView.AddChidren(btnCancel);
-
- //var btnConfrim = new Button()
- //{
- // X = Application.GetRealWidth(160),
- // Width = Application.GetRealWidth(160),
- // TextAlignment = TextAlignment.CenterRight,
- // TextColor = CSS_Color.MainColor,
- // TextSize = CSS_FontSize.TextFontSize,
- // TextID = StringId.Confirm,
- //};
- //topView.AddChidren(btnConfrim);
-
- //var itemsView = new VerticalScrolViewLayout()
- //{
- // Y = topView.Bottom,
- // Height = optionBaseViewHeight - Application.GetRealHeight(50),
- // ScrollEnabled = itemCount > 4,
- //};
- //optionBaseView.AddChidren(itemsView);
-
- //bool isFrist = true;
- //Button btnLastSelectedTip = null;
-
- //foreach (var item in items)
- //{
- // if (isFrist)
- // {
- // isFrist = false;
- // }
- // else
- // {
- // itemsView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
- // }
- // var row = new FrameLayout()
- // {
- // Height = Application.GetRealHeight(50),
- // };
- // itemsView.AddChidren(row);
-
- // var btnTipSelected = new Button()
- // {
- // X = Application.GetRealWidth(303),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetRealWidth(28),
- // Height= Application.GetRealWidth(28),
- // UnSelectedImagePath = "Public/ChooseIcon.png",
- // SelectedImagePath = "Public/ChooseOnIcon.png",
- // };
- // row.AddChidren(btnTipSelected);
- // if( item.Key == curItemKey)
- // {
- // btnTipSelected.IsSelected = true;
- // btnLastSelectedTip = btnTipSelected;
- // }
-
-
- // var btnRowTitle = new Button()
- // {
- // X = Application.GetRealWidth(16),
- // Text = item.Value,
- // TextSize = CSS_FontSize.TextFontSize,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextAlignment = TextAlignment.CenterLeft,
- // };
- // row.AddChidren(btnRowTitle);
-
- // btnRowTitle.MouseUpEventHandler = (sender, e) =>
- // {
- // if (btnTipSelected.IsSelected)
- // {
- // curItemKey = "0";
- // btnTipSelected.IsSelected = false;
- // btnLastSelectedTip = null;
- // }
- // else
- // {
- // curItemKey = item.Key;
- // if (btnLastSelectedTip != null)
- // {
- // btnLastSelectedTip.IsSelected = false;
- // }
- // btnTipSelected.IsSelected = true;
- // btnLastSelectedTip = btnTipSelected;
- // }
- // };
-
- //}
-
- //Button btn1 = new Button()
- //{
- // Width = Application.GetRealWidth(128),
- // Height = Application.GetRealWidth(44),
- // TextAlignment = TextAlignment.Center,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // Text = "30s",
- // BorderColor = CSS_Color.PromptingColor1,
- // BorderWidth = 1,
- // Radius = (uint)Application.GetRealWidth(8),
- // SelectedTextColor = CSS_Color.MainBackgroundColor,
- // SelectedBackgroundColor = CSS_Color.MainColor,
- // X = Application.GetRealWidth(20),
- // Y = Application.GetRealHeight(80),
- // IsSelected = curItemKey == "30"
- //};
- //optionBaseView.AddChidren(btn1);
-
-
- //Button btn2 = new Button()
- //{
- // Width = Application.GetRealWidth(128),
- // Height = Application.GetRealWidth(44),
- // TextAlignment = TextAlignment.Center,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // Text = "1min",
- // BorderColor = CSS_Color.PromptingColor1,
- // BorderWidth = 1,
- // Radius = (uint)Application.GetRealWidth(8),
- // SelectedTextColor = CSS_Color.MainBackgroundColor,
- // SelectedBackgroundColor = CSS_Color.MainColor,
- // X = Application.GetRealWidth(195),
- // Y = Application.GetRealHeight(80),
- // IsSelected = curItemKey == "60"
- //};
- //optionBaseView.AddChidren(btn2);
-
-
- //Button btn3 = new Button()
- //{
- // Width = Application.GetRealWidth(128),
- // Height = Application.GetRealWidth(44),
- // TextAlignment = TextAlignment.Center,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // Text = "2min",
- // BorderColor = CSS_Color.PromptingColor1,
- // BorderWidth = 1,
- // Radius = (uint)Application.GetRealWidth(8),
- // SelectedTextColor = CSS_Color.MainBackgroundColor,
- // SelectedBackgroundColor = CSS_Color.MainColor,
- // X = Application.GetRealWidth(20),
- // Y = Application.GetRealHeight(140),
- // IsSelected = curItemKey == "120"
- //};
- //optionBaseView.AddChidren(btn3);
-
-
- //Button btn4 = new Button()
- //{
- // Width = Application.GetRealWidth(128),
- // Height = Application.GetRealWidth(44),
- // TextAlignment = TextAlignment.Center,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // Text = "5min",
- // BorderColor = CSS_Color.PromptingColor1,
- // BorderWidth = 1,
- // Radius = (uint)Application.GetRealWidth(8),
- // SelectedTextColor = CSS_Color.MainBackgroundColor,
- // SelectedBackgroundColor = CSS_Color.MainColor,
- // X = Application.GetRealWidth(195),
- // Y = Application.GetRealHeight(140),
- // IsSelected = curItemKey == "300"
- //};
- //optionBaseView.AddChidren(btn4);
-
-
-
-
- //dialog.Show();
-
- //pView.MouseUpEventHandler = (sender, e) =>
- //{
- // dialog.Close();
- //};
-
- //btnCancel.MouseUpEventHandler = (sender, e) =>
- //{
- // dialog.Close();
- //};
- //btnConfrim.MouseUpEventHandler = (sender, e) =>
- //{
- // action(curItemKey);
- // dialog.Close();
- //};
- //btn1.MouseUpEventHandler = (sender, e) => {
- // btn1.IsSelected = !btn1.IsSelected;
- // btn2.IsSelected = false;
- // btn3.IsSelected = false;
- // btn4.IsSelected = false;
- // if(btn1.IsSelected)
- // {
- // curItemKey = "30";
- // }
- // else
- // {
- // curItemKey = "0";
- // }
- //};
- //btn2.MouseUpEventHandler = (sender, e) => {
- // btn2.IsSelected = !btn2.IsSelected;
- // btn1.IsSelected = false;
- // btn3.IsSelected = false;
- // btn4.IsSelected = false;
- // if (btn2.IsSelected)
- // {
- // curItemKey = "60";
- // }
- // else
- // {
- // curItemKey = "0";
- // }
- //};
- //btn3.MouseUpEventHandler = (sender, e) => {
- // btn3.IsSelected = !btn3.IsSelected;
- // btn2.IsSelected = false;
- // btn1.IsSelected = false;
- // btn4.IsSelected = false;
- // if (btn3.IsSelected)
- // {
- // curItemKey = "120";
- // }
- // else
- // {
- // curItemKey = "0";
- // }
- //};
- //btn4.MouseUpEventHandler = (sender, e) => {
- // btn4.IsSelected = !btn4.IsSelected;
- // btn2.IsSelected = false;
- // btn3.IsSelected = false;
- // btn1.IsSelected = false;
- // if (btn4.IsSelected)
- // {
- // curItemKey = "300";
- // }
- // else
- // {
- // curItemKey = "0";
- // }
- //};
-
}
}
--
Gitblit v1.8.0