分离监控页面的数据获取与数据展示，用以解决redis链接异常导致程序响应问题

WCS_Client/Frm/MBtn_Monitor/FrmEquMsg_dtl.cs

@@ -34,19 +34,19 @@ namespace WCS_Client.Frm
             //var plcItem = Current.PlcSet.FirstOrDefault(v => v.WCS_EquipmentInfoSet.Any(t => t.DEVICECODE == equName));
 
             //var plcItem = SugarBase.DB.Queryable<WCS_SC521>().First(v => v.DEVICECODE == equName && v.ISLAST == true);
-            RedisClient Redis = new RedisClient("81.69.99.176,database=11");
-            MessagePackSerializer.DefaultOptions = StandardResolver.Options.WithCompression(MessagePackCompression.Lz4Block);
-            Redis.Serialize = obj =>
-            {
-                var bytes = MessagePackSerializer.Serialize(obj);
-                return bytes;
-            };
-            Redis.DeserializeRaw = (bytes, type) =>
-            {
-                var obj = MessagePackSerializer.Deserialize(type, bytes);
-                return obj;
-            };
-            var pack = Redis.Get<DeviceDataPack>("DeviceDataPack");
+            //RedisClient Redis = new RedisClient("81.69.99.176,database=11");
+            //MessagePackSerializer.DefaultOptions = StandardResolver.Options.WithCompression(MessagePackCompression.Lz4Block);
+            //Redis.Serialize = obj =>
+            //{
+            //    var bytes = MessagePackSerializer.Serialize(obj);
+            //    return bytes;
+            //};
+            //Redis.DeserializeRaw = (bytes, type) =>
+            //{
+            //    var obj = MessagePackSerializer.Deserialize(type, bytes);
+            //    return obj;
+            //};
+            var pack = eqpData.deviceDataPack;
             var convdata = pack.StationDatas;//输送机数据
             var rgvdata = pack.RGVDatas;//穿梭车数据
             var plcItem = pack.StationDatas.Datas.Where(o => o.Code == equName).FirstOrDefault();

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.cs

@@ -39,7 +39,7 @@ namespace WCS_Client.Frm
             InitializeComponent();
             Init();
 
-           
+
         }
 
         private void Init()
@@ -111,7 +111,7 @@ namespace WCS_Client.Frm
             else
                 return null;
         }
-     
+
         private void Frm_YongGuanMontior_Load(object sender, EventArgs e)
         {
             _timer = new System.Timers.Timer(5000);
@@ -119,19 +119,22 @@ namespace WCS_Client.Frm
             _timer.AutoReset = true;//设置是执行一次（false）还是一直执行(true)；
             _timer.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件；
 
-            var dev = new DeviceDataPack();
-            Redis = new RedisClient("81.69.99.176,database=11");
-            MessagePackSerializer.DefaultOptions = StandardResolver.Options.WithCompression(MessagePackCompression.Lz4Block);
-            Redis.Serialize = obj =>
+            if (eqpData.Redis == null)
             {
-                var bytes = MessagePackSerializer.Serialize(obj);
-                return bytes;
-            };
-            Redis.DeserializeRaw = (bytes, type) =>
-            {
-                var obj = MessagePackSerializer.Deserialize(type, bytes);
-                return obj;
-            };
+                Redis = new RedisClient("81.69.99.176,database=11");
+                MessagePackSerializer.DefaultOptions = StandardResolver.Options.WithCompression(MessagePackCompression.Lz4Block);
+                Redis.Serialize = obj =>
+                {
+                    var bytes = MessagePackSerializer.Serialize(obj);
+                    return bytes;
+                };
+                Redis.DeserializeRaw = (bytes, type) =>
+                {
+                    var obj = MessagePackSerializer.Deserialize(type, bytes);
+                    return obj;
+                };
+            }
+            eqpData.init(Redis);
         }
 
         private static int _theout = 0;
@@ -163,8 +166,6 @@ namespace WCS_Client.Frm
             {
                 if (InvokeRequired)
                 {
-
-
                     //异步调用委托(后面添加方法需要将方法委托其中)
                     this.BeginInvoke(new ShowTextDelegate(pan11));
                 }
@@ -185,7 +186,7 @@ namespace WCS_Client.Frm
         {
             try
             {
-                var pack = Redis.Get<DeviceDataPack>("DeviceDataPack");
+                var pack = eqpData.deviceDataPack;
                 // var frame = pack.Frame;//数据帧(数据产生的时间)
                 var convdata = pack.StationDatas;//输送机数据
                 var rgvdata = pack.RGVDatas;//穿梭车数据
@@ -554,14 +555,14 @@ namespace WCS_Client.Frm
                         }
                     }
                 }
-
-
+                eqpData.deviceDataPack = pack;
             }
             catch (Exception ex)
             {
 
             }
         }
+
         private void lblsrm01_Click(object sender, EventArgs e)
         {
             Label srm = (Label)sender;
@@ -572,7 +573,7 @@ namespace WCS_Client.Frm
 
         private void Frm_YongGuanMontior_FormClosing(object sender, FormClosingEventArgs e)
         {
-            _timer.Stop();         
+            _timer.Stop();
             _timer.Elapsed -= new System.Timers.ElapsedEventHandler(theout);//到达时间的时候执行事件；
         }
 
@@ -585,6 +586,11 @@ namespace WCS_Client.Frm
         {
 
         }
+
+        private void con2035_Load(object sender, EventArgs e)
+        {
+
+        }
     }
     public class DDJSatatus
     {

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.resx

@@ -165,7 +165,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -229,7 +229,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -293,7 +293,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -357,7 +357,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -421,7 +421,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -485,7 +485,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -549,7 +549,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -613,7 +613,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -677,15 +677,15 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbBJREFUeF7t3TFKA2EU
-        RlF3l9pl2ASxsrdxGYmDyTayM4WBNOEOmf6d4pT3K/7ywTAvl8v1DwAAAACGuTmMAQAAADCRwxgAAAAA
-        IzmMAQAAADCSwxgAAAAAI20fxg6vx11O5yX7R9UWe63aYq9VW+y1aou9Vm2x16ot9lq1xV6rtthr1RZ7
-        rdpir1Vb7LVqi71WbbHXqi32WrXF3mr7MPb2/rXLz/Kb/aNqi71WbbHXqi32WrXFXqu22GvVFnut2mKv
-        VVvstWqLvVZtsdfu7/OMvXZ/n2fstWqLvVZtsdeqLfZWPqUEAAAAYCSHMQAAAABGchgDAAAAYCSHMQAA
-        AABGchgDAAAAYKTtw9jH5/cuy86/BFRb7LVqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZt
-        sdeqLfZatcVeq7bYa9UWe6vtw9jh9bjL6bxk/6jaYq9VW+y1aou9Vm2x16ot9lq1xV67v88z9lq1xV6r
-        tthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vj6lBAAAAGAkhzEAAAAARnIYAwAAAGAkhzEAAAAAJrre/gH1
-        nQs+x1m9lAAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="tableCellLabel24.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -735,15 +735,15 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbBJREFUeF7t3TFKA2EU
-        RlF3l9pl2ASxsrdxGYmDyTayM4WBNOEOmf6d4pT3K/7ywTAvl8v1DwAAAACGuTmMAQAAADCRwxgAAAAA
-        IzmMAQAAADCSwxgAAAAAI20fxg6vx11O5yX7R9UWe63aYq9VW+y1aou9Vm2x16ot9lq1xV6rtthr1RZ7
-        rdpir1Vb7LVqi71WbbHXqi32WrXF3mr7MPb2/rXLz/Kb/aNqi71WbbHXqi32WrXFXqu22GvVFnut2mKv
-        VVvstWqLvVZtsdfu7/OMvXZ/n2fstWqLvVZtsdeqLfZWPqUEAAAAYCSHMQAAAABGchgDAAAAYCSHMQAA
-        AABGchgDAAAAYKTtw9jH5/cuy86/BFRb7LVqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZt
-        sdeqLfZatcVeq7bYa9UWe6vtw9jh9bjL6bxk/6jaYq9VW+y1aou9Vm2x16ot9lq1xV67v88z9lq1xV6r
-        tthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vj6lBAAAAGAkhzEAAAAARnIYAwAAAGAkhzEAAAAAJrre/gH1
-        nQs+x1m9lAAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="tableCellLabel1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -793,15 +793,15 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbBJREFUeF7t3TFKA2EU
-        RlF3l9pl2ASxsrdxGYmDyTayM4WBNOEOmf6d4pT3K/7ywTAvl8v1DwAAAACGuTmMAQAAADCRwxgAAAAA
-        IzmMAQAAADCSwxgAAAAAI20fxg6vx11O5yX7R9UWe63aYq9VW+y1aou9Vm2x16ot9lq1xV6rtthr1RZ7
-        rdpir1Vb7LVqi71WbbHXqi32WrXF3mr7MPb2/rXLz/Kb/aNqi71WbbHXqi32WrXFXqu22GvVFnut2mKv
-        VVvstWqLvVZtsdfu7/OMvXZ/n2fstWqLvVZtsdeqLfZWPqUEAAAAYCSHMQAAAABGchgDAAAAYCSHMQAA
-        AABGchgDAAAAYKTtw9jH5/cuy86/BFRb7LVqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZt
-        sdeqLfZatcVeq7bYa9UWe6vtw9jh9bjL6bxk/6jaYq9VW+y1aou9Vm2x16ot9lq1xV67v88z9lq1xV6r
-        tthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vj6lBAAAAGAkhzEAAAAARnIYAwAAAGAkhzEAAAAAJrre/gH1
-        nQs+x1m9lAAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="tableCellLabel2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -851,15 +851,15 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbBJREFUeF7t3TFKA2EU
-        RlF3l9pl2ASxsrdxGYmDyTayM4WBNOEOmf6d4pT3K/7ywTAvl8v1DwAAAACGuTmMAQAAADCRwxgAAAAA
-        IzmMAQAAADCSwxgAAAAAI20fxg6vx11O5yX7R9UWe63aYq9VW+y1aou9Vm2x16ot9lq1xV6rtthr1RZ7
-        rdpir1Vb7LVqi71WbbHXqi32WrXF3mr7MPb2/rXLz/Kb/aNqi71WbbHXqi32WrXFXqu22GvVFnut2mKv
-        VVvstWqLvVZtsdfu7/OMvXZ/n2fstWqLvVZtsdeqLfZWPqUEAAAAYCSHMQAAAABGchgDAAAAYCSHMQAA
-        AABGchgDAAAAYKTtw9jH5/cuy86/BFRb7LVqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZt
-        sdeqLfZatcVeq7bYa9UWe6vtw9jh9bjL6bxk/6jaYq9VW+y1aou9Vm2x16ot9lq1xV67v88z9lq1xV6r
-        tthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vj6lBAAAAGAkhzEAAAAARnIYAwAAAGAkhzEAAAAAJrre/gH1
-        nQs+x1m9lAAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="tableCellLabel3.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -909,15 +909,15 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbBJREFUeF7t3TFKA2EU
-        RlF3l9pl2ASxsrdxGYmDyTayM4WBNOEOmf6d4pT3K/7ywTAvl8v1DwAAAACGuTmMAQAAADCRwxgAAAAA
-        IzmMAQAAADCSwxgAAAAAI20fxg6vx11O5yX7R9UWe63aYq9VW+y1aou9Vm2x16ot9lq1xV6rtthr1RZ7
-        rdpir1Vb7LVqi71WbbHXqi32WrXF3mr7MPb2/rXLz/Kb/aNqi71WbbHXqi32WrXFXqu22GvVFnut2mKv
-        VVvstWqLvVZtsdfu7/OMvXZ/n2fstWqLvVZtsdeqLfZWPqUEAAAAYCSHMQAAAABGchgDAAAAYCSHMQAA
-        AABGchgDAAAAYKTtw9jH5/cuy86/BFRb7LVqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZt
-        sdeqLfZatcVeq7bYa9UWe6vtw9jh9bjL6bxk/6jaYq9VW+y1aou9Vm2x16ot9lq1xV67v88z9lq1xV6r
-        tthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vj6lBAAAAGAkhzEAAAAARnIYAwAAAGAkhzEAAAAAJrre/gH1
-        nQs+x1m9lAAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="tableCellLabel4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -967,15 +967,15 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbBJREFUeF7t3TFKA2EU
-        RlF3l9pl2ASxsrdxGYmDyTayM4WBNOEOmf6d4pT3K/7ywTAvl8v1DwAAAACGuTmMAQAAADCRwxgAAAAA
-        IzmMAQAAADCSwxgAAAAAI20fxg6vx11O5yX7R9UWe63aYq9VW+y1aou9Vm2x16ot9lq1xV6rtthr1RZ7
-        rdpir1Vb7LVqi71WbbHXqi32WrXF3mr7MPb2/rXLz/Kb/aNqi71WbbHXqi32WrXFXqu22GvVFnut2mKv
-        VVvstWqLvVZtsdfu7/OMvXZ/n2fstWqLvVZtsdeqLfZWPqUEAAAAYCSHMQAAAABGchgDAAAAYCSHMQAA
-        AABGchgDAAAAYKTtw9jH5/cuy86/BFRb7LVqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZt
-        sdeqLfZatcVeq7bYa9UWe6vtw9jh9bjL6bxk/6jaYq9VW+y1aou9Vm2x16ot9lq1xV67v88z9lq1xV6r
-        tthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vj6lBAAAAGAkhzEAAAAARnIYAwAAAGAkhzEAAAAAJrre/gH1
-        nQs+x1m9lAAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="tableCellLabel6.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1025,15 +1025,15 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbBJREFUeF7t3TFKA2EU
-        RlF3l9pl2ASxsrdxGYmDyTayM4WBNOEOmf6d4pT3K/7ywTAvl8v1DwAAAACGuTmMAQAAADCRwxgAAAAA
-        IzmMAQAAADCSwxgAAAAAI20fxg6vx11O5yX7R9UWe63aYq9VW+y1aou9Vm2x16ot9lq1xV6rtthr1RZ7
-        rdpir1Vb7LVqi71WbbHXqi32WrXF3mr7MPb2/rXLz/Kb/aNqi71WbbHXqi32WrXFXqu22GvVFnut2mKv
-        VVvstWqLvVZtsdfu7/OMvXZ/n2fstWqLvVZtsdeqLfZWPqUEAAAAYCSHMQAAAABGchgDAAAAYCSHMQAA
-        AABGchgDAAAAYKTtw9jH5/cuy86/BFRb7LVqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZt
-        sdeqLfZatcVeq7bYa9UWe6vtw9jh9bjL6bxk/6jaYq9VW+y1aou9Vm2x16ot9lq1xV67v88z9lq1xV6r
-        tthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vj6lBAAAAGAkhzEAAAAARnIYAwAAAGAkhzEAAAAAJrre/gH1
-        nQs+x1m9lAAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="tableCellLabel8.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1083,15 +1083,15 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbBJREFUeF7t3TFKA2EU
-        RlF3l9pl2ASxsrdxGYmDyTayM4WBNOEOmf6d4pT3K/7ywTAvl8v1DwAAAACGuTmMAQAAADCRwxgAAAAA
-        IzmMAQAAADCSwxgAAAAAI20fxg6vx11O5yX7R9UWe63aYq9VW+y1aou9Vm2x16ot9lq1xV6rtthr1RZ7
-        rdpir1Vb7LVqi71WbbHXqi32WrXF3mr7MPb2/rXLz/Kb/aNqi71WbbHXqi32WrXFXqu22GvVFnut2mKv
-        VVvstWqLvVZtsdfu7/OMvXZ/n2fstWqLvVZtsdeqLfZWPqUEAAAAYCSHMQAAAABGchgDAAAAYCSHMQAA
-        AABGchgDAAAAYKTtw9jH5/cuy86/BFRb7LVqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZt
-        sdeqLfZatcVeq7bYa9UWe6vtw9jh9bjL6bxk/6jaYq9VW+y1aou9Vm2x16ot9lq1xV67v88z9lq1xV6r
-        tthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vj6lBAAAAGAkhzEAAAAARnIYAwAAAGAkhzEAAAAAJrre/gH1
-        nQs+x1m9lAAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAahJREFUeF7t3bFpA1EU
+        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
+        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
+        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
+        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
+        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
+        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
+        AAAASUVORK5CYII=
 </value>
   </data>
   <data name="tableCellLabel9.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1141,7 +1141,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1205,7 +1205,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1269,7 +1269,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1333,7 +1333,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1397,7 +1397,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1461,7 +1461,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1525,7 +1525,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1589,7 +1589,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1653,7 +1653,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1717,7 +1717,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1781,7 +1781,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1845,7 +1845,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -1909,7 +1909,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -2751,7 +2751,7 @@
   <data name="G1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -3586,7 +3586,7 @@
   <data name="G2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -4421,7 +4421,7 @@
   <data name="G3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -5256,7 +5256,7 @@
   <data name="G4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -6091,7 +6091,7 @@
   <data name="G5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -6926,7 +6926,7 @@
   <data name="GV2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -7761,7 +7761,7 @@
   <data name="GV3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -8596,7 +8596,7 @@
   <data name="GV4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -9431,7 +9431,7 @@
   <data name="GV5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -11088,7 +11088,7 @@
   <data name="pictureBox11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj
@@ -11101,7 +11101,7 @@
   <data name="GV1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
+        EgAACxIB0t1+/AAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
         xizW7/W5Ptbn17I4c1/qHkc+gzGhcpE9jr8XmawEw/bEj+rz7+SYDkL/Du1cO1WOQnqfMSSu4eXIa6cF
         duFE2hlMRfyQm0cKb0WdxS4yfvr1eiB5Ht49BYW1kJiCJAaPU7n0HlxgR2zPjqJsvy1GGdK/Y7f7urSY
         fuRhx8jtHP0ZMzUFDx6TvOCWrDGLJNM/UUQXWFe7a7G3Y8+EnESzWUxdSHGMCKSwCLQ92AqB3U9CYuFj

WCS_Client/WCS_Client.csproj

@@ -180,6 +180,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Database\SugarClient.cs" />
+    <Compile Include="eqpData.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="Frm\Current.cs" />
     <Compile Include="Frm\Equipment\ConvSignal.cs" />

WCS_Client/eqpData.cs

@@ -0,0 +1,32 @@
+using FreeRedis;
+using System;
+using WCS.Entity.Protocol;
+
+namespace WCS_Client
+{
+    public static class eqpData
+    {
+        public static DeviceDataPack deviceDataPack { get; set; } = null;
+        private static System.Timers.Timer _timer;
+        public static RedisClient Redis = null;
+
+        public static void init(RedisClient redis)
+        {
+            Redis = redis;
+            _timer = new System.Timers.Timer(5000);
+            _timer.Elapsed += new System.Timers.ElapsedEventHandler(GetData);//到达时间的时候执行事件；
+            _timer.AutoReset = true;//设置是执行一次（false）还是一直执行(true)；
+            _timer.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件；
+        }
+
+        public static void GetData(object sender, EventArgs e)
+        {
+            try
+            {
+                deviceDataPack = Redis.Get<DeviceDataPack>("DeviceDataPack");
+            }
+            catch (Exception ex) { 
+            }
+            }
+    }
+}