From 50ad482974a7e838d11360a84e9e8ff3f7974ab2 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 12 十月 2024 09:34:01 +0800
Subject: [PATCH] 金茂问题修复
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 2181e67..9147b14 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -92,11 +92,12 @@
//鏃ュ嚭/鏃ヨ惤/姝ｅ崍鐐瑰嚮浜嬩欢
timeSpecialView.btnClick.MouseUpEventHandler += (sen, e) =>
{
- if (string.IsNullOrEmpty( Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress))//.longitude == 0 && Entity.DB_ResidenceData.Instance.CurrentRegion.latitude == 0)
- {
- new PublicAssmebly().TipMsg(StringId.tip, StringId.GatewayLocationInformationIsNotConfigured);
- return;
- }
+
+ //if (string.IsNullOrEmpty( Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress))//.longitude == 0 && Entity.DB_ResidenceData.Instance.CurrentRegion.latitude == 0)
+ //{
+ // new PublicAssmebly().TipMsg(StringId.tip, StringId.GatewayLocationInformationIsNotConfigured);
+ // return;
+ //}
SpeciaTime speciaTime = new SpeciaTime();
MainPage.BasePageView.AddChidren(speciaTime);
speciaTime.Show();
@@ -134,13 +135,13 @@
timePointView.FLayoutView(fLayout);
timePointView.TimePoint(fLayout, editTime, (timeValue)=>{
Input inputTime = new Input();
- inputTime.sid = LogicMethod.CurrLogicMethod.NewSid();
+ inputTime.sid = LogicMethod.Current.NewSid();
inputTime.condition_type = "1";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.CurrLogicMethod.dictionary(dic, "key", "timepoint");
- LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.CurrLogicMethod.dictionary(dic, "value", timeValue);
+ LogicMethod.Current.dictionary(dic, "key", "timepoint");
+ LogicMethod.Current.dictionary(dic, "comparator", "=");
+ LogicMethod.Current.dictionary(dic, "data_type", "string");
+ LogicMethod.Current.dictionary(dic, "value", timeValue);
inputTime.condition.Add(dic);
AddCondition(inputTime, edit, index);
});
@@ -249,21 +250,21 @@
new LogicView.TipPopView().TipBox(StringId.tip, StringId.unlikeTime);
return;
}
- if (int.Parse(btnStartTimeText.Tag.ToString()) > int.Parse(btnEndTimeText.Tag.ToString()))
- {
- //鎻愮ず锛氬紑濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
- new LogicView.TipPopView().TipBox(StringId.tip, StringId.startTimeLessThanEndTime);
- return;
- }
+ //if (int.Parse(btnStartTimeText.Tag.ToString()) > int.Parse(btnEndTimeText.Tag.ToString()))
+ //{
+ // //鎻愮ず锛氬紑濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
+ // new LogicView.TipPopView().TipBox(StringId.tip, StringId.startTimeLessThanEndTime);
+ // return;
+ //}
Input inputTime = new Input();
- inputTime.sid = LogicMethod.CurrLogicMethod.NewSid();
+ inputTime.sid = LogicMethod.Current.NewSid();
inputTime.condition_type = "2";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.CurrLogicMethod.dictionary(dic, "key", "timesection");
- LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.CurrLogicMethod.dictionary(dic, "value", btnStartTimeText.Text + "-" + btnEndTimeText.Text);
+ LogicMethod.Current.dictionary(dic, "key", "timesection");
+ LogicMethod.Current.dictionary(dic, "comparator", "=");
+ LogicMethod.Current.dictionary(dic, "data_type", "string");
+ LogicMethod.Current.dictionary(dic, "value", btnStartTimeText.Text + "-" + btnEndTimeText.Text);
inputTime.condition.Add(dic);
AddCondition(inputTime, edit, index);
@@ -354,7 +355,7 @@
//娣诲姞涓�涓柊鐨勬椂闂存潯浠�
Logic.currlogic.input.Add(input);
}
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.Current.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
--
Gitblit v1.8.0