From 0c6057a603d1ce44ffe7ccbcecc2cf6cae5675f5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 14:19:58 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 148 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 137 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 8ccdfae..a2407f3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -596,6 +596,8 @@
targetView.btnClick.Tag = outputTarget.sid;
///鏉′欢鐘舵�佹暟缁�
List<Dictionary<string, string>> dicList = outputTarget.status as List<Dictionary<string, string>>;
+ //鏄剧ず鐘舵�佸��
+ string stateStr = "";
//鏄剧ず杈撳嚭鏉′欢鍚勭绫诲瀷鐘舵��
switch (outputTarget.target_type)
{
@@ -609,8 +611,7 @@
targetView.btnText.Text = device.name;
//鏀瑰彉璁惧鍚嶇О鏄剧ず鎺т欢瀹藉害
targetView.btnText.Width = Application.GetRealWidth(80);
- //绗竴涓彉閲忔樉绀虹姸鎬佸��
- string stateStr = "";
+
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
@@ -630,7 +631,6 @@
stateStr = Language.StringByID(StringId.offLogic);
}
}
- targetView.btnState.Text = stateStr;
}
break;
case SPK.LightRGB:
@@ -656,7 +656,7 @@
{
stateStr = brightness + "%";
}
- targetView.btnState.Text = stateStr;
+
}
break;
case SPK.CurtainSwitch:
@@ -685,7 +685,6 @@
break;
}
}
- targetView.btnState.Text = stateStr;
}
break;
case SPK.AcStandard:
@@ -777,11 +776,11 @@
}
if (on_off != "" && on_off == "off")
{
- targetView.btnState.Text = Language.StringByID(StringId.offLogic);
+ stateStr = Language.StringByID(StringId.offLogic);
}
else
{
- targetView.btnState.Text = stateStr.TrimEnd(',');
+ stateStr = stateStr.TrimEnd(',');
}
@@ -875,11 +874,11 @@
}
if (on_off != "" && on_off == "off")
{
- targetView.btnState.Text = Language.StringByID(StringId.offLogic);
+ stateStr = Language.StringByID(StringId.offLogic);
}
else
{
- targetView.btnState.Text = stateStr.TrimEnd(',');
+ stateStr = stateStr.TrimEnd(',');
}
}
@@ -894,7 +893,7 @@
targetView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
targetView.btnNextIcon.Visible = false;
//鏄剧ず鍦烘櫙鍚嶇О
- targetView.btnText.Text = scene.name;
+ stateStr = scene.name;
}
break;
case "3":
@@ -903,10 +902,19 @@
foreach (var dic in dicList)
{
string value = dic["value"];
- targetView.btnText.Text = value;
+ stateStr = value;
}
}
break;
+ }
+
+ if (outputTarget.target_type == "1")
+ {
+ targetView.btnState.Text =new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
+ }
+ else
+ {
+ targetView.btnText.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay)+ stateStr;
}
//鍐嶆缂栬緫鏉′欢鐘舵�佺偣鍑讳簨浠�
targetView.btnClick.MouseUpEventHandler += (sen, e) =>
@@ -954,6 +962,25 @@
}
break;
}
+ };
+ //寤舵椂鐐瑰嚮浜嬩欢
+ targetView.btnDelay.MouseUpEventHandler += (sen, e) =>
+ {
+
+ InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
+ inpOrOutLogicMethod.Delayed(thisView, outputTarget, (value) =>
+ {
+ outputTarget.delay = value.ToString();
+ if (outputTarget.target_type == "1")
+ {
+ targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
+ }
+ else
+ {
+ targetView.btnText.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
+ }
+ });
+
};
///鍒犻櫎鎺т欢
targetView.btnDel.MouseUpEventHandler += (sender, e) =>
@@ -1542,5 +1569,104 @@
catch { }
return name;
}
+
+
+ /// <summary>
+ /// 寤舵椂鏃堕棿鏂规硶
+ /// </summary>
+ /// <param name="fLayout">鍦ㄥ摢涓晫闈㈡樉绀�</param>
+ /// <param name="edit">锛坱rue=缂栬緫锛沠alse=鏂板缓锛�</param>
+ /// <param name="index">缂栬緫鏉′欢鐨勭储寮�</param>
+ private void Delayed(FrameLayout thisFLayout, Output output,Action<int>action)
+ {
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ thisFLayout.AddChidren(fLayout);
+ LogicView.TimeView timePointView = new LogicView.TimeView();
+ timePointView.FLayoutView(fLayout);
+ EventHandler<MouseEventArgs> RemovefLayout = (sender, e1) =>
+ {
+ //绉婚櫎fLayout鐣岄潰
+ fLayout.RemoveFromParent();
+ };
+ //鍙栨秷鐐瑰嚮浜嬩欢
+ timePointView.btnCancel.MouseUpEventHandler += RemovefLayout;
+
+ //鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
+ timePointView.mUIPickerView.setNPicker(timePointView.GetmStringList(), timePointView.GetsStringList(), null);
+ //榛樿鍒濆閫変腑鐘舵��
+ timePointView.mUIPickerView.setCurrentItems(0, 5, 0);
+ //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿
+ int timepoint = 5;
+
+ if (output.delay != "0")
+ {
+ int intValue = int.Parse(output.delay);
+ var m = intValue / 60;
+ var s = intValue % 60;
+
+ string timeValue = m.ToString() + ":" + s.ToString();
+ int mIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GetmIntList());
+ int sIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList());
+ //鏇存柊鍒濆鐘舵��
+ timePointView.mUIPickerView.setCurrentItems(mIndex, sIndex, 0);
+ timepoint = intValue;
+ }
+
+
+ //閫変腑鏃堕棿鍥炶皟鏂规硶,鏃堕棿鍙樺寲涓�娆″洖璋冧竴娆�
+ timePointView.mUIPickerView.OnSelectChangeEvent += (index1, index2, index3) =>
+ {
+ string minuet = timePointView.GethStringList0()[index1].Split(' ')[0];
+ string second = timePointView.GetmStringList()[index2].Split(' ')[0];
+ int minuetIntValue = int.Parse(minuet);
+ int secondIntValue = int.Parse(second);
+ timepoint = minuetIntValue*60+secondIntValue;
+ };
+ //纭畾鐐瑰嚮浜嬩欢
+ timePointView.btnConfirm.MouseUpEventHandler += (sender, e3) =>
+ {
+ if (timepoint==0)
+ {
+ //鎻愮ず
+ return;
+ }
+ fLayout.RemoveFromParent();
+ action(timepoint);
+ };
+ }
+ /// <summary>
+ /// 鑾峰彇鏃堕棿鏂囨湰鎻忚堪
+ /// </summary>
+ /// <param name="strTimeValue">鏃堕棿鍊硷紙鍗曚綅s绉掞級</param>
+ /// <returns></returns>
+ private string GetTimeText(string strTimeValue)
+ {
+ var timeValue = int.Parse(strTimeValue);
+ string state = "";
+ var minutes = timeValue / 60;
+ var seconds = timeValue % 60;
+ if (minutes != 0)
+ {
+ if (seconds == 0)
+ {
+ state = minutes.ToString() + Language.StringByID(StringId.minute);
+ }
+ else
+ {
+ state = minutes.ToString() + Language.StringByID(StringId.minute) + seconds.ToString() + Language.StringByID(StringId.s);
+ }
+ }
+ else
+ {
+ if (seconds != 0)
+ {
+ state = seconds.ToString() + Language.StringByID(StringId.s);
+ }
+ }
+ return state;
+ }
}
}
--
Gitblit v1.8.0