From cb7fd6a89ad9fcd9cf575025ab43873f17bf17c8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 16:46:59 +0800
Subject: [PATCH] 2020-12-31-1
---
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 8e854f7..f3678c3 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -19,9 +19,6 @@
public void Show(CommonDevice common, bool edit,string str_if,Dictionary<string, object> editdeviceActionInfo = null)
{
#region 甯冨眬鐣岄潰
- actionsInfo = editdeviceActionInfo;
-
-
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
TopView view = new TopView();
this.AddChidren(view.TopRowView());
@@ -90,7 +87,7 @@
//淇濆瓨鐐瑰嚮浜嬩欢
saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
- if (selectedDeviceStatus != "" && actionsInfo != null)
+ if (TaskList.Count!=0)
{
LogicIfon.AddDeviceActions(common, actionsInfo);
}
@@ -98,7 +95,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -194,12 +191,9 @@
actionsInfo.Add("DeviceAddr", common.DeviceAddr);
actionsInfo.Add("Epoint", common.DeviceEpoint);
actionsInfo.Add("Time", 0);
+ actionsInfo.Add("TaskList", TaskList);
}
- if (actionsInfo.ContainsKey("TaskList"))
- {
- actionsInfo.Remove("TaskList");
- }
- actionsInfo.Add("TaskList", TaskList);
+
}
public void CurrentDeviceView(string if_str, CommonDevice common, bool edit, Button button)
{
@@ -334,23 +328,23 @@
{
Y = Application.GetRealHeight(140 + 160),
X = Application.GetRealWidth(78),
- Height = Application.GetRealHeight(12),
+ Height = Application.GetRealWidth(12),
Width = Application.GetRealWidth(918 - 120),
UnSelectedImagePath = "ZigeeLogic/seek.png",
Gravity = Gravity.CenterHorizontal
};
- completeView.Show(2).AddChidren(seekIconBtn);
-
- var horizontalSeekBarVol = new UserCenter.SeekBarControl(918)
- {
- ProgressBarColor = 0x00000000,// ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
- SeekBarBackgroundColor = 0x00000000,
- SeekBarViewHeight = Application.GetRealHeight(20),
- SeekBarPadding = Application.GetRealWidth(60),
- MinValue = 30,
- MaxValue = 60,
- ProgressChangeDelayTime = 0,
- };
+ completeView.Show(2).AddChidren(seekIconBtn);
+
+ var horizontalSeekBarVol = new UserCenter.SeekBarControl(918)
+ {
+ ProgressBarColor = 0x00000000,// ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
+ SeekBarBackgroundColor = 0x00000000,
+ SeekBarViewHeight = Application.GetRealHeight(20),
+ SeekBarPadding = Application.GetRealWidth(60),
+ MinValue = 30,
+ MaxValue = 60,
+ ProgressChangeDelayTime = 0,
+ };
completeView.Show(2).AddChidren(horizontalSeekBarVol);
horizontalSeekBarVol.Y = seekIconBtn.Y - (horizontalSeekBarVol.Height - seekIconBtn.Height) / 2;
horizontalSeekBarVol.ShowCustomTextView(Application.GetRealWidth(200), 12, ZigbeeColor.Current.LogicBtnCancelColor);
@@ -373,15 +367,15 @@
{
var intvalue = int.Parse(value["Data1"]);
var lightbrightnessvalue = 1000000 / (intvalue * 100);
- horizontalSeekBarVol.Progress = lightbrightnessvalue;
+ horizontalSeekBarVol.Progress = lightbrightnessvalue;
break;
}
}
- }
- var intValue = horizontalSeekBarVol.Progress;
- if (intValue == 0) { intValue = 30; }
+ }
+ var intValue = horizontalSeekBarVol.Progress;
+ if (intValue == 0) { intValue = 30; }
horizontalSeekBarVol.SetCustomText(intValue * 100 + "K");
}
break;
@@ -462,7 +456,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0