From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 93c60b5..2aded38 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -101,7 +101,7 @@
{
Y = btnTipNot.Bottom,
Height = Application.GetRealWidth(100),
- TextID = StringId.TipNotOpen,
+ TextID = StringId.ContentIsEmpty,
TextAlignment = TextAlignment.Center,
TextColor = CSS.CSS_Color.TextualColor,
TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
@@ -231,7 +231,7 @@
List<string> logicIdList = new List<string>();
//鑾峰彇閫昏緫ID鍒楄〃
var idStr = Send.getLogicIdList();
- if (idStr.Code == "0" && idStr.Data != null)
+ if (idStr.Code == "0" && idStr.Data != null&& idStr.Data.ToString()!="")
{
var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data);
var dateList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Date>>(date);
--
Gitblit v1.8.0