| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 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/ConditionDeviceFunList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/InputPushText.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,31 +1,13 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs"> <Files> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="494" Column="10" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InputPushText.cs" Line="5" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="62" Column="6" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="71" Column="10" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="575" Column="30" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs" Line="480" Column="37" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="128" Column="43" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="505" Column="54" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs" Line="268" Column="54" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="57" Column="33" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="183" Column="1" /> </Files> <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" /> <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="Entity" expanded="True"> <Node name="ResponseEntity" expanded="True" /> </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="UI0-Stan" expanded="True" /> <Node name="UI2" expanded="True"> @@ -43,6 +25,9 @@ <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> @@ -54,7 +39,7 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> HDL-ON_Android/Assets/Language.ini
@@ -1570,7 +1570,8 @@ 7129=(100字内) 7130=账号选择 7131=App推送 7132=自动化 7133=已执行 9000=请使用新的手机账号登录APP 9001=请使用新的邮箱账号登录APP HDL-ON_iOS/Resources/Language.ini
@@ -1566,6 +1566,8 @@ 7129=(100字内) 7130=账号选择 7131=App推送 7132=自动化 7133=已执行 9000=请使用新的手机账号登录APP 9001=请使用新的邮箱账号登录APP HDL_ON/Common/R.cs
@@ -1064,6 +1064,8 @@ public const int xianzhichangdu = 7129; public const int zhanghaoxuanze = 7130; public const int apptuisong = 7131; public const int zidontghua = 7132; public const int yizhixing = 7133; #region LE新增 /// <summary> HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -135,13 +135,14 @@ } } break; case SPK.SensorDoorWindow: { case SPK.SensorDoorWindow: { LogicView.FunTypeView view = new LogicView.FunTypeView(); view.btnText.TextID = StringId.kaiqiandbihe; fLayout.AddChidren(view.FLayoutView()); view.btnClick.MouseUpEventHandler += (sender, e) => { DeviceView(device, view.btnState, StringId.kaiqi , StringId.bihe); DeviceView(device, view.btnState, StringId.kaiqi, StringId.bihe); }; if (edit) { @@ -151,7 +152,7 @@ break; case SPK.SensoruUtrasonic: { LogicView.FunTypeView view = new LogicView.FunTypeView(); view.btnText.TextID = StringId.yourenandwuren; fLayout.AddChidren(view.FLayoutView()); @@ -214,10 +215,22 @@ return; } LogicMethod.RemoveAllView(); AddLogic addLogic = new AddLogic(); MainPage.BasePageView.AddChidren(addLogic); addLogic.Show(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; if (MainView.IsGatewayType) { //A网关 var addLogic = new AddLogic(); MainPage.BasePageView.AddChidren(addLogic); addLogic.Show(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; } else { //一端口网关 var onePortAutomation = new OnePortAutomation(); MainPage.BasePageView.AddChidren(onePortAutomation); onePortAutomation.Show(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; } }; #endregion HDL_ON/UI/UI2/3-Intelligence/Automation/InputPushText.cs
@@ -155,8 +155,20 @@ saveView.btnClick.MouseUpEventHandler += (e, sen) => { Logic.currlogic.noticeConfig.noticeContent = textBox.Text.Trim(); Logic.currlogic.pushConfigs.Clear();//清空旧数据列表 Logic.currlogic.pushConfigs.Add(new PushConfigs { pushTarget = selectedAccountList }); if (selectedAccountList.Count > 0) { Logic.currlogic.pushConfigs.Clear();//清空旧数据列表 Logic.currlogic.pushConfigs.Add(new PushConfigs { pushTarget = selectedAccountList }); } //账号列表为空默认推送当前账号 if (Logic.currlogic.pushConfigs.Count == 0) { //初始化对象 PushConfigs pushConfigs = new PushConfigs(); //默认添加推送当前账号 pushConfigs.pushTarget.Add(UserInfo.Current.ID); Logic.currlogic.pushConfigs.Add(pushConfigs); } this.RemoveFromParent(); }; #endregion HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -287,37 +287,38 @@ if (if_logic == null) { Logic newlogic = new Logic(); newlogic.name = logic.name; newlogic.userLogicId = logic.userLogicId; newlogic.sid = logic.sid; newlogic.relation = logic.relation; newlogic.enable = logic.enable; newlogic.cycle = logic.cycle; for (int i = 0; i < logic.input.Count; i++) { if (logic.input[i] == null || string.IsNullOrEmpty(logic.input[i].condition_type)) { //防止调试软件乱传东西上来; //防止有空对象； //正常情况下不会出现的现象； continue; } newlogic.input.Add(logic.input[i]); } for (int i = 0; i < logic.output.Count; i++) { if (logic.output[i] == null || string.IsNullOrEmpty(logic.output[i].target_type)) { //防止调试软件乱传东西上来; //防止有空对象； //正常情况下不会该现象； continue; } newlogic.output.Add(logic.output[i]); } //Logic newlogic = new Logic(); //newlogic.name = logic.name; //newlogic.userLogicId = logic.userLogicId; //newlogic.sid = logic.sid; //newlogic.relation = logic.relation; //newlogic.enable = logic.enable; //newlogic.cycle = logic.cycle; //for (int i = 0; i < logic.input.Count; i++) //{ // if (logic.input[i] == null || string.IsNullOrEmpty(logic.input[i].condition_type)) // { // //防止调试软件乱传东西上来; // //防止有空对象； // //正常情况下不会出现的现象； // continue; // } // newlogic.input.Add(logic.input[i]); //} //for (int i = 0; i < logic.output.Count; i++) //{ // if (logic.output[i] == null || string.IsNullOrEmpty(logic.output[i].target_type)) // { // //防止调试软件乱传东西上来; // //防止有空对象； // //正常情况下不会该现象； // continue; // } // newlogic.output.Add(logic.output[i]); //} //添加逻辑 Logic.LogicList.Add(newlogic); Logic.LogicList.Add(logic); } } @@ -504,7 +505,6 @@ if (Entity.DB_ResidenceData.Instance.GatewayType == 1) { return true; } else { HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -287,8 +287,6 @@ { var dd = e.Message; } return responsePackNew; } /// <summary>
