| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Phone/Public/.DS_Store | 补丁 | 查看 | 原始文档 | 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/LogicView/TipPopView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,36 +1,34 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs"> <Files> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="526" Column="18" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="205" Column="22" /> <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="12" Column="24" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="10" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="73" Column="21" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="19" Column="76" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs" Line="10" Column="57" /> </Files> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" /> <MonoDevelop.Ide.Workbench> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="Server" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI0-Public" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True"> <Node name="LogicView" expanded="True"> <Node name="AddOutputInputView.cs" selected="True" /> </Node> <Node name="LogicView" expanded="True" /> <Node name="AddLogic.cs" selected="True" /> </Node> </Node> <Node name="FuntionControlView" expanded="True" /> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True" /> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True" /> </Node> </Node> </State> </Pad> HDL-ON_Android/Assets/Language.ini
@@ -486,6 +486,8 @@ 7049=是否要删除自动化？ 7050=添加场景 7051=延时 7052=保存失败，请重试 7053=删除失败，请重试 Binary files differ
HDL-ON_iOS/Resources/Language.ini
@@ -485,6 +485,8 @@ 7049=是否要删除自动化？ 7050=添加场景 7051=延时 7052=保存失败，请重试 7053=删除失败，请重试 9000=请使用新的手机账号登录APP HDL_ON/Common/R.cs
@@ -479,6 +479,8 @@ public const int delAutomation = 7049; public const int addSceneLogic = 7050; public const int delayLogic = 7051; public const int saveFail = 7052; public const int delFail = 7053; #region LE新增 HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -174,6 +174,7 @@ { Logic.currlogic.name = logicName; Logic.currlogic.sid = LogicMethod.NewSid(); //发送新加修改逻辑命令； var responsePackNew = Send.AddLogic(Logic.currlogic); if (responsePackNew.Code == "0") { @@ -181,21 +182,25 @@ LogicMethod.RemoveAllView(); MainView.MainShow(); } //发送新加修改逻辑命令； else { new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail)); } }); } else { //发送新加修改逻辑命令； var responsePackNew = Send.updateLogic(Logic.currlogic); if (responsePackNew.Code == "0") { LogicMethod.RemoveAllView(); MainView.MainShow(); } //发送新加修改逻辑命令； else { new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail)); } } }; HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
@@ -1,5 +1,6 @@ using System; using System.Collections.Generic; using System.Threading; using HDL_ON.UI.CSS; using Shared; @@ -52,7 +53,7 @@ X = Application.GetRealWidth(35), Height = Application.GetRealHeight(22), Width = Application.GetRealWidth(200), TextColor =CSS_Color.textConfirmColor, TextColor = CSS_Color.textConfirmColor, TextSize = TextSize.text16, TextAlignment = TextAlignment.Center, TextID = titleId, @@ -116,7 +117,7 @@ Width = Application.GetRealWidth(135), Height = Application.GetRealHeight(44), TextAlignment = TextAlignment.Center, TextColor =CSS_Color.textTipColor, TextColor = CSS_Color.textTipColor, TextSize = TextSize.text16, TextID = StringId.cancelMusic, Gravity = Gravity.BottomLeft, @@ -401,7 +402,7 @@ X = Application.GetRealWidth(20), Height = Application.GetRealHeight(22), Width = Application.GetRealWidth(270 - 20 * 2), TextColor =CSS_Color.textTipColor, TextColor = CSS_Color.textTipColor, TextSize = TextSize.text12, TextAlignment = TextAlignment.Center, TextID = tipTxet, @@ -423,7 +424,7 @@ Width = Application.GetRealWidth(135), Height = Application.GetRealHeight(44), TextAlignment = TextAlignment.Center, TextColor =CSS_Color.textTipColor, TextColor = CSS_Color.textTipColor, TextSize = TextSize.text16, TextID = StringId.cancelMusic, Gravity = Gravity.BottomLeft, @@ -565,5 +566,14 @@ }; } /// <summary> /// 信息提示窗口，自动关闭 /// </summary> /// <param name="msg">提示错误文本</param> public void FlashingBox(string msg) { new PublicAssmebly().TipMsgAutoClose(msg, false, 2000); } } } HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -34,11 +34,12 @@ }; //获取自动化列表 GetLogicList(); // for (int i = Logic.LogicList.Count-1; i >= 0; i--)降序排列 for (int i = 0; i < Logic.LogicList.Count; i++) { var currLogic = Logic.LogicList[i]; ///上下间隔12像素 vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12)}); vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) }); LogicView.SingleLogicView logicView = new LogicView.SingleLogicView(); vv.AddChidren(logicView.FLayoutView()); logicView.btnLogicName.Text = currLogic.name; @@ -66,10 +67,12 @@ logicView.btnSwitchIcon.IsSelected = false; currLogic.enable = "false"; } Send.switchLogic(currLogic); Send.switchLogic(currLogic); }; if (Logic.LogicList.Count-1==i) { //if (i==0)降序排列 if (Logic.LogicList.Count - 1 == i) { ///最后一个距离最底部12,界面显示效果作用; vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) }); } HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs
@@ -98,11 +98,18 @@ new LogicView.TipPopView().TipBox(StringId.tip, StringId.delAutomation, () => { Send.delLogic(Logic.currlogic); LogicMethod.RemoveAllView(); Logic.LogicList.Remove(Logic.currlogic); MainView.MainShow(); //发送删除逻辑命令； var responsePackNew= Send.delLogic(Logic.currlogic); if (responsePackNew.Code == "0") { LogicMethod.RemoveAllView(); Logic.LogicList.Remove(Logic.currlogic); MainView.MainShow(); //发送删除逻辑命令； } else { new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.delFail)); } }); };
