称重， Error 写少了 state,

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

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.1.0.0")]
-[assembly: AssemblyFileVersion("5.1.0.0")]
+[assembly: AssemblyVersion("5.2.0.0")]
+[assembly: AssemblyFileVersion("5.2.0.0")]

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

@@ -51,5 +51,5 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.1.0.0")]
-[assembly: AssemblyFileVersion("5.1.0.0")]
+[assembly: AssemblyVersion("5.1.2.0")]
+[assembly: AssemblyFileVersion("5.1.2.0")]

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

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.1.0.0")]
-[assembly: AssemblyFileVersion("5.1.0.0")]
+[assembly: AssemblyVersion("5.1.2.0")]
+[assembly: AssemblyFileVersion("5.1.2.0")]

Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs

@@ -483,7 +483,7 @@ namespace FLY.Weight.Server
         }
         Dictionary<INotifyPropertyChanged, ErrorAction> obj_error = new Dictionary<INotifyPropertyChanged, ErrorAction>();
 
-        void AddErrorAction(INotifyPropertyChanged sender, ref byte code, ErrorAction.ErrorHandler errorHandler = null)
+        void AddErrorAction(INotifyPropertyChanged sender, ref byte code, ErrorAction.ErrorHandler errorHandler = null, object state = null)
         {
             //反射找出全部是报警的property
             List<ErrorInfo> error_property = new List<ErrorInfo>();
@@ -510,7 +510,8 @@ namespace FLY.Weight.Server
             obj_error.Add(sender, new ErrorAction()
             {
                 error_property = error_property,
-                action = errorHandler
+                action = errorHandler,
+                state = state
             });
         }
 
@@ -529,7 +530,8 @@ namespace FLY.Weight.Server
                         (ref string description, object state) => {
                             int idx = (int)state;
                             description = Items[idx].Number + "层 " + description;
-                    });
+                        },
+                        i);
             }
 
             foreach (var obj in obj_error.Keys)

脚本/1.update_dll.sh

-#!/bin/bash
-
-dest_dir="../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/bin/Debug"
-src_dir="src_dir"
-src=("src0" "src1")
-
-copy_to()
-{
-    for f in ${src[*]}
-    do
-        path=$src_dir/$f
-        cp $path $dest_dir
-        if [ $? != 0 ]; then 
-            echo "ERROR!"
-            exit 1
-        fi
-    done
-}
-
-echo "-------------------Copy To FLY.Thick.Blowing.UI.Fix.Client----------------------------"
-#-----------------------------------------------------------------
-#AirRing
-src_dir="../Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/bin/Debug"
-
-src=("FLY.FeedbackRenZiJia.dll" \
-"FLY.FeedbackRenZiJia.UI.Client.dll")
-
-copy_to
-echo "Copy AirRing dll SUCCESS"
-
-#-----------------------------------------------------------------
-#IBC
-
-src_dir="../Project.FLY.IBC/FLY.IBC.UI.Client/bin/Debug"
-
-src=("FLY.IBC.dll" \
-"FLY.IBC.UI.Client.dll")
-
-copy_to
-echo "Copy IBC dll SUCCESS"
-
-
-#-----------------------------------------------------------------
-#Winder
-src_dir="../Project.FLY.Winder_20190413/FLY.Winder.UI.Client/bin/Debug"
-
-src=("FLY.Winder.dll" \
-"FLY.Winder.UI.Client.dll")
-
-copy_to
-echo "Copy Winder dll SUCCESS"
-
-#-----------------------------------------------------------------
-#Weight
-
-src_dir="../Project.FLY.Weight/FLY.Weight.UI.Client/bin/Debug"
-
-src=("FLY.Weight.dll" \
-"FLY.Weight.UI.Client.dll")
-
-copy_to
-echo "Copy Weight dll SUCCESS"
-
-
-dest_dir="../Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/bin/Debug"
-
-echo "-------------------Copy To FLY.Thick.BlowingScan.UI.Client----------------------------"
-#-----------------------------------------------------------------
-#AirRing
-src_dir="../Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/bin/Debug"
-
-src=("FLY.FeedbackRenZiJia.dll" \
-"FLY.FeedbackRenZiJia.UI.Client.dll")
-
-copy_to
-echo "Copy AirRing dll SUCCESS"
-
-#-----------------------------------------------------------------
-#IBC
-
-src_dir="../Project.FLY.IBC/FLY.IBC.UI.Client/bin/Debug"
-
-src=("FLY.IBC.dll" \
-"FLY.IBC.UI.Client.dll")
-
-copy_to
-echo "Copy IBC dll SUCCESS"
-
-
-#-----------------------------------------------------------------
-#Winder
-src_dir="../Project.FLY.Winder_20190413/FLY.Winder.UI.Client/bin/Debug"
-
-src=("FLY.Winder.dll" \
-"FLY.Winder.UI.Client.dll")
-
-copy_to
-echo "Copy Winder dll SUCCESS"
-
-#-----------------------------------------------------------------
-#Weight
-
-src_dir="../Project.FLY.Weight/FLY.Weight.UI.Client/bin/Debug"
-
-src=("FLY.Weight.dll" \
-"FLY.Weight.UI.Client.dll")
-
-copy_to
-echo "Copy Weight dll SUCCESS"
-

脚本/2.get_exe.sh

@@ -55,12 +55,8 @@ src_dir="../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client"
 dest_dir="FLY.Thick.Blowing.UI.Fix.Client"
 files=(\
 	"FLY.Thick.Blowing.UI.Fix.Client.exe" \
-	"FLY.FeedbackRenZiJia.dll" "FLY.FeedbackRenZiJia.UI.Client.dll" \
-	"FLY.IBC.dll" "FLY.IBC.UI.Client.dll" \
-	"FLY.Weight.dll" "FLY.Weight.UI.Client.dll" \
-	"FLY.Winder.dll" "FLY.Winder.UI.Client.dll" \
 	"main_module" "csysparam.xml" "layout" "music" "版本说明.txt" "测厚仪说明书.pdf" \
-	"nlog.config" \
+	"nlog.config" "weighterColorDb.json"\
 	)
 copy_to2 $src_dir $dest_dir $files
 
@@ -121,10 +117,6 @@ src_dir="../Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client"
 dest_dir="FLY.Thick.BlowingScan.UI.Client"
 files=(\
 	"FLY.Thick.BlowingScan.UI.Client.exe" \
-	"FLY.FeedbackRenZiJia.dll" "FLY.FeedbackRenZiJia.UI.Client.dll" \
-	"FLY.IBC.dll" "FLY.IBC.UI.Client.dll" \
-	"FLY.Weight.dll" "FLY.Weight.UI.Client.dll" \
-	"FLY.Winder.dll" "FLY.Winder.UI.Client.dll" \
 	"main_module" "csysparam.xml" "layout" "music" "版本说明.txt" "测厚仪说明书.pdf" \
 	"nlog.config" \
 	)