diff --git a/.gitignore b/.gitignore index 5a2fb30..a50da15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ shangjian/.vs/ -shangjian/XGL/obj/ \ No newline at end of file +shangjian/XGL/obj/ +shangjian/XGL/bin/ +shangjian/CommonFunc/obj/ +shangjian/CommonFunc/bin/ +shangjian/XGL.Data/obj/ +shangjian/XGL.Data/bin/ \ No newline at end of file diff --git a/shangjian/.vs/BL/FileContentIndex/e04d52f4-328e-4367-9d83-e909c18ad498.vsidx b/shangjian/.vs/BL/FileContentIndex/e04d52f4-328e-4367-9d83-e909c18ad498.vsidx deleted file mode 100644 index bf67a8f..0000000 Binary files a/shangjian/.vs/BL/FileContentIndex/e04d52f4-328e-4367-9d83-e909c18ad498.vsidx and /dev/null differ diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 218dcf4..9c0562e 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/.vs/BL/v17/HierarchyCache.v1.txt b/shangjian/.vs/BL/v17/HierarchyCache.v1.txt index f9b2790..4ba5166 100644 Binary files a/shangjian/.vs/BL/v17/HierarchyCache.v1.txt and b/shangjian/.vs/BL/v17/HierarchyCache.v1.txt differ diff --git a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 76abf23..d980c61 100644 Binary files a/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormBlankingBoard.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormBlankingBoard.baml deleted file mode 100644 index b871565..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormBlankingBoard.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormBoard.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormBoard.baml deleted file mode 100644 index eb0a318..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormBoard.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormChargingBoard.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormChargingBoard.baml deleted file mode 100644 index baf7da4..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormChargingBoard.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormLocator.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormLocator.baml deleted file mode 100644 index 794a84c..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormLocator.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormOutBoxBoard.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormOutBoxBoard.baml deleted file mode 100644 index 7fcf357..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormOutBoxBoard.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/FormShowSelect.baml b/shangjian/XGL/obj/x86/Debug/FormItem/FormShowSelect.baml deleted file mode 100644 index 768a92e..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/FormShowSelect.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/Main.baml b/shangjian/XGL/obj/x86/Debug/FormItem/Main.baml deleted file mode 100644 index 359c2d7..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/FormItem/Main.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs b/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs index c65238f..ffa4e1e 100644 --- a/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs +++ b/shangjian/XGL/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCArea.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCArea.baml deleted file mode 100644 index 7fa91f9..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCArea.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCBoard.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCBoard.baml deleted file mode 100644 index 31d3daa..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCBoard.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCCar.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCCar.baml deleted file mode 100644 index 1b0b9f4..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCCar.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCCarL.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCCarL.baml deleted file mode 100644 index 2d79579..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCCarL.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCLMix.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCLMix.baml deleted file mode 100644 index 1b218a7..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCLMix.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCMix.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCMix.baml deleted file mode 100644 index 3cd45bc..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCMix.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCMixR.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCMixR.baml deleted file mode 100644 index 4b25abb..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCMixR.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCPermissionList.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCPermissionList.baml deleted file mode 100644 index e3002bd..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCPermissionList.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCPostionList.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCPostionList.baml deleted file mode 100644 index ba81895..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCPostionList.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCProgressBar.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCProgressBar.baml deleted file mode 100644 index d48c235..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCProgressBar.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCRProgressBar.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCRProgressBar.baml deleted file mode 100644 index e1a1e89..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCRProgressBar.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCRoleList.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCRoleList.baml deleted file mode 100644 index 4afc1eb..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCRoleList.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCStorage.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCStorage.baml deleted file mode 100644 index d40ec6a..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCStorage.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNew.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNew.baml deleted file mode 100644 index fa47ee3..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNew.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNewx.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNewx.baml deleted file mode 100644 index a3dc13a..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCStorageNewx.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCTakeOff.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCTakeOff.baml deleted file mode 100644 index 5aa59f3..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCTakeOff.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/UCUserList.baml b/shangjian/XGL/obj/x86/Debug/UControl/UCUserList.baml deleted file mode 100644 index 85f3eae..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/UCUserList.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/ordertj.baml b/shangjian/XGL/obj/x86/Debug/UControl/ordertj.baml deleted file mode 100644 index 416c547..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/ordertj.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/orderzfzy.baml b/shangjian/XGL/obj/x86/Debug/UControl/orderzfzy.baml deleted file mode 100644 index 0cff89b..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/orderzfzy.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/orderzy.baml b/shangjian/XGL/obj/x86/Debug/UControl/orderzy.baml deleted file mode 100644 index 5751cae..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/orderzy.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/product_order.baml b/shangjian/XGL/obj/x86/Debug/UControl/product_order.baml deleted file mode 100644 index 1666c86..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/product_order.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/product_ordertj.baml b/shangjian/XGL/obj/x86/Debug/UControl/product_ordertj.baml deleted file mode 100644 index 874b1b3..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/product_ordertj.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/product_orderzfzy.baml b/shangjian/XGL/obj/x86/Debug/UControl/product_orderzfzy.baml deleted file mode 100644 index 0197505..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/product_orderzfzy.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/UControl/product_orderzy.baml b/shangjian/XGL/obj/x86/Debug/UControl/product_orderzy.baml deleted file mode 100644 index 384927e..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/UControl/product_orderzy.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.baml deleted file mode 100644 index 75cd6fb..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Complete.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_DeviceItems.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_DeviceItems.baml deleted file mode 100644 index 0143c69..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_DeviceItems.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Flow.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Flow.baml deleted file mode 100644 index 2cc843c..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Flow.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.baml deleted file mode 100644 index 2330828..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Index.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Index.baml deleted file mode 100644 index 538b13b..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Index.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Material.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Material.baml deleted file mode 100644 index 62cff6d..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Material.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_NowUser.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_NowUser.baml deleted file mode 100644 index 0775c41..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_NowUser.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Paused.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Paused.baml deleted file mode 100644 index 79da20d..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Paused.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.baml deleted file mode 100644 index d2edfd9..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_User.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_User.baml deleted file mode 100644 index cf7dbba..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_User.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_UserRecord.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_UserRecord.baml deleted file mode 100644 index 895043b..0000000 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_UserRecord.baml and /dev/null differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache index deee8b3..0a7fb37 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache +++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.cache @@ -12,9 +12,9 @@ DEBUG;TRACE D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml 51-449314787 3-297253631 -62596019463 +63-816002294 50-505907109 CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml; -False +True diff --git a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref index 720f043..570b6e2 100644 --- a/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref +++ b/shangjian/XGL/obj/x86/Debug/XGL_MarkupCompile.lref @@ -1,4 +1,4 @@ -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs + FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;; FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;