From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs | 69 +++++-----------------------------
1 files changed, 10 insertions(+), 59 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/ProgressFormBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
similarity index 75%
rename from ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/ProgressFormBar.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
index 48b8c2a..6a66df9 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/ProgressFormBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 鐣岄潰绫诲瀷鐨勮繘搴︽潯鎺т欢
@@ -46,10 +46,6 @@
/// </summary>
private NormalViewControl btnText = null;
/// <summary>
- /// 鏍囬鎺т欢
- /// </summary>
- private NormalViewControl btnTitle = null;
- /// <summary>
/// 杩涘害鏉℃帶浠�
/// </summary>
private ProgressRowBar btnProgressBar = null;
@@ -69,15 +65,12 @@
/// <summary>
/// 鍒濆鍖栬繘搴︽潯
/// </summary>
- private void InitProgressFormBar(bool i_hadTitle)
+ private void InitProgressFormBar()
{
- //鎷ユ湁鏍囬鏃�,鎵╁ぇ鐨勯珮搴�
- int titleValue = 40;
-
//瀹夊崜鍙互鐐瑰嚮绯荤粺鐨勮繑鍥為敭
this.oldScrollEnabled = UserView.HomePage.Instance.ScrollEnabled;
UserView.HomePage.Instance.ScrollEnabled = false;
- Common.Config.Instance.BackKeyCanClick = false;
+ Shared.Common.CommonPage.BackKeyCanClick = false;
this.oldPrigressVisible = Common.CommonPage.Loading.Visible;
if (oldPrigressVisible == true)
@@ -91,39 +84,17 @@
Common.CommonPage.Instance.AddChidren(bodyFrameLayout);
var frameBack = new FrameLayout();
- if (i_hadTitle == false)
- {
- frameBack.Y = Application.GetRealHeight(683);
- frameBack.Height = Application.GetRealHeight(386);
- }
- else
- {
- frameBack.Y = Application.GetRealHeight(683 + titleValue / 2);
- frameBack.Height = Application.GetRealHeight(386 + titleValue);
- }
frameBack.Width = Application.GetRealWidth(674);
+ frameBack.Height = Application.GetRealHeight(386);
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
+ frameBack.Y = Application.GetRealHeight(683);
frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//杩涘害鏄剧ず鏂囨湰
- this.btnTitle = new NormalViewControl(frameBack.Width, Application.GetRealHeight(58), false);
- btnTitle.Y = Application.GetRealHeight(40);
- btnTitle.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnTitle.TextAlignment = TextAlignment.Center;
- frameBack.AddChidren(btnTitle);
-
- //杩涘害鏄剧ず鏂囨湰
this.btnText = new NormalViewControl(frameBack.Width, Application.GetRealHeight(58), false);
- if (i_hadTitle == false)
- {
- btnText.Y = Application.GetRealHeight(248);
- }
- else
- {
- btnText.Y = Application.GetRealHeight(248 + titleValue);
- }
+ btnText.Y = Application.GetRealHeight(248);
btnText.TextColor = UserCenterColor.Current.TextGrayColor1;
btnText.TextAlignment = TextAlignment.Center;
frameBack.AddChidren(btnText);
@@ -135,14 +106,7 @@
//杩涘害鏉�
this.btnProgressBar = new ProgressRowBar(559, 29);
btnProgressBar.Gravity = Gravity.CenterHorizontal;
- if (i_hadTitle == false)
- {
- btnProgressBar.Y = Application.GetRealHeight(161);
- }
- else
- {
- btnProgressBar.Y = Application.GetRealHeight(161 + titleValue);
- }
+ btnProgressBar.Y = Application.GetRealHeight(161);
frameBack.AddChidren(btnProgressBar);
btnProgressBar.StartMode1(true);
}
@@ -160,18 +124,6 @@
HdlThreadLogic.Current.RunMain(() =>
{
btnText.Text = msg;
- }, ShowErrorMode.NO);
- }
-
- /// <summary>
- /// 璁剧疆鏍囬淇℃伅
- /// </summary>
- /// <param name="i_title"></param>
- public void SetTitle(string i_title)
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- btnTitle.Text = i_title;
}, ShowErrorMode.NO);
}
@@ -221,15 +173,14 @@
/// <summary>
/// 寮�鍚繘搴︽潯
/// </summary>
- /// <param name="i_hadTitle">鏄惁鎷ユ湁鏍囬</param>
- public void Start(bool i_hadTitle = false)
+ public void Start()
{
if (this.bodyFrameLayout == null)
{
HdlThreadLogic.Current.RunMain(() =>
{
//鍒濆鍖栬繘搴︽潯
- this.InitProgressFormBar(i_hadTitle);
+ this.InitProgressFormBar();
}, ShowErrorMode.NO);
}
}
@@ -250,7 +201,7 @@
//濡傛灉瀹冨師鏉ュ氨鏄笉鍙互婊戝姩鐨勮瘽锛屼笉澶勭悊
UserView.HomePage.Instance.ScrollEnabled = true;
}
- Common.Config.Instance.BackKeyCanClick = true;
+ Shared.Common.CommonPage.BackKeyCanClick = true;
if (this.oldPrigressVisible == true)
{
//濡傛灉鍘熸潵鐨勮繘搴︽潯鏄彲瑙佺殑璇�,杩樺師鍥炲幓
--
Gitblit v1.8.0