From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
index 19f8af4..22d6a8f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
@@ -72,14 +72,6 @@
/// </summary>
private void InitProgressFormBar()
{
- var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
- if (nowForm == null || (nowForm is ViewGroup) == false)
- {
- //杩欑鎯呭喌搴旇涓嶅瓨鍦�
- var alert = new ShowMsgControl(ShowMsgType.Error, "ERROR:Not Found The ActionForm!");
- alert.Show();
- return;
- }
//瀹夊崜鍙互鐐瑰嚮绯荤粺鐨勮繑鍥為敭
this.oldScrollEnabled = UserView.HomePage.Instance.ScrollEnabled;
UserView.HomePage.Instance.ScrollEnabled = false;
@@ -94,7 +86,7 @@
//瀹瑰櫒
bodyFrameLayout = new FrameLayout();
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;
- ((ViewGroup)nowForm).AddChidren(bodyFrameLayout);
+ Common.CommonPage.Instance.AddChidren(bodyFrameLayout);
var frameBack = new FrameLayout();
frameBack.Width = Application.GetRealWidth(674);
@@ -102,7 +94,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Y = Application.GetRealHeight(683);
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//杩涘害鏄剧ず鏂囨湰
@@ -124,7 +116,6 @@
this.btnProgressBar = new FrameLayout();
btnProgressBar.Width = 0;
btnProgressBar.Height = btnProRow.Height;
- btnProgressBar.Radius = btnProRow.Radius;
btnProgressBar.BackgroundColor = 0xfffb744a;
btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;
btnProRow.AddChidren(btnProgressBar);
@@ -139,7 +130,7 @@
var btnProgressPic = new PicViewControl(84, 60);
btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";
frameProgress.AddChidren(btnProgressPic);
- this.btnProgressView = new NormalViewControl(84, 32, true);
+ this.btnProgressView = new NormalViewControl(84, 45, true);
btnProgressView.TextSize = 10;
btnProgressView.TextAlignment = TextAlignment.Center;
btnProgressView.Text = "0%";
--
Gitblit v1.8.0