| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Assets/Language.ini
@@ -521,7 +521,14 @@ 7068=时间 7069=暂未设置自动化，请前往设置！ 7070=此处空空如也~ 7071=开始时间未设置，请设置开始时间。 7072=结束时间未设置，请设置结束时间。 7073=开始时间和结束时间不能一样。 7074=开始时间不能大于结束时间。 7075=条件不能为空。 7076=目标不能为空。 7077=时间未设置，请设置时间。 7078=条件或者目标为空。 9000=请使用新的手机账号登录APP 9001=请使用新的邮箱账号登录APP HDL-ON_iOS/Resources/Language.ini
@@ -522,7 +522,14 @@ 7068=时间 7069=暂未设置自动化，请前往设置！ 7070=此处空空如也~ 7071=开始时间未设置，请设置开始时间。 7072=结束时间未设置，请设置结束时间。 7073=开始时间和结束时间不能一样。 7074=开始时间不能大于结束时间。 7075=条件不能为空。 7076=目标不能为空。 7077=时间未设置，请设置时间。 7078=条件或者目标为空。 9000=请使用新的手机账号登录APP 9001=请使用新的邮箱账号登录APP 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;
@@ -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 @@ //数据返序列化为Logic对象 var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay); var logic = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic>(str); if (logic.userLogicId!="") if (logic.userLogicId != "") { //更新云端唯一自动化id; Logic.currlogic.userLogicId = logic.userLogicId; HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -201,6 +201,7 @@ //确认点击事件 view.btnConfirm.MouseUpEventHandler += (sender1, e1) => { if (sceneSelecetd == null) { //提示：还没选中执行周期 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), 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": { //用sid找到设备； @@ -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) 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(); }; } } } HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -1155,7 +1155,6 @@ } break; } } /// <summary> /// 添加处理选中数据 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; }
