From eb0b148e543c1dc4c1925184212868776a6f7417 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 15:55:58 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 2
HDL-ON_iOS/Resources/Language.ini | 9 ++
HDL-ON_Android/Assets/Language.ini | 9 ++
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 84 +++++++++++++-------
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 17 ++++
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs | 70 +++++++++++++++++
HDL_ON/Common/R.cs | 11 ++
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 20 ++++-
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 1
HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | 1
10 files changed, 183 insertions(+), 41 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index ad89626..2ca0eec 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -521,7 +521,14 @@
7068=鏃堕棿
7069=鏆傛湭璁剧疆鑷姩鍖栵紝璇峰墠寰�璁剧疆锛�
7070=姝ゅ绌虹┖濡備篃~
-
+7071=寮�濮嬫椂闂存湭璁剧疆锛岃璁剧疆寮�濮嬫椂闂淬��
+7072=缁撴潫鏃堕棿鏈缃紝璇疯缃粨鏉熸椂闂淬��
+7073=寮�濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓�鏍枫��
+7074=寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
+7075=鏉′欢涓嶈兘涓虹┖銆�
+7076=鐩爣涓嶈兘涓虹┖銆�
+7077=鏃堕棿鏈缃紝璇疯缃椂闂淬��
+7078=鏉′欢鎴栬�呯洰鏍囦负绌恒��
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index bfd5718..8540797 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -522,7 +522,14 @@
7068=鏃堕棿
7069=鏆傛湭璁剧疆鑷姩鍖栵紝璇峰墠寰�璁剧疆锛�
7070=姝ゅ绌虹┖濡備篃~
-
+7071=寮�濮嬫椂闂存湭璁剧疆锛岃璁剧疆寮�濮嬫椂闂淬��
+7072=缁撴潫鏃堕棿鏈缃紝璇疯缃粨鏉熸椂闂淬��
+7073=寮�濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓�鏍枫��
+7074=寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
+7075=鏉′欢涓嶈兘涓虹┖銆�
+7076=鐩爣涓嶈兘涓虹┖銆�
+7077=鏃堕棿鏈缃紝璇疯缃椂闂淬��
+7078=鏉′欢鎴栬�呯洰鏍囦负绌恒��
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index be5edf2..43209de 100755
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -516,7 +516,16 @@
public const int timeMode = 7068;
public const int logicnull = 7069;
public const int secnenull = 7070;
-
+ public const int setStartTime = 7071;
+ public const int setEndTime = 7072;
+ public const int unlikeTime = 7073;
+ public const int startTimeLessThanEndTime = 7074;
+ public const int conditioncNull = 7075;
+ public const int targetNull = 7076;
+ public const int timeNoSet = 7077;
+ public const int conditioncNullOrtargetNull = 7078;
+
+
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index f8e11ad..3c54d9b 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -184,6 +184,21 @@
///淇濆瓨鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
+ if (Logic.currlogic.input.Count == 0&& Logic.currlogic.output.Count == 0)
+ {
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNullOrtargetNull);
+ return;
+ }
+ if (Logic.currlogic.input.Count == 0)
+ {
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNull);
+ return;
+ }
+ if (Logic.currlogic.output.Count == 0)
+ {
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.targetNull);
+ return;
+ }
Loading loading = new Loading();
this.AddChidren(loading);
HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
@@ -226,7 +241,7 @@
//鏁版嵁杩斿簭鍒楀寲涓篖ogic瀵硅薄
var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
var logic = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic>(str);
- if (logic.userLogicId!="")
+ if (logic.userLogicId != "")
{
//鏇存柊浜戠鍞竴鑷姩鍖杋d;
Logic.currlogic.userLogicId = logic.userLogicId;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
index 20a1887..2d7fbb3 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -201,6 +201,7 @@
//纭鐐瑰嚮浜嬩欢
view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
{
+
if (sceneSelecetd == null)
{
//鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index b7242fb..380a351 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -158,7 +158,7 @@
FrameLayout bghFrameLyout = new FrameLayout
{
- X = Application.GetRealWidth(10),
+ X = Application.GetRealWidth(118),
Y = Application.GetRealHeight(103),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(21 + 44),
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index e429b56..7eee6bc 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -21,7 +21,7 @@
///璁板綍鏉′欢绫诲瀷
inputView.btnClick.Name = inputCondition.condition_type;
///璁板綍鏉′欢绱㈠紩
- inputView.btnClick.Tag = i;
+ inputView.btnClick.Tag = inputCondition.sid;
///鏉′欢鐘舵�佹暟缁�
List<Dictionary<string, string>> dicList = inputCondition.condition as List<Dictionary<string, string>>;
//鏄剧ず鏉′欢鍚勭绫诲瀷鐘舵��
@@ -104,7 +104,19 @@
{
Button button = (Button)sen;
//鎵惧埌褰撳墠缂栬緫鐨勭储寮�
- int indexVulae = int.Parse(inputView.btnClick.Tag.ToString());
+ int indexVulae = 0;
+ for (int index = 0; index < Logic.currlogic.input.Count; index++)
+ {
+ Input input = Logic.currlogic.input[index];
+ if (input.sid == inputView.btnClick.Tag.ToString())
+ {
+ //鐢ㄦ埛鍙兘鍒犻櫎鏁版嵁锛屼娇鍒楄〃绱㈠紩鍙戠敓鏀瑰彉锛�
+ //閫氳繃鍞竴sid閲嶆柊鏌ユ壘鍒扮储寮曚笖鏇存柊绱㈠紩鍊�
+ indexVulae = index;
+ break;
+ }
+ }
+
//鏍囪缂栬緫鐘舵��
bool edit = true;
switch (button.Name)
@@ -131,7 +143,6 @@
timeTpye.TimeHorizon(fLayout, edit, indexVulae);
}
break;
-
case "3":
{
//鐢╯id鎵惧埌璁惧锛�
@@ -172,10 +183,10 @@
///璁板綍鏉′欢绫诲瀷
targetView.btnClick.Name = outputTarget.target_type;
///璁板綍鏉′欢绱㈠紩
- targetView.btnClick.Tag = i;
+ targetView.btnClick.Tag = outputTarget.sid;
///鏉′欢鐘舵�佹暟缁�
List<Dictionary<string, string>> dicList = outputTarget.status as List<Dictionary<string, string>>;
- //鏄剧ず鏉′欢鍚勭绫诲瀷鐘舵��
+ //鏄剧ず杈撳嚭鏉′欢鍚勭绫诲瀷鐘舵��
switch (outputTarget.target_type)
{
case "1":
@@ -331,12 +342,12 @@
{
case "on":
{
- stateStr = Language.StringByID(StringId.onLogic)+";";
+ stateStr = Language.StringByID(StringId.onLogic)+",";
}
break;
case "off":
{
- stateStr = Language.StringByID(StringId.offLogic) + ";";
+ stateStr = Language.StringByID(StringId.offLogic) + ",";
}
break;
@@ -346,7 +357,7 @@
if (set_temp != "")
{
- stateStr += set_temp + "鈩�;";
+ stateStr += set_temp + "鈩�,";
}
if (mode != "")
@@ -356,22 +367,22 @@
{
case "cool":
{
- stateStr += Language.StringByID(StringId.coolLogic)+";";
+ stateStr += Language.StringByID(StringId.coolLogic)+",";
}
break;
case "heat":
{
- stateStr += Language.StringByID(StringId.heatingLogic) + ";";
+ stateStr += Language.StringByID(StringId.heatingLogic) + ",";
}
break;
case "auto":
{
- stateStr += Language.StringByID(StringId.autoLogic) + ";";
+ stateStr += Language.StringByID(StringId.autoLogic) + ",";
}
break;
case "dry":
{
- stateStr += Language.StringByID(StringId.dehumidifyLogic) + ";";
+ stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
}
break;
}
@@ -385,22 +396,22 @@
{
case "high":
{
- stateStr += Language.StringByID(StringId.HighWindSpeed)+";";
+ stateStr += Language.StringByID(StringId.HighWindSpeed)+",";
}
break;
case "medium":
{
- stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ";";
+ stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ",";
}
break;
case "low":
{
- stateStr += Language.StringByID(StringId.LowWindSpeed) + ";";
+ stateStr += Language.StringByID(StringId.LowWindSpeed) + ",";
}
break;
case "auto":
{
- stateStr += Language.StringByID(StringId.Auto) + ";";
+ stateStr += Language.StringByID(StringId.Auto) + ",";
}
break;
}
@@ -411,7 +422,7 @@
targetView.btnState.Text = Language.StringByID(StringId.offLogic);
}
else {
- targetView.btnState.Text = stateStr.TrimEnd(';');
+ targetView.btnState.Text = stateStr.TrimEnd(',');
}
@@ -428,12 +439,12 @@
{
case "on":
{
- stateStr = Language.StringByID(StringId.onLogic) + ";";
+ stateStr = Language.StringByID(StringId.onLogic) + ",";
}
break;
case "off":
{
- stateStr = Language.StringByID(StringId.offLogic) + ";";
+ stateStr = Language.StringByID(StringId.offLogic) + ",";
}
break;
@@ -442,7 +453,7 @@
if (set_temp != "")
{
- stateStr += set_temp + "鈩�;";
+ stateStr += set_temp + "鈩�,";
}
if (mode != "")
{
@@ -451,28 +462,28 @@
{
case "day":
{
- stateStr += Language.StringByID(StringId.dayMode)+";";
+ stateStr += Language.StringByID(StringId.dayMode)+",";
}
break;
case "night":
{
- stateStr += Language.StringByID(StringId.nightMode) + ";";
+ stateStr += Language.StringByID(StringId.nightMode) + ",";
}
break;
case "away":
{
- stateStr += Language.StringByID(StringId.leaveMode) + ";";
+ stateStr += Language.StringByID(StringId.leaveMode) + ",";
}
break;
case "normal":
{
- stateStr += Language.StringByID(StringId.ordinaryMode) + ";";
+ stateStr += Language.StringByID(StringId.ordinaryMode) + ",";
}
break;
case "timer":
{
- stateStr += Language.StringByID(StringId.timeMode) + ";";
+ stateStr += Language.StringByID(StringId.timeMode) + ",";
}
break;
}
@@ -482,22 +493,22 @@
{
case "cool":
{
- stateStr += Language.StringByID(StringId.coolLogic) + ";";
+ stateStr += Language.StringByID(StringId.coolLogic) + ",";
}
break;
case "heat":
{
- stateStr += Language.StringByID(StringId.heatingLogic) + ";";
+ stateStr += Language.StringByID(StringId.heatingLogic) + ",";
}
break;
case "auto":
{
- stateStr += Language.StringByID(StringId.autoLogic) + ";";
+ stateStr += Language.StringByID(StringId.autoLogic) + ",";
}
break;
case "dry":
{
- stateStr += Language.StringByID(StringId.dehumidifyLogic) + ";";
+ stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
}
break;
}
@@ -509,7 +520,7 @@
}
else
{
- targetView.btnState.Text = stateStr.TrimEnd(';');
+ targetView.btnState.Text = stateStr.TrimEnd(',');
}
}
@@ -543,7 +554,18 @@
{
Button button = (Button)sen;
//鎵惧埌褰撳墠缂栬緫鐨勭储寮�
- int indexVulae = int.Parse(targetView.btnClick.Tag.ToString());
+ int indexVulae =0;
+ for (int index = 0; index < Logic.currlogic.output.Count; index++)
+ {
+ Output target = Logic.currlogic.output[index];
+ if (target.sid == targetView.btnClick.Tag.ToString())
+ {
+ //鐢ㄦ埛鍙兘鍒犻櫎鏁版嵁锛屼娇鍒楄〃绱㈠紩鍙戠敓鏀瑰彉锛�
+ //閫氳繃鍞竴sid閲嶆柊鏌ユ壘鍒扮储寮曚笖鏇存柊绱㈠紩鍊�
+ indexVulae = index;
+ break;
+ }
+ }
//鏍囪缂栬緫鐘舵��
bool edit = true;
switch (button.Name)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
index 48a954b..53bec95 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
@@ -575,5 +575,75 @@
{
new PublicAssmebly().TipMsgAutoClose(msg, false, 2000);
}
+
+ /// <summary>
+ /// 閿欒淇℃伅鎻愮ず绐楀彛锛屾墜鍔ㄧ‘瀹氬叧闂�
+ /// </summary>
+ /// <param name="titleId">鏍囬鏂囨湰</param>
+ /// <param name="msgId">鎻愮ず閿欒鏂囨湰</param>
+ public void TipBox(int titleId, int msgId)
+ {
+ Dialog dialog = new Dialog()
+ {
+ BackgroundColor = CSS_Color.viewTrans60lucence,
+ };
+
+ FrameLayout contentView = new FrameLayout()
+ {
+ Gravity = Gravity.Center,
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(140),
+ BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(RradiusFrameLayout),
+ };
+ dialog.AddChidren(contentView);
+
+ Button btnTitle = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ Height = Application.GetRealHeight(22),
+ TextColor = CSS_Color.MainColor,
+ TextSize = LogicView.TextSize.text16,
+ TextAlignment = TextAlignment.Center,
+ TextID= titleId,
+ };
+ contentView.AddChidren(btnTitle);
+
+ Button btnMsg = new Button()
+ {
+ Height = Application.GetRealHeight(17),
+ Y = Application.GetRealHeight(50),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.TextualColor,
+ TextSize = LogicView.TextSize.text12,
+ TextID = msgId,
+ };
+ contentView.AddChidren(btnMsg);
+
+ Button btnLine = new Button()
+ {
+ Y = Application.GetRealHeight(96),
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS_Color.viewLine,
+ };
+ contentView.AddChidren(btnLine);
+
+ Button btnConfirm = new Button()
+ {
+ Y = btnLine.Bottom,
+ Height = Application.GetRealHeight(43),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.MainColor,
+ TextSize = TextSize.text16,
+ TextID = StringId.Close,
+ };
+ contentView.AddChidren(btnConfirm);
+ dialog.Show();
+ btnConfirm.MouseUpEventHandler += (sender, e) =>
+ {
+ dialog.Close();
+ };
+
+ }
}
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 00271c2..40949db 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -1155,7 +1155,6 @@
}
break;
}
-
}
/// <summary>
/// 娣诲姞澶勭悊閫変腑鏁版嵁
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 9d37ba1..edf6086 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -282,24 +282,36 @@
//纭畾鐐瑰嚮浜嬩欢
timeHorizonView.btnConfirm.MouseUpEventHandler += (sender, e) =>
{
+
+ if (btnStartTimeText.Tag.ToString() == "0"&& btnEndTimeText.Tag.ToString() == "0")
+ {
+ //鎻愮ず锛氭椂闂存湭璁剧疆锛岃璁剧疆鏃堕棿銆�
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.timeNoSet);
+ return;
+ }
+
if (btnStartTimeText.Tag.ToString() == "0")
{
- //鎻愮ず锛氳閫変腑寮�濮嬫椂闂�
+ //鎻愮ず锛氬紑濮嬫椂闂存湭璁剧疆锛岃璁剧疆寮�濮嬫椂闂淬��
+ new LogicView.TipPopView().TipBox(StringId.tip,StringId.setStartTime);
return;
}
if (btnEndTimeText.Tag.ToString() == "0")
{
- //鎻愮ず锛氳閫変腑缁撴潫鏃堕棿
+ //鎻愮ず锛氱粨鏉熸椂闂存湭璁剧疆锛岃璁剧疆缁撴潫鏃堕棿銆�
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.setEndTime);
return;
}
if (btnStartTimeText.Tag.ToString() == btnEndTimeText.Tag.ToString())
{
- //鎻愮ず锛氭椂闂翠竴鏍风殑
+ //鎻愮ず锛氬紑濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓�鏍枫��
+ 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;
}
--
Gitblit v1.8.0