diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DryerWaterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DryerWaterControl.cs index c31638a..9f4b2ce 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DryerWaterControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DryerWaterControl.cs @@ -2,7 +2,9 @@ using DataBlockHelper.Entity.DB2104Entity; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.AutoControl.Entity; +using Mesnac.Action.ChemicalWeighing.Entity; using Mesnac.Controls.Base; +using Mesnac.Core.Service; using System; using System.Collections.Generic; using System.Linq; @@ -52,14 +54,36 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl WaterEntity HotB = new WaterEntity(); WaterEntity ColdB = new WaterEntity(); - HotA.Set = Convert.ToSingle(ControlsEntity.HotValueA.MCValue); - HotA.TolErance = Convert.ToSingle(ControlsEntity.HotToleranceA.MCValue); - HotB.Set = Convert.ToSingle(ControlsEntity.HotValueB.MCValue); - HotB.TolErance = Convert.ToSingle(ControlsEntity.HotToleranceB.MCValue); - ColdA.Set = Convert.ToSingle(ControlsEntity.ColdValueA.MCValue); - ColdA.TolErance = Convert.ToSingle(ControlsEntity.ColdToleranceA.MCValue); - ColdB.Set = Convert.ToSingle(ControlsEntity.ColdValueB.MCValue); - ColdB.TolErance = Convert.ToSingle(ControlsEntity.ColdToleranceB.MCValue); + float hotASet, hotBSet, coldASet, coldBSet, hotATol, hotBTol, coldATol, coldBTol; + + if (float.TryParse(Convert.ToString(ControlsEntity.HotValueA.MCValue), out hotASet) && + float.TryParse(Convert.ToString(ControlsEntity.HotToleranceA.MCValue), out hotATol) && + float.TryParse(Convert.ToString(ControlsEntity.HotValueB.MCValue), out hotBSet) && + float.TryParse(Convert.ToString(ControlsEntity.HotToleranceB.MCValue), out hotBTol) && + float.TryParse(Convert.ToString(ControlsEntity.ColdValueA.MCValue), out coldASet) && + float.TryParse(Convert.ToString(ControlsEntity.ColdToleranceA.MCValue), out coldATol) && + float.TryParse(Convert.ToString(ControlsEntity.ColdValueB.MCValue), out coldBSet) && + float.TryParse(Convert.ToString(ControlsEntity.ColdToleranceB.MCValue), out coldBTol)) + { + HotA.Set = hotASet; + HotB.Set = hotBSet; + ColdA.Set = coldASet; + ColdB.Set = coldBSet; + HotA.TolErance = hotATol; + HotB.TolErance = hotBTol; + ColdA.TolErance = coldATol; + ColdB.TolErance = coldBTol; + Db2104WriteHelper.WriteAHostWater(HotA); + Db2104WriteHelper.WriteBHostWater(HotB); + Db2104WriteHelper.WriteAColWater(ColdA); + Db2104WriteHelper.WriteBColWater(ColdB); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs index d8b93d9..8f69c11 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs @@ -1,13 +1,46 @@ -using System; +using Mesnac.Controls.Base; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Web.UI.WebControls; +using Button = System.Windows.Forms.Button; namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity { public class GelerWeterControlsEntity { + public IBaseControl Line1 { get; set; } + public IBaseControl Line2 { get; set; } + public IBaseControl Line3 { get; set; } + public IBaseControl Line4 { get; set; } + public IBaseControl Line5 { get; set; } + public IBaseControl Line6 { get; set; } + public IBaseControl Line7 { get; set; } + public IBaseControl Line8 { get; set; } + public IBaseControl ChooseMaterial1 { get; set; } + public IBaseControl ChooseMaterial2 { get; set; } + public IBaseControl MaterialWeight1 { get; set; } + public IBaseControl MaterialWeight2 { get; set; } + public IBaseControl MaterialTolerance1 { get; set; } + public IBaseControl MaterialTolerance2 { get; set; } + public IBaseControl GelSpeedSet { get; set; } + public IBaseControl GelPosTimeA { get; set; } + public IBaseControl GelNagTimeB { get; set; } + public IBaseControl GelPosTimeC { get; set; } + public IBaseControl GelWaterTime { get; set; } + public IBaseControl GelWaitTime { get; set; } + public IBaseControl GelCloseHeatTime { get; set; } + public IBaseControl GelOutDelayTime { get; set; } + public IBaseControl WetDryWeight { get; set; } + public IBaseControl WetMixTime { get; set; } + public IBaseControl WetOutDelayTime { get; set; } + + public Button WetManualControl { get; set; } + public Button Download { get; set; } + public Button LineStart { get; set; } + public Button LineStop { get; set; } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs index c3d2ba9..734de24 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs @@ -1,4 +1,5 @@ using DataBlockHelper.Entity.DB2104Entity; +using DataBlockHelper.Entity.DB2106Entity; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.AutoControl.Entity; using Mesnac.Controls.Base; @@ -13,9 +14,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl { internal class GelerWeterControl : ChemicalWeighingAction, IAction { - List McControllist; private List McControls; // 获取Query控件 - DryerWaterControlsEntity ControlsEntity = new DryerWaterControlsEntity(); + GelerWeterControlsEntity ControlsEntity = new GelerWeterControlsEntity(); public void Run(RuntimeParameter runtime) { @@ -23,19 +23,113 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl McControls = GetAllControls(); + ControlImport(); BottomSelect(runtime); } + /// + /// 单选选择 + /// + /// 返回单选的产线号 如果未选择返回0 + private int SingleSelect() + { + if(Convert.ToBoolean(ControlsEntity.Line1.MCValue) == true) + { + return 1; + } + else if (Convert.ToBoolean(ControlsEntity.Line2.MCValue) == true) + { + return 2; + } + else if (Convert.ToBoolean(ControlsEntity.Line3.MCValue) == true) + { + return 3; + } + else if (Convert.ToBoolean(ControlsEntity.Line4.MCValue) == true) + { + return 4; + } + else if (Convert.ToBoolean(ControlsEntity.Line5.MCValue) == true) + { + return 5; + } + else if (Convert.ToBoolean(ControlsEntity.Line6.MCValue) == true) + { + return 6; + } + else if (Convert.ToBoolean(ControlsEntity.Line7.MCValue) == true) + { + return 7; + } + else if (Convert.ToBoolean(ControlsEntity.Line8.MCValue) == true) + { + return 8; + } + else + { + return 0; + } + } + private void ControlImport() { - + ControlsEntity.Line1 = GetBaseControl("Line1"); + ControlsEntity.Line2 = GetBaseControl("Line2"); + ControlsEntity.Line3 = GetBaseControl("Line3"); + ControlsEntity.Line4 = GetBaseControl("Line4"); + ControlsEntity.Line5 = GetBaseControl("Line5"); + ControlsEntity.Line6 = GetBaseControl("Line6"); + ControlsEntity.Line7 = GetBaseControl("Line7"); + ControlsEntity.Line8 = GetBaseControl("Line8"); + + ControlsEntity.ChooseMaterial1 = GetBaseControl("ChooseMaterial1"); + ControlsEntity.ChooseMaterial2 = GetBaseControl("ChooseMaterial2"); + ControlsEntity.MaterialWeight1 = GetBaseControl("MaterialWeight1"); + ControlsEntity.MaterialWeight2 = GetBaseControl("MaterialWeight2"); + ControlsEntity.MaterialTolerance1 = GetBaseControl("MaterialTolerance1"); + ControlsEntity.MaterialTolerance2 = GetBaseControl("MaterialTolerance2"); + ControlsEntity.GelSpeedSet = GetBaseControl("GelSpeedSet"); + ControlsEntity.GelPosTimeA = GetBaseControl("GelPosTimeA"); + ControlsEntity.GelNagTimeB = GetBaseControl("GelNagTimeB"); + ControlsEntity.GelPosTimeC = GetBaseControl("GelPosTimeC"); + ControlsEntity.GelWaterTime = GetBaseControl("GelWaterTime"); + ControlsEntity.GelWaitTime = GetBaseControl("GelWaitTime"); + ControlsEntity.GelCloseHeatTime = GetBaseControl("GelCloseHeatTime"); + ControlsEntity.GelOutDelayTime = GetBaseControl("GelOutDelayTime"); + + ControlsEntity.WetDryWeight = GetBaseControl("WetDryWeight"); + ControlsEntity.WetMixTime = GetBaseControl("WetMixTime"); + ControlsEntity.WetOutDelayTime = GetBaseControl("WetOutDelayTime"); + + ControlsEntity.WetManualControl = GetButtonControl("WetManualControl"); + ControlsEntity.Download = GetButtonControl("Download"); + ControlsEntity.LineStart = GetButtonControl("LineStart"); + ControlsEntity.LineStop = GetButtonControl("LineStop"); } private void BottomSelect(RuntimeParameter runtime) { - + if(ControlsEntity.WetManualControl == runtime.Sender) + { + + } + + if (ControlsEntity.Download == runtime.Sender) + { + + } + + if (ControlsEntity.LineStart == runtime.Sender) + { + + } + + if (ControlsEntity.LineStop == runtime.Sender) + { + + } } private IBaseControl GetBaseControl(string name) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs index b12186e..3a5cc54 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs @@ -491,10 +491,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning Dowd(begin, view); begin += 10; } - - - begin = 2018; for (int i = 0; i < recipeSteps.Count(); i++) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 4f1de30..fff8dc4 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -61,12 +61,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl private PlcReadTempEntity PlcReadTemp = new PlcReadTempEntity(); private DbMCControl AlarmForm = null; //物料列表控件 private MCLabel MCWatchDog; - HslLanternAlarmEntity hslAlarmEntity; + HslLanternAlarmEntity hslAlarmEntity; HslLanternSimpleEntity hslLanternSimpleEntity; - - #endregion #region Run方法 diff --git a/Main/MCEdit/Data/EventConfig/小料称量/自动控制.xml b/Main/MCEdit/Data/EventConfig/小料称量/自动控制.xml index 1b3cb7e..1d541c9 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/自动控制.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/自动控制.xml @@ -6,9 +6,10 @@ 水称干混机控制 水称干混机控制 - - - + + 湿混糊化机控制 + 湿混糊化机控制 + @@ -17,12 +18,15 @@ - + + + + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml index c91f9ce..43eaecd 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml @@ -66,7 +66,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw== False @@ -178,9 +178,9 @@ 10 - + - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw== @@ -198,13 +198,13 @@ DarkGray 下传 508, 347 - DownLoad + Download 201, 56 8 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw== @@ -282,7 +282,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw== @@ -435,7 +435,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIERCRTgxOTNENDE2MDRBRDVCOTRBRTNDMkQzNDc1MUQyBgYAAAAV5rm/5re357OK5YyW5py65o6n5Yi2BgcAAAAV5rm/5re357OK5YyW5py65o6n5Yi2Cw== @@ -581,7 +581,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L + AAEAAAD/////AQAAAAAAAAAMAgAAAE5NZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuRGVmYXVsdC5Db21ib2JveEl0ZW1zLCBNZXNuYWMuQ29udHJvbHMuRGVmYXVsdCwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAJ01lc25hYy5Db250cm9scy5EZWZhdWx0LkNvbWJvYm94SXRlbXNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQlTWVzbmFjLkNvbnRyb2xzLkRlZmF1bHQuQ29tYm9ib3hJdGVtcwIAAAAL Query True