和美安装包_v6.34.0 -20210929

1. 添加 称重添加 1x9_v5,  可以有9层

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.33.0.0")]
-[assembly: AssemblyFileVersion("6.33.0.0")]
+[assembly: AssemblyVersion("6.34.0.0")]
+[assembly: AssemblyFileVersion("6.34.0.0")]
 [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.33.0")]
-[assembly: AssemblyFileVersion("6.33.0")]
+[assembly: AssemblyVersion("6.34.0")]
+[assembly: AssemblyFileVersion("6.34.0")]
 [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]

Project.FLY.Weight/FLY.Weight.UI.Client/Themes/Dictionary_CellColor.xaml

 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:FLY.Weight.UI.Client">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
+    <!--每层颜色-->
     <SolidColorBrush x:Key="Color_g1#0" Color="#FFe04f4f"/>
     <SolidColorBrush x:Key="Color_g2#0" Color="#FFfab051"/>
     <SolidColorBrush x:Key="Color_g3#0" Color="#FF10ad79"/>
@@ -9,8 +10,8 @@
     <SolidColorBrush x:Key="Color_g5#0" Color="#FF674fe0"/>
     <SolidColorBrush x:Key="Color_g6#0" Color="#FF9310ad"/>
     <SolidColorBrush x:Key="Color_g7#0" Color="#FFad105e"/>
-    
-    
+    <SolidColorBrush x:Key="Color_g8#0" Color="#FF7f2d00"/>
+    <SolidColorBrush x:Key="Color_g9#0" Color="#FF097c25"/>
 
 
     <!--<SolidColorBrush x:Key="Color_g1#1" Color="#FFeb6877"/>

Project.FLY.Weight/FLY.Weight.UI.Client/WeighterColorDB.cs

@@ -44,18 +44,36 @@ namespace FLY.Weight.UI.Client
                 {
                     Source = new Uri("pack://application:,,,/FLY.Weight.UI.Client;component/Themes/Dictionary_CellColor.xaml")
                 };
-
+                
                 mWeighters = new List<WeighterColor>();
 
-                for (int i = 0; i < 7; i++)
+                int color_cnt = 0;
+                //找出颜色数量
+                while (true) 
+                {
+                    int i = color_cnt + 1;
+                    string color_name = $"Color_g{i}#0";
+                    if (!r.Contains(color_name))
+                    {
+                        //上一个已经是极限了
+                        break;
+                    }
+                    color_cnt = i;
+                }
+
+                if (color_cnt < 3)
+                    throw new Exception("称重颜色不够3个！！！！");
+
+                for (int i = 0; i < color_cnt; i++)
                 {
                     WeighterColor c = new WeighterColor();
                     string color_name = $"Color_g{i+1}#0";
                     c.Self = r[color_name] as Brush;
-                    for (int j = 0; j < 7; j++)
+                    for (int j = 0; j < color_cnt; j++)
                     {
                         int i2 = i + 1 + j;
-                        if (i2 > 7) i2 -= 7;
+                        if (i2 > color_cnt)
+                            i2 -= color_cnt;
                         color_name = $"Color_g{i2}#0";
                         c.Items.Add(r[color_name] as Brush);
                     }
@@ -66,14 +84,34 @@ namespace FLY.Weight.UI.Client
 
         public static Brush GetSelf(int index)
         {
-            if(index<0 || index>=mWeighters.Count())
+            //颜色循环
+            index = GetNumberIndex(index);
+            if(index<0)
                 return null;
+
             return mWeighters[index].Self; 
         }
+        static int GetNumberIndex(int index) 
+        {
+            //颜色循环
+            if (mWeighters.Count() <= 0)
+                return -1;
+
+            while (index < 0)
+                index += mWeighters.Count();
+
+            while (index >= mWeighters.Count())
+                index -= mWeighters.Count();
+
+            return index;
+        }
         public static Brush GetItem(int numberIndex, int index)
         {
-            if (numberIndex < 0 || numberIndex >= mWeighters.Count())
+            //颜色循环
+            numberIndex = GetNumberIndex(numberIndex);
+            if (numberIndex < 0)
                 return null;
+
             int cnt = mWeighters[numberIndex].Items.Count();
             if (index >= cnt || index < 0)
             {

Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.33.0.0")]
-[assembly: AssemblyFileVersion("6.33.0.0")]
+[assembly: AssemblyVersion("6.34.0.0")]
+[assembly: AssemblyFileVersion("6.34.0.0")]
 [assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]

脚本/hemeiInstallZipVersionInfo.json

 {
-  "InstallZipVersion":"6.33.0",
-  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v6.33.0_20210927.7z"
+  "InstallZipVersion":"6.34.0",
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v6.34.0_20210929.7z"
 }
\ No newline at end of file

脚本/install.json

@@ -40,6 +40,7 @@
         "default",	
         "unity",
         "music",
+        "update",
         "测厚仪说明书.pdf"
       ]
     },

脚本/版本描述.txt

+和美安装包_v6.34.0 -20210929
+1. 添加 称重添加 1x9_v5,  可以有9层
+
 和美安装包_v6.33.0 -20210927
 1. 添加 在客户端左下角 “枫莱尔” 进入的界面菜单， 添加 【升级检测】
 2. 修复 测厚仪服务器，保存图片功能， livechart 的控件不会释放资源，导致14小时后，服务器占了 900Mb 内存