From 9dcdd3b65526f098f1cda047c65f28e4a3554da2 Mon Sep 17 00:00:00 2001 From: wangsr Date: Sat, 16 Dec 2023 17:19:22 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=BC=BA=E5=88=B6=E6=8E=92?= =?UTF-8?q?=E6=B0=B4=E9=87=8D=E5=A4=A7=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E6=8C=89=E9=92=AE=E5=92=8C=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManualControl/ForceWaterControl.cs | 278 +++++++----------- .../ManualControl/ForceWaterInitAction.cs | 112 +++++++ .../Mesnac.Action.ChemicalWeighing.csproj | 1 + .../EventConfig/小料称量/手动控制.xml | 12 +- .../MCProject/nodeForm/WaterForceControl.xml | 24 +- 5 files changed, 243 insertions(+), 184 deletions(-) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterInitAction.cs diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs index 8d23515..35f7fc2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs @@ -1,9 +1,6 @@ using DataBlockHelper.DBHelpers; -using DataBlockHelper.Entity.DB2106Entity; -using HslCommunication.Instrument.DLT; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.FreeDb; -using Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity; using Mesnac.Action.ChemicalWeighing.Report.Entity; using Mesnac.Basic; using Mesnac.Controls.ChemicalWeighing; @@ -11,108 +8,41 @@ using Mesnac.Controls.Default; using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; namespace Mesnac.Action.ChemicalWeighing.ManualControl { - public class ForceWaterControl : ChemicalWeighingAction, IAction + public class ForceWaterInitAction : ChemicalWeighingAction, IAction { - FHslSwitchEntity HslSwitchE = new FHslSwitchEntity(); FMCTextBoxEntity MCTextBoxE = new FMCTextBoxEntity(); FMCButtonEntity ButtonE = new FMCButtonEntity(); FMCRadioButtonEntity RadioButtonE = new FMCRadioButtonEntity(); DB2105Helper DB2105 = new DB2105Helper(); - private List Controls; - Timer timer; - - private byte GelChooseA; - private byte GelChooseB; + private byte GelChooseA = 0; + private byte GelChooseB = 0; public void Run(RuntimeParameter runtime) { - base.RunIni(runtime); //必须要调用 + base.RunIni(runtime); Controls = GetAllControls(); SetAllControls(); - StateRefresh(); - - HslSwitchE.ForceControlHA.OnSwitchChanged += ForceControl_OnSwitchChanged; - HslSwitchE.ForceControlCA.OnSwitchChanged += ForceControl_OnSwitchChanged; - HslSwitchE.ForceControlHB.OnSwitchChanged += ForceControl_OnSwitchChanged; - HslSwitchE.ForceControlCB.OnSwitchChanged += ForceControl_OnSwitchChanged; - BottomSelect(runtime); - //timer = new Timer(); - //timer.Interval = 1000; - //timer.Enabled = true; - //timer.Tick += new EventHandler(StateRefresh);//添加事件 - } - - private void ForceControl_OnSwitchChanged(object obj, bool state) - { - DB2105 = new DB2105Helper(); - HslSwitch hslSwitch = obj as HslSwitch; - if (state) - { - if (MessageBox.Show("是否要打开强制排水模式？", "强制模式启动确认", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - { - HslSwitch hs = obj as HslSwitch; - hs.SwitchStatus = false; - return; - } - } - string name = hslSwitch.Name; - switch (name) - { - case "ForceControlHA": - DB2105WriteHelper.AddHaAddForceOn(state); - break; - case "ForceControlCA": - DB2105WriteHelper.AddCaAddForceOn(state); - break; - case "ForceControlHB": - DB2105WriteHelper.AddHbAddForceOn(state); - break; - case "ForceControlCB": - DB2105WriteHelper.AddCbAddForceOn(state); - break; - default: break; - } - DefaultSwitch(hslSwitch, state); } - private void StateRefresh() + private void SetAllControls() { - if (HslSwitchE.ForceControlHA.SwitchStatus != DB2105.Force_HA.forceOn) - { - HslSwitchE.ForceControlHA.SwitchStatus = DB2105.Force_HA.forceOn; - } - if (HslSwitchE.ForceControlCA.SwitchStatus != DB2105.Force_CA.forceOn) - { - HslSwitchE.ForceControlCA.SwitchStatus = DB2105.Force_CA.forceOn; - } - if (HslSwitchE.ForceControlHB.SwitchStatus != DB2105.Force_HB.forceOn) - { - HslSwitchE.ForceControlHB.SwitchStatus = DB2105.Force_HB.forceOn; - } - if (HslSwitchE.ForceControlCB.SwitchStatus != DB2105.Force_CB.forceOn) - { - HslSwitchE.ForceControlCB.SwitchStatus = DB2105.Force_CB.forceOn; - } - DefaultSwitch(HslSwitchE.ForceControlHA, DB2105.Force_HA.forceOn); - DefaultSwitch(HslSwitchE.ForceControlCA, DB2105.Force_CA.forceOn); - DefaultSwitch(HslSwitchE.ForceControlHB, DB2105.Force_HB.forceOn); - DefaultSwitch(HslSwitchE.ForceControlCB, DB2105.Force_CB.forceOn); + ControlsHelper.ControlImport(MCTextBoxE, Controls); + ControlsHelper.ControlImport(ButtonE, Controls); + ControlsHelper.ControlImport(RadioButtonE, Controls); } private void BottomSelect(RuntimeParameter runtime) @@ -123,96 +53,105 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl if (ButtonE.StartMetage1 == runtime.Sender) { - - MessageBox.Show("此按钮暂停使用！"); - return; - - //if (!DB2105.Force_CA.forceOn) - //{ - // MessageBox.Show("冷水称A强制控制按钮未打开！"); - // return; - //} - //if (MessageBox.Show("确认向冷水称A补充？", "强制模式启动确认", - // MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - //{ - // return; - //} - //DB2105WriteHelper.AddCaAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue1.Text)); - //DB2105WriteHelper.AddCaAddForceBin(GelChooseA); - //DB2105WriteHelper.AddCaAddStartIn(true); - //ManualLogControl("冷水称A强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue1.Text), GelChooseA); - //MessageBox.Show("冷水称A强制补充"); + if (GelChooseA == 0) + { + MessageBox.Show("请先选择糊化锅！"); + return; + } + if (!DB2105.Force_CA.forceOn) + { + MessageBox.Show("冷水称A强制控制按钮未打开！"); + return; + } + if (MessageBox.Show("确认向冷水称A补充？", "强制模式启动确认", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + DB2105WriteHelper.AddCaAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue1.Text)); + DB2105WriteHelper.AddCaAddForceBin(GelChooseA); + DB2105WriteHelper.AddCaAddStartIn(true); + ManualLogControl("冷水称A强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue1.Text), GelChooseA); + MessageBox.Show("冷水称A强制补充"); } if (ButtonE.StartMetage2 == runtime.Sender) { - - MessageBox.Show("此按钮暂停使用！"); - return; - - //if (!DB2105.Force_HA.forceOn) - //{ - // MessageBox.Show("热水称A强制控制按钮未打开！"); - // return; - //} - //if (MessageBox.Show("确认向热水称A补充？", "强制模式启动确认", - // MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - //{ - // return; - //} - //DB2105WriteHelper.AddHaAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue2.Text)); - //DB2105WriteHelper.AddHaAddForceBin(GelChooseA); - //DB2105WriteHelper.AddHaAddStartIn(true); - //ManualLogControl("热水称A强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue2.Text), GelChooseA); - //MessageBox.Show("热水称A强制补充"); + if (GelChooseA == 0) + { + MessageBox.Show("请先选择糊化锅！"); + return; + } + if (!DB2105.Force_HA.forceOn) + { + MessageBox.Show("热水称A强制控制按钮未打开！"); + return; + } + if (MessageBox.Show("确认向热水称A补充？", "强制模式启动确认", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + DB2105WriteHelper.AddHaAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue2.Text)); + DB2105WriteHelper.AddHaAddForceBin(GelChooseA); + DB2105WriteHelper.AddHaAddStartIn(true); + ManualLogControl("热水称A强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue2.Text), GelChooseA); + MessageBox.Show("热水称A强制补充"); } if (ButtonE.StartMetage3 == runtime.Sender) { - - MessageBox.Show("此按钮暂停使用！"); - return; - - //if (!DB2105.Force_CB.forceOn) - //{ - // MessageBox.Show("冷水称B强制控制按钮未打开！"); - // return; - //} - //if (MessageBox.Show("确认向冷水称B补充？", "强制模式启动确认", - // MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - //{ - // return; - //} - //DB2105WriteHelper.AddCbAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue3.Text)); - //DB2105WriteHelper.AddCbAddForceBin(GelChooseB); - //DB2105WriteHelper.AddCbAddStartIn(true); - //ManualLogControl("冷水称B强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue3.Text), GelChooseB + 4); - //MessageBox.Show("冷水称B强制补充"); + if (GelChooseB == 0) + { + MessageBox.Show("请先选择糊化锅！"); + return; + } + if (!DB2105.Force_CB.forceOn) + { + MessageBox.Show("冷水称B强制控制按钮未打开！"); + return; + } + if (MessageBox.Show("确认向冷水称B补充？", "强制模式启动确认", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + DB2105WriteHelper.AddCbAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue3.Text)); + DB2105WriteHelper.AddCbAddForceBin(GelChooseB); + DB2105WriteHelper.AddCbAddStartIn(true); + ManualLogControl("冷水称B强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue3.Text), GelChooseB + 4); + MessageBox.Show("冷水称B强制补充"); } if (ButtonE.StartMetage4 == runtime.Sender) { - - MessageBox.Show("此按钮暂停使用！"); - return; - - //if (!DB2105.Force_HB.forceOn) - //{ - // MessageBox.Show("热水称B强制控制按钮未打开！"); - // return; - //} - //if (MessageBox.Show("确认向热水称B补充？", "强制模式启动确认", - // MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - //{ - // return; - //} - //DB2105WriteHelper.AddHbAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue4.Text)); - //DB2105WriteHelper.AddHbAddForceBin(GelChooseB); - //DB2105WriteHelper.AddHbAddStartIn(true); - //ManualLogControl("热水称B强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue4.Text), GelChooseB + 4); - //MessageBox.Show("热水称B强制补充"); + if (GelChooseB == 0) + { + MessageBox.Show("请先选择糊化锅！"); + return; + } + if (!DB2105.Force_HB.forceOn) + { + MessageBox.Show("热水称B强制控制按钮未打开！"); + return; + } + if (MessageBox.Show("确认向热水称B补充？", "强制模式启动确认", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + DB2105WriteHelper.AddHbAddValue(Convert.ToInt16(MCTextBoxE.SetWaterValue4.Text)); + DB2105WriteHelper.AddHbAddForceBin(GelChooseB); + DB2105WriteHelper.AddHbAddStartIn(true); + ManualLogControl("热水称B强制补充", Convert.ToInt16(MCTextBoxE.SetWaterValue4.Text), GelChooseB + 4); + MessageBox.Show("热水称B强制补充"); } if (ButtonE.StartOut1 == runtime.Sender) { + if (GelChooseA == 0) + { + MessageBox.Show("请先选择糊化锅！"); + return; + } if (!DB2105.Force_CA.forceOn) { MessageBox.Show("冷水称A强制控制按钮未打开！"); @@ -231,6 +170,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } if (ButtonE.StartOut2 == runtime.Sender) { + if (GelChooseA == 0) + { + MessageBox.Show("请先选择糊化锅！"); + return; + } if (!DB2105.Force_HA.forceOn) { MessageBox.Show("热水称A强制控制按钮未打开！"); @@ -249,6 +193,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } if (ButtonE.StartOut3 == runtime.Sender) { + if (GelChooseB == 0) + { + MessageBox.Show("请先选择糊化锅！"); + return; + } if (!DB2105.Force_CB.forceOn) { MessageBox.Show("冷水称B强制控制按钮未打开！"); @@ -267,6 +216,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } if (ButtonE.StartOut4 == runtime.Sender) { + if (GelChooseB == 0) + { + MessageBox.Show("请先选择糊化锅！"); + return; + } if (!DB2105.Force_HB.forceOn) { MessageBox.Show("热水称B强制控制按钮未打开！"); @@ -283,13 +237,6 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl ManualLogControl("热水称B强制排水", Convert.ToInt16(MCTextBoxE.StayWaterValue4.Text), GelChooseB + 4); MessageBox.Show("热水称B强制排水"); } - - } - - private void DefaultSwitch(HslSwitch hslSwitch, bool state) - { - string status = state ? "强制状态开" : "强制状态关"; - hslSwitch.Text = status; } private void SingleSelect() @@ -334,14 +281,6 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl GelChooseB = 4; } } - - private void SetAllControls() - { - ControlsHelper.ControlImport(HslSwitchE, Controls); - ControlsHelper.ControlImport(MCTextBoxE, Controls); - ControlsHelper.ControlImport(ButtonE, Controls); - ControlsHelper.ControlImport(RadioButtonE, Controls); - } /// /// 日志插入 @@ -367,5 +306,6 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl FreeSqlUnit.Instance.Insert(Log).ExecuteIdentity(); } + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterInitAction.cs new file mode 100644 index 0000000..0fa93af --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterInitAction.cs @@ -0,0 +1,112 @@ +using DataBlockHelper.DBHelpers; +using DataBlockHelper.Entity.DB2106Entity; +using HslCommunication.Instrument.DLT; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.FreeDb; +using Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity; +using Mesnac.Action.ChemicalWeighing.Report.Entity; +using Mesnac.Basic; +using Mesnac.Controls.ChemicalWeighing; +using Mesnac.Controls.Default; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.ManualControl +{ + public class ForceWaterControl : ChemicalWeighingAction, IAction + { + FHslSwitchEntity HslSwitchE = new FHslSwitchEntity(); + DB2105Helper DB2105 = new DB2105Helper(); + + private List Controls; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须要调用 + + Controls = GetAllControls(); + + ControlsHelper.ControlImport(HslSwitchE, Controls); + + StateRefresh(); + + HslSwitchE.ForceControlHA.OnSwitchChanged += ForceControl_OnSwitchChanged; + HslSwitchE.ForceControlCA.OnSwitchChanged += ForceControl_OnSwitchChanged; + HslSwitchE.ForceControlHB.OnSwitchChanged += ForceControl_OnSwitchChanged; + HslSwitchE.ForceControlCB.OnSwitchChanged += ForceControl_OnSwitchChanged; + + } + + private void ForceControl_OnSwitchChanged(object obj, bool state) + { + DB2105 = new DB2105Helper(); + HslSwitch hslSwitch = obj as HslSwitch; + if (state) + { + if (MessageBox.Show("是否要打开强制排水模式？", "强制模式启动确认", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + HslSwitch hs = obj as HslSwitch; + hs.SwitchStatus = false; + state = false; + } + } + string name = hslSwitch.Name; + switch (name) + { + case "ForceControlHA": + DB2105WriteHelper.AddHaAddForceOn(state); + break; + case "ForceControlCA": + DB2105WriteHelper.AddCaAddForceOn(state); + break; + case "ForceControlHB": + DB2105WriteHelper.AddHbAddForceOn(state); + break; + case "ForceControlCB": + DB2105WriteHelper.AddCbAddForceOn(state); + break; + default: break; + } + DefaultSwitch(hslSwitch, state); + } + + private void StateRefresh() + { + if (HslSwitchE.ForceControlHA.SwitchStatus != DB2105.Force_HA.forceOn) + { + HslSwitchE.ForceControlHA.SwitchStatus = DB2105.Force_HA.forceOn; + } + if (HslSwitchE.ForceControlCA.SwitchStatus != DB2105.Force_CA.forceOn) + { + HslSwitchE.ForceControlCA.SwitchStatus = DB2105.Force_CA.forceOn; + } + if (HslSwitchE.ForceControlHB.SwitchStatus != DB2105.Force_HB.forceOn) + { + HslSwitchE.ForceControlHB.SwitchStatus = DB2105.Force_HB.forceOn; + } + if (HslSwitchE.ForceControlCB.SwitchStatus != DB2105.Force_CB.forceOn) + { + HslSwitchE.ForceControlCB.SwitchStatus = DB2105.Force_CB.forceOn; + } + DefaultSwitch(HslSwitchE.ForceControlHA, DB2105.Force_HA.forceOn); + DefaultSwitch(HslSwitchE.ForceControlCA, DB2105.Force_CA.forceOn); + DefaultSwitch(HslSwitchE.ForceControlHB, DB2105.Force_HB.forceOn); + DefaultSwitch(HslSwitchE.ForceControlCB, DB2105.Force_CB.forceOn); + } + + + + private void DefaultSwitch(HslSwitch hslSwitch, bool state) + { + string status = state ? "强制状态开" : "强制状态关"; + hslSwitch.Text = status; + hslSwitch.SwitchStatus = state; + } + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index f3b86ab..5e68603 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -553,6 +553,7 @@ + diff --git a/Main/MCEdit/Data/EventConfig/小料称量/手动控制.xml b/Main/MCEdit/Data/EventConfig/小料称量/手动控制.xml index 913b55c..7c143c9 100644 --- a/Main/MCEdit/Data/EventConfig/小料称量/手动控制.xml +++ b/Main/MCEdit/Data/EventConfig/小料称量/手动控制.xml @@ -11,8 +11,12 @@ 按钮事件 - 水称强制控制 - 水称强制控制 + 水称强制控制初始化 + 水称强制控制初始化 + + + 水称强制控制按钮 + 水称强制控制按钮 @@ -27,6 +31,9 @@ + + + @@ -35,6 +42,7 @@ + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeForm/WaterForceControl.xml b/Main/MCEdit/Data/MCProject/nodeForm/WaterForceControl.xml index 0644c91..5fa52dd 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/WaterForceControl.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/WaterForceControl.xml @@ -1,8 +1,7 @@ - - + Red DarkGray @@ -22,8 +21,7 @@ 594, 80 - - + Red DarkGray @@ -46,7 +44,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYwMjY4RjE0MUM0NDQ4RUJBQzM4NUY5MEQ5QTU5NzM0BgYAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuBgcAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuCw== @@ -188,7 +186,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYwMjY4RjE0MUM0NDQ4RUJBQzM4NUY5MEQ5QTU5NzM0BgYAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuBgcAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuCw== @@ -330,7 +328,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYwMjY4RjE0MUM0NDQ4RUJBQzM4NUY5MEQ5QTU5NzM0BgYAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuBgcAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuCw== @@ -405,7 +403,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYwMjY4RjE0MUM0NDQ4RUJBQzM4NUY5MEQ5QTU5NzM0BgYAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuBgcAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuCw== @@ -516,7 +514,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYwMjY4RjE0MUM0NDQ4RUJBQzM4NUY5MEQ5QTU5NzM0BgYAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuBgcAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuCw== @@ -591,7 +589,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYwMjY4RjE0MUM0NDQ4RUJBQzM4NUY5MEQ5QTU5NzM0BgYAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuBgcAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuCw== @@ -666,7 +664,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYwMjY4RjE0MUM0NDQ4RUJBQzM4NUY5MEQ5QTU5NzM0BgYAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuBgcAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuCw== @@ -767,7 +765,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYwMjY4RjE0MUM0NDQ4RUJBQzM4NUY5MEQ5QTU5NzM0BgYAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuBgcAAAAY5rC056ew5by65Yi25o6n5Yi25oyJ6ZKuCw== @@ -983,7 +981,7 @@ 15 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAS5rC056ew5by65Yi25o6n5Yi2BgcAAAAS5rC056ew5by65Yi25o6n5Yi2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQ1MTAyQUQ0RERERDRBNTI4OURCRUQxNDI4QkM0RkM0BgYAAAAb5rC056ew5by65Yi25o6n5Yi25Yid5aeL5YyWBgcAAAAb5rC056ew5by65Yi25o6n5Yi25Yid5aeL5YyWCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL