From b847c06d8617efb2cbbad6f11b0344b779138e92 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 14 十月 2024 18:03:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 84822aa..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();
@@ -249,12 +250,12 @@
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.Current.NewSid();
--
Gitblit v1.8.0