From a499dceb02f181e64956431ed0c682dd7d2ce7d7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 04 八月 2020 17:45:20 +0800
Subject: [PATCH] 2020-08-04-1
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 37e63a1..b991266 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -20,6 +20,10 @@
/// </summary>
Button btnFoorDownIcon;
/// <summary>
+ /// 鎴块棿閫夋嫨瑙﹀彂鍖哄煙
+ /// </summary>
+ Button btnRoomClickRow;
+ /// <summary>
/// 浼犳劅鍣ㄥ垪琛ㄥ尯鍩�
/// </summary>
FrameLayout sensorListView;
@@ -200,7 +204,7 @@
Y = Application.GetRealHeight(90),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
+ UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/HumidityIcon.png",
};
topWeatherView.AddChidren(btnHumidityIcon);
@@ -223,7 +227,7 @@
Y = Application.GetRealHeight(90),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
+ UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/Pm25Icon.png",
};
topWeatherView.AddChidren(btnPm25Icon);
@@ -306,6 +310,13 @@
Text = room.name,
};
contentView.AddChidren(btnRoom);
+
+ btnRoomClickRow = new Button()
+ {
+ Height = Application.GetRealHeight(40),
+ };
+ contentView.AddChidren(btnRoomClickRow);
+
#endregion
sensorListView = new FrameLayout()
@@ -368,27 +379,22 @@
}
sensorListView.AddChidren(sensorView);
- var arcBar = new ArcSeekBar()
+ var arcBar = new DiyArcSeekBar()
{
- ProgressBarUnitSring = "掳C",
X = Application.GetRealWidth(7),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth(48),
Height = Application.GetRealWidth(48),
- OpenAngle = 1,
- ThumbColor = 0x00000000,
- ThumbModeFill = true,
+ OpenAngle = 10,
ProgressBarColor = sensor.levelColorList[sensor.curLevel - 1],
- ThumbRadius = 1,
- ArcWidthWithDefaultStyle = Application.GetRealWidth(3),
MinValue = 0,
MaxValue = 96,
Progress = (96 / sensor.levelColorList.Count) * sensor.curLevel,
- //ProgressBarUnitSring = "",
IsClickable = false,
- ProgressTextColor = 0x00000000,
ArcColor = CSS_Color.BackgroundColor,
- //BackgroundColor = 0x33FF0000,
+ ArcWidth = Application.GetRealWidth(4),
+ IsThumbImgBtnShow = false,
+ SeekBarPadding = Application.GetRealWidth(2),
};
sensorView.AddChidren(arcBar);
@@ -485,7 +491,7 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
Animate = Animate.DownToUp,
ScrollEnabled = false,
- //AnimateSpeed = 0.3f,
+ AnimateSpeed = 0.3f,
};
dialogBodyView.AddChidren(infoView);
@@ -682,8 +688,8 @@
dialog.Show();
};
- btnRoom.MouseUpEventHandler = eventHandler;
- btnFoorDownIcon.MouseUpEventHandler = eventHandler;
+ btnRoomClickRow.MouseUpEventHandler = eventHandler;
+ //btnFoorDownIcon.MouseUpEventHandler = eventHandler;
}
--
Gitblit v1.8.0