Forráskód Böngészése

xls:修改获取项目

xulisong 6 éve
szülő
commit
1a2067922c
85 módosított fájl, 680 hozzáadás és 971 törlés
  1. 10 3
      .gitignore
  2. 35 0
      MBI/FirmLib/Com.FirmLib/CacheData/PlatformProjectManager.cs
  3. 15 11
      MBI/Menu/SAGABIM.xml
  4. BIN
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  5. 0 0
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.csproj.CopyComplete
  6. 0 1
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.csproj.CoreCompileInputs.cache
  7. 0 186
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.csproj.FileListAbsolute.txt
  8. BIN
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.csprojResolveAssemblyReference.cache
  9. BIN
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.dll
  10. BIN
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.pdb
  11. 0 0
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
  12. 0 0
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
  13. 0 0
      MBI/SAGA.GplotRelationComputerManage/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
  14. 1 1
      MBI/SAGA.MBI/Common/CommonTool.cs
  15. 3 10
      MBI/SAGA.MBI/DataArrange/DalProjectTree.cs
  16. 11 2
      MBI/SAGA.MBI/SAGA.MBI.csproj
  17. 3 2
      MBI/SAGA.MBI/ToolCommand.cs
  18. 1 5
      MBI/SAGA.MBI/ToolsData/CheckBase/CheckContext.cs
  19. 193 0
      MBI/SAGA.MBI/ToolsData/DataCheck/MissDutyOrModeCheck.cs
  20. 23 0
      MBI/SAGA.MBI/ToolsData/DataCheck/MissDutyOrModeCheckResult.cs
  21. 12 17
      MBI/SAGA.MBI/ToolsData/CheckBase/WinModeCheckSetting.xaml
  22. 5 20
      MBI/SAGA.MBI/ToolsData/CheckBase/WinModeCheckSetting.xaml.cs
  23. 10 4
      MBI/SAGA.MBI/ToolsData/ModeCheck/DCRExport.cs
  24. 1 1
      MBI/SAGA.MBI/ToolsData/ModeCheck/SagaSignCheck.cs
  25. 120 0
      MBI/SAGA.MBI/ToolsData/ModeCheck/WinModeCheckSetting.xaml
  26. 178 0
      MBI/SAGA.MBI/ToolsData/ModeCheck/WinModeCheckSetting.xaml.cs
  27. 59 9
      MBI/SAGA.MBI/WinView/ModeInfoMaintenance/VMMatchFM.cs
  28. BIN
      MBI/SAGA.RevitMenu/obj/Debug/DesignTimeResolveAssemblyReferences.cache
  29. BIN
      MBI/SAGA.RevitMenu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  30. 0 74
      MBI/SAGA.RevitMenu/obj/Debug/Dockpane/WinDockPaneTest.g.i.cs
  31. 0 0
      MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.csproj.CopyComplete
  32. 0 1
      MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.csproj.CoreCompileInputs.cache
  33. 0 29
      MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.csproj.FileListAbsolute.txt
  34. BIN
      MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.csprojResolveAssemblyReference.cache
  35. BIN
      MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.dll
  36. BIN
      MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.pdb
  37. 0 20
      MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu_MarkupCompile.i.cache
  38. 0 0
      MBI/SAGA.RevitMenu/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
  39. 0 0
      MBI/SAGA.RevitMenu/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
  40. 0 0
      MBI/SAGA.RevitMenu/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
  41. BIN
      MBI/SAGA.RevitMenu/obj/R17/DesignTimeResolveAssemblyReferencesInput.cache
  42. 0 74
      MBI/SAGA.RevitMenu/obj/R17/Dockpane/WinDockPaneTest.g.i.cs
  43. 0 1
      MBI/SAGA.RevitMenu/obj/R17/SAGA.RevitMenu.csproj.CoreCompileInputs.cache
  44. 0 20
      MBI/SAGA.RevitMenu/obj/R17/SAGA.RevitMenu_MarkupCompile.i.cache
  45. 0 0
      MBI/SAGA.RevitMenu/obj/R17/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
  46. 0 0
      MBI/SAGA.RevitMenu/obj/R17/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
  47. 0 0
      MBI/SAGA.RevitMenu/obj/R17/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
  48. 0 0
      MBI/SAGA.RevitMenu/obj/R17/build.force
  49. BIN
      MBI/SAGA.RevitMenu/obj/R18/DesignTimeResolveAssemblyReferencesInput.cache
  50. 0 74
      MBI/SAGA.RevitMenu/obj/R18/Dockpane/WinDockPaneTest.g.i.cs
  51. 0 1
      MBI/SAGA.RevitMenu/obj/R18/SAGA.RevitMenu.csproj.CoreCompileInputs.cache
  52. 0 20
      MBI/SAGA.RevitMenu/obj/R18/SAGA.RevitMenu_MarkupCompile.i.cache
  53. 0 0
      MBI/SAGA.RevitMenu/obj/R18/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
  54. 0 0
      MBI/SAGA.RevitMenu/obj/R18/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
  55. 0 0
      MBI/SAGA.RevitMenu/obj/R18/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
  56. 0 0
      MBI/SAGA.RevitMenu/obj/R18/build.force
  57. BIN
      MBI/SAGA.RevitMenu/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
  58. 0 74
      MBI/SAGA.RevitMenu/obj/Release/Dockpane/WinDockPaneTest.g.i.cs
  59. 0 1
      MBI/SAGA.RevitMenu/obj/Release/SAGA.RevitMenu.csproj.CoreCompileInputs.cache
  60. 0 20
      MBI/SAGA.RevitMenu/obj/Release/SAGA.RevitMenu_MarkupCompile.i.cache
  61. 0 0
      MBI/SAGA.RevitMenu/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
  62. 0 0
      MBI/SAGA.RevitMenu/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
  63. 0 0
      MBI/SAGA.RevitMenu/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
  64. 0 0
      MBI/SAGA.RevitMenu/obj/Release/build.force
  65. BIN
      MBI/SAGA.RevitMenu/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  66. BIN
      MBI/SAGA.RevitMenu/obj/x64/Debug/Dockpane/WinDockPaneTest.baml
  67. 0 74
      MBI/SAGA.RevitMenu/obj/x64/Debug/Dockpane/WinDockPaneTest.g.cs
  68. 0 74
      MBI/SAGA.RevitMenu/obj/x64/Debug/Dockpane/WinDockPaneTest.g.i.cs
  69. 0 1
      MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu.csproj.CoreCompileInputs.cache
  70. 0 6
      MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu.csproj.FileListAbsolute.txt
  71. BIN
      MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu.csprojResolveAssemblyReference.cache
  72. BIN
      MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu.g.resources
  73. 0 20
      MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu_MarkupCompile.cache
  74. 0 20
      MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu_MarkupCompile.i.cache
  75. 0 0
      MBI/SAGA.RevitMenu/obj/x64/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
  76. 0 0
      MBI/SAGA.RevitMenu/obj/x64/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
  77. 0 0
      MBI/SAGA.RevitMenu/obj/x64/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
  78. BIN
      MBI/SAGA.RevitMenu/obj/x64/R17/DesignTimeResolveAssemblyReferencesInput.cache
  79. 0 74
      MBI/SAGA.RevitMenu/obj/x64/R17/Dockpane/WinDockPaneTest.g.i.cs
  80. 0 1
      MBI/SAGA.RevitMenu/obj/x64/R17/SAGA.RevitMenu.csproj.CoreCompileInputs.cache
  81. 0 20
      MBI/SAGA.RevitMenu/obj/x64/R17/SAGA.RevitMenu_MarkupCompile.i.cache
  82. 0 0
      MBI/SAGA.RevitMenu/obj/x64/R17/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
  83. 0 0
      MBI/SAGA.RevitMenu/obj/x64/R17/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
  84. 0 0
      MBI/SAGA.RevitMenu/obj/x64/R17/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
  85. 0 0
      MBI/SAGA.RevitMenu/obj/x64/R17/build.force

+ 10 - 3
.gitignore

@@ -13,7 +13,6 @@
 *.dat
 /MBI/CEFSharpWPF/obj/x64/Debug
 /MBI/FirmLib/Com.FirmLib/obj/Debug
-*.cs
 /MBI/FirmLib/Com.FirmLib.UI/obj/x64/Debug
 /MBI/OutputDll
 /MBI/packages
@@ -35,6 +34,14 @@
 /MBI/SAGA.RevitFirmLib/obj/Debug
 /MBI/.vs/SAGA.Revit/v15
 /MBI/SAGA.RevitFirmLib/obj/Debug
-/MBI/FirmLib/Com.FirmLib/obj
 /MBI/FirmLib/Com.FirmLib.UI/bin/x64/Release
-/MBI/FirmLib/Com.FirmLib.UI/obj
+/MBI/FirmLib/Com.FirmLib.UI/obj/Debug
+/MBI/FirmLib/Com.FirmLib.UI/obj/Release
+/MBI/FirmLib/Com.FirmLib.UI/obj/x64/Release/BllCommon
+/MBI/FirmLib/Com.FirmLib.UI/obj/x64/Release/Insuer
+/MBI/FirmLib/Com.FirmLib.UI/obj/x64/Release/Maintainer
+/MBI/FirmLib/Com.FirmLib.UI/obj/x64/Release/Manufacturer
+/MBI/FirmLib/Com.FirmLib.UI/obj/x64/Release/Seller
+/MBI/FirmLib/Com.FirmLib/obj/Release
+/MBI/FirmLib/Com.FirmLib/obj/x64/Debug
+/MBI/FirmLib/Com.FirmLib.UI/obj/x64/Release

+ 35 - 0
MBI/FirmLib/Com.FirmLib/CacheData/PlatformProjectManager.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Com.FirmLib.Bll;
+using FWindSoft.DataFramework;
+
+namespace Com.FirmLib.CacheData
+{
+    /// <summary>
+    /// 数据平台数据管理
+    /// </summary>
+    public class PlatformProjectManager
+    {
+        private static readonly Dictionary<string, string> m_DicSecret = new Dictionary<string, string>();
+
+        public static string GetProjectPassword(string projecId)
+        {
+            if (string.IsNullOrEmpty(projecId))
+                return string.Empty;
+            if (m_DicSecret.TryGetValue(projecId, out string secret))
+            {
+                return secret;
+            }
+
+            var result = BllFactory<ProjectBll>.Instance.GetProjectSecret(projecId);
+            if (!string.IsNullOrEmpty(result))
+            {
+                m_DicSecret[projecId] = result;
+            }
+            return result;
+        }
+    }
+}

+ 15 - 11
MBI/Menu/SAGABIM.xml

@@ -12,10 +12,14 @@
     <MenuTab>Space_W</MenuTab>
     <Modules>Space</Modules>
   </Tab>
-  <Tab TabName="资产管理">
+  <Tab TabName="资产及扫楼数据管理">
     <MenuTab>ZCGL_W</MenuTab>
     <Modules>ZCGL</Modules>
   </Tab>
+  <Tab TabName="厂商资料库">
+    <MenuTab>CSZLK_M</MenuTab>
+    <Modules>CSZLK</Modules>
+  </Tab>
   <Tab TabName="数据检查">
     <MenuTab>SJJC_W</MenuTab>
     <Modules>SJJC</Modules>
@@ -83,7 +87,7 @@
     </Button>
   </Panel>
 
-  <Panel PanelName="检查设备设施模型" GroupFlag="True" GroupImage="" RevitVer="R16,R17" ButtonStyles="Large">
+  <Panel PanelName="完善设备设施模型" GroupFlag="True" GroupImage="" RevitVer="R16,R17" ButtonStyles="Large">
 
     <Button ButtonStyles="Pushdown">
       <ButtonName>SAGA.MBI.ShowMissFMListCommand</ButtonName>
@@ -195,8 +199,8 @@
       <ToolTip>生产商</ToolTip>
       <LongDescription>生产商</LongDescription>
       <ToolTipImage></ToolTipImage>
-      <MenuTab>ZCGL_W</MenuTab>
-      <Modules>ZCGL</Modules>
+      <MenuTab>CSZLK_M</MenuTab>
+      <Modules>CSZLK</Modules>
     </Button>
     <Button ButtonStyles="Large">
       <ButtonName>SAGA.RevitFirmLib.SellerCommand</ButtonName>
@@ -207,8 +211,8 @@
       <ToolTip>供应商</ToolTip>
       <LongDescription>供应商</LongDescription>
       <ToolTipImage></ToolTipImage>
-      <MenuTab>ZCGL_W</MenuTab>
-      <Modules>ZCGL</Modules>
+      <MenuTab>CSZLK_M</MenuTab>
+      <Modules>CSZLK</Modules>
     </Button>
 
     <Button ButtonStyles="Large">
@@ -220,8 +224,8 @@
       <ToolTip>维修商</ToolTip>
       <LongDescription>维修商</LongDescription>
       <ToolTipImage></ToolTipImage>
-      <MenuTab>ZCGL_W</MenuTab>
-      <Modules>ZCGL</Modules>
+      <MenuTab>CSZLK_M</MenuTab>
+      <Modules>CSZLK</Modules>
     </Button>
 
     <Button ButtonStyles="Large">
@@ -233,8 +237,8 @@
       <ToolTip>保险商</ToolTip>
       <LongDescription>保险商</LongDescription>
       <ToolTipImage></ToolTipImage>
-      <MenuTab>ZCGL_W</MenuTab>
-      <Modules>ZCGL</Modules>
+      <MenuTab>CSZLK_M</MenuTab>
+      <Modules>CSZLK</Modules>
     </Button>
   </Panel>
   <Panel PanelName="扫楼业务" GroupFlag="True" GroupImage="" RevitVer="R14,R15,R16,R17" ButtonStyles="Large">
@@ -320,7 +324,7 @@
       <Modules>ZCGL</Modules>
     </Button>
   </Panel>
-  <Panel PanelName="数据检查" GroupFlag="True" GroupImage="" RevitVer="R14,R15,R16,R17" ButtonStyles="Large">
+  <Panel PanelName="模型及数据检查" GroupFlag="True" GroupImage="" RevitVer="R14,R15,R16,R17" ButtonStyles="Large">
     <Button ButtonStyles="Large">
       <ButtonName>SAGA.MBI.ModeSpecificationCheckCommand</ButtonName>
       <ButtonText>模型规范检查</ButtonText>

BIN
MBI/SAGA.GplotRelationComputerManage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 0 - 0
MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.csproj.CopyComplete


+ 0 - 1
MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-87d3579d017bd84e1271ae6f8a31d418a2b68320

+ 0 - 186
MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.csproj.FileListAbsolute.txt

@@ -1,186 +0,0 @@
-D:\SVNCode\MBI\SAGA.GplotRelationComputerManage\obj\Debug\SAGA.GplotRelationComputerManage.csprojResolveAssemblyReference.cache
-D:\SVNCode\MBI\SAGA.GplotRelationComputerManage\obj\Debug\SAGA.GplotRelationComputerManage.csproj.CoreCompileInputs.cache
-D:\SVNCode\MBI\OutputDll\cef.pak
-D:\SVNCode\MBI\OutputDll\cef_100_percent.pak
-D:\SVNCode\MBI\OutputDll\cef_200_percent.pak
-D:\SVNCode\MBI\OutputDll\cef_extensions.pak
-D:\SVNCode\MBI\OutputDll\chrome_elf.dll
-D:\SVNCode\MBI\OutputDll\d3dcompiler_47.dll
-D:\SVNCode\MBI\OutputDll\devtools_resources.pak
-D:\SVNCode\MBI\OutputDll\icudtl.dat
-D:\SVNCode\MBI\OutputDll\libcef.dll
-D:\SVNCode\MBI\OutputDll\libEGL.dll
-D:\SVNCode\MBI\OutputDll\libGLESv2.dll
-D:\SVNCode\MBI\OutputDll\locales\am.pak
-D:\SVNCode\MBI\OutputDll\locales\ar.pak
-D:\SVNCode\MBI\OutputDll\locales\bg.pak
-D:\SVNCode\MBI\OutputDll\locales\bn.pak
-D:\SVNCode\MBI\OutputDll\locales\ca.pak
-D:\SVNCode\MBI\OutputDll\locales\cs.pak
-D:\SVNCode\MBI\OutputDll\locales\da.pak
-D:\SVNCode\MBI\OutputDll\locales\de.pak
-D:\SVNCode\MBI\OutputDll\locales\el.pak
-D:\SVNCode\MBI\OutputDll\locales\en-GB.pak
-D:\SVNCode\MBI\OutputDll\locales\en-US.pak
-D:\SVNCode\MBI\OutputDll\locales\es-419.pak
-D:\SVNCode\MBI\OutputDll\locales\es.pak
-D:\SVNCode\MBI\OutputDll\locales\et.pak
-D:\SVNCode\MBI\OutputDll\locales\fa.pak
-D:\SVNCode\MBI\OutputDll\locales\fi.pak
-D:\SVNCode\MBI\OutputDll\locales\fil.pak
-D:\SVNCode\MBI\OutputDll\locales\fr.pak
-D:\SVNCode\MBI\OutputDll\locales\gu.pak
-D:\SVNCode\MBI\OutputDll\locales\he.pak
-D:\SVNCode\MBI\OutputDll\locales\hi.pak
-D:\SVNCode\MBI\OutputDll\locales\hr.pak
-D:\SVNCode\MBI\OutputDll\locales\hu.pak
-D:\SVNCode\MBI\OutputDll\locales\id.pak
-D:\SVNCode\MBI\OutputDll\locales\it.pak
-D:\SVNCode\MBI\OutputDll\locales\ja.pak
-D:\SVNCode\MBI\OutputDll\locales\kn.pak
-D:\SVNCode\MBI\OutputDll\locales\ko.pak
-D:\SVNCode\MBI\OutputDll\locales\lt.pak
-D:\SVNCode\MBI\OutputDll\locales\lv.pak
-D:\SVNCode\MBI\OutputDll\locales\ml.pak
-D:\SVNCode\MBI\OutputDll\locales\mr.pak
-D:\SVNCode\MBI\OutputDll\locales\ms.pak
-D:\SVNCode\MBI\OutputDll\locales\nb.pak
-D:\SVNCode\MBI\OutputDll\locales\nl.pak
-D:\SVNCode\MBI\OutputDll\locales\pl.pak
-D:\SVNCode\MBI\OutputDll\locales\pt-BR.pak
-D:\SVNCode\MBI\OutputDll\locales\pt-PT.pak
-D:\SVNCode\MBI\OutputDll\locales\ro.pak
-D:\SVNCode\MBI\OutputDll\locales\ru.pak
-D:\SVNCode\MBI\OutputDll\locales\sk.pak
-D:\SVNCode\MBI\OutputDll\locales\sl.pak
-D:\SVNCode\MBI\OutputDll\locales\sr.pak
-D:\SVNCode\MBI\OutputDll\locales\sv.pak
-D:\SVNCode\MBI\OutputDll\locales\sw.pak
-D:\SVNCode\MBI\OutputDll\locales\ta.pak
-D:\SVNCode\MBI\OutputDll\locales\te.pak
-D:\SVNCode\MBI\OutputDll\locales\th.pak
-D:\SVNCode\MBI\OutputDll\locales\tr.pak
-D:\SVNCode\MBI\OutputDll\locales\uk.pak
-D:\SVNCode\MBI\OutputDll\locales\vi.pak
-D:\SVNCode\MBI\OutputDll\locales\zh-CN.pak
-D:\SVNCode\MBI\OutputDll\locales\zh-TW.pak
-D:\SVNCode\MBI\OutputDll\natives_blob.bin
-D:\SVNCode\MBI\OutputDll\snapshot_blob.bin
-D:\SVNCode\MBI\OutputDll\swiftshader\libEGL.dll
-D:\SVNCode\MBI\OutputDll\swiftshader\libGLESv2.dll
-D:\SVNCode\MBI\OutputDll\v8_context_snapshot.bin
-D:\SVNCode\MBI\OutputDll\widevinecdmadapter.dll
-D:\SVNCode\MBI\OutputDll\CefSharp.BrowserSubprocess.Core.dll
-D:\SVNCode\MBI\OutputDll\CefSharp.BrowserSubprocess.Core.pdb
-D:\SVNCode\MBI\OutputDll\CefSharp.BrowserSubprocess.exe
-D:\SVNCode\MBI\OutputDll\CefSharp.BrowserSubprocess.pdb
-D:\SVNCode\MBI\OutputDll\CefSharp.Core.dll
-D:\SVNCode\MBI\OutputDll\CefSharp.Core.pdb
-D:\SVNCode\MBI\OutputDll\CefSharp.Core.xml
-D:\SVNCode\MBI\OutputDll\CefSharp.dll
-D:\SVNCode\MBI\OutputDll\CefSharp.pdb
-D:\SVNCode\MBI\OutputDll\CefSharp.XML
-D:\SVNCode\MBI\OutputDll\CefSharp.Wpf.dll
-D:\SVNCode\MBI\OutputDll\CefSharp.Wpf.pdb
-D:\SVNCode\MBI\OutputDll\CefSharp.Wpf.XML
-D:\SVNCode\MBI\OutputDll\Logger\log4net.config
-D:\SVNCode\MBI\OutputDll\Logger\NLog.config
-D:\SVNCode\MBI\OutputDll\app.config
-D:\SVNCode\MBI\OutputDll\SAGA.GplotRelationComputerManage.dll.config
-D:\SVNCode\MBI\OutputDll\SAGA.GplotRelationComputerManage.dll
-D:\SVNCode\MBI\OutputDll\SAGA.GplotRelationComputerManage.pdb
-D:\SVNCode\MBI\SAGA.GplotRelationComputerManage\obj\Debug\SAGA.GplotRelationComputerManage.dll
-D:\SVNCode\MBI\SAGA.GplotRelationComputerManage\obj\Debug\SAGA.GplotRelationComputerManage.pdb
-D:\GitCode\MBI\OutputDll\cef.pak
-D:\GitCode\MBI\OutputDll\cef_100_percent.pak
-D:\GitCode\MBI\OutputDll\cef_200_percent.pak
-D:\GitCode\MBI\OutputDll\cef_extensions.pak
-D:\GitCode\MBI\OutputDll\chrome_elf.dll
-D:\GitCode\MBI\OutputDll\d3dcompiler_47.dll
-D:\GitCode\MBI\OutputDll\devtools_resources.pak
-D:\GitCode\MBI\OutputDll\icudtl.dat
-D:\GitCode\MBI\OutputDll\libcef.dll
-D:\GitCode\MBI\OutputDll\libEGL.dll
-D:\GitCode\MBI\OutputDll\libGLESv2.dll
-D:\GitCode\MBI\OutputDll\locales\am.pak
-D:\GitCode\MBI\OutputDll\locales\ar.pak
-D:\GitCode\MBI\OutputDll\locales\bg.pak
-D:\GitCode\MBI\OutputDll\locales\bn.pak
-D:\GitCode\MBI\OutputDll\locales\ca.pak
-D:\GitCode\MBI\OutputDll\locales\cs.pak
-D:\GitCode\MBI\OutputDll\locales\da.pak
-D:\GitCode\MBI\OutputDll\locales\de.pak
-D:\GitCode\MBI\OutputDll\locales\el.pak
-D:\GitCode\MBI\OutputDll\locales\en-GB.pak
-D:\GitCode\MBI\OutputDll\locales\en-US.pak
-D:\GitCode\MBI\OutputDll\locales\es-419.pak
-D:\GitCode\MBI\OutputDll\locales\es.pak
-D:\GitCode\MBI\OutputDll\locales\et.pak
-D:\GitCode\MBI\OutputDll\locales\fa.pak
-D:\GitCode\MBI\OutputDll\locales\fi.pak
-D:\GitCode\MBI\OutputDll\locales\fil.pak
-D:\GitCode\MBI\OutputDll\locales\fr.pak
-D:\GitCode\MBI\OutputDll\locales\gu.pak
-D:\GitCode\MBI\OutputDll\locales\he.pak
-D:\GitCode\MBI\OutputDll\locales\hi.pak
-D:\GitCode\MBI\OutputDll\locales\hr.pak
-D:\GitCode\MBI\OutputDll\locales\hu.pak
-D:\GitCode\MBI\OutputDll\locales\id.pak
-D:\GitCode\MBI\OutputDll\locales\it.pak
-D:\GitCode\MBI\OutputDll\locales\ja.pak
-D:\GitCode\MBI\OutputDll\locales\kn.pak
-D:\GitCode\MBI\OutputDll\locales\ko.pak
-D:\GitCode\MBI\OutputDll\locales\lt.pak
-D:\GitCode\MBI\OutputDll\locales\lv.pak
-D:\GitCode\MBI\OutputDll\locales\ml.pak
-D:\GitCode\MBI\OutputDll\locales\mr.pak
-D:\GitCode\MBI\OutputDll\locales\ms.pak
-D:\GitCode\MBI\OutputDll\locales\nb.pak
-D:\GitCode\MBI\OutputDll\locales\nl.pak
-D:\GitCode\MBI\OutputDll\locales\pl.pak
-D:\GitCode\MBI\OutputDll\locales\pt-BR.pak
-D:\GitCode\MBI\OutputDll\locales\pt-PT.pak
-D:\GitCode\MBI\OutputDll\locales\ro.pak
-D:\GitCode\MBI\OutputDll\locales\ru.pak
-D:\GitCode\MBI\OutputDll\locales\sk.pak
-D:\GitCode\MBI\OutputDll\locales\sl.pak
-D:\GitCode\MBI\OutputDll\locales\sr.pak
-D:\GitCode\MBI\OutputDll\locales\sv.pak
-D:\GitCode\MBI\OutputDll\locales\sw.pak
-D:\GitCode\MBI\OutputDll\locales\ta.pak
-D:\GitCode\MBI\OutputDll\locales\te.pak
-D:\GitCode\MBI\OutputDll\locales\th.pak
-D:\GitCode\MBI\OutputDll\locales\tr.pak
-D:\GitCode\MBI\OutputDll\locales\uk.pak
-D:\GitCode\MBI\OutputDll\locales\vi.pak
-D:\GitCode\MBI\OutputDll\locales\zh-CN.pak
-D:\GitCode\MBI\OutputDll\locales\zh-TW.pak
-D:\GitCode\MBI\OutputDll\natives_blob.bin
-D:\GitCode\MBI\OutputDll\snapshot_blob.bin
-D:\GitCode\MBI\OutputDll\swiftshader\libEGL.dll
-D:\GitCode\MBI\OutputDll\swiftshader\libGLESv2.dll
-D:\GitCode\MBI\OutputDll\v8_context_snapshot.bin
-D:\GitCode\MBI\OutputDll\widevinecdmadapter.dll
-D:\GitCode\MBI\OutputDll\CefSharp.BrowserSubprocess.Core.dll
-D:\GitCode\MBI\OutputDll\CefSharp.BrowserSubprocess.Core.pdb
-D:\GitCode\MBI\OutputDll\CefSharp.BrowserSubprocess.exe
-D:\GitCode\MBI\OutputDll\CefSharp.BrowserSubprocess.pdb
-D:\GitCode\MBI\OutputDll\CefSharp.Core.dll
-D:\GitCode\MBI\OutputDll\CefSharp.Core.pdb
-D:\GitCode\MBI\OutputDll\CefSharp.Core.xml
-D:\GitCode\MBI\OutputDll\CefSharp.dll
-D:\GitCode\MBI\OutputDll\CefSharp.pdb
-D:\GitCode\MBI\OutputDll\CefSharp.XML
-D:\GitCode\MBI\OutputDll\CefSharp.Wpf.dll
-D:\GitCode\MBI\OutputDll\CefSharp.Wpf.pdb
-D:\GitCode\MBI\OutputDll\CefSharp.Wpf.XML
-D:\GitCode\MBI\OutputDll\Logger\log4net.config
-D:\GitCode\MBI\OutputDll\Logger\NLog.config
-D:\GitCode\MBI\OutputDll\app.config
-D:\GitCode\MBI\OutputDll\SAGA.GplotRelationComputerManage.dll.config
-D:\GitCode\MBI\OutputDll\SAGA.GplotRelationComputerManage.dll
-D:\GitCode\MBI\OutputDll\SAGA.GplotRelationComputerManage.pdb
-D:\GitCode\MBI\SAGA.GplotRelationComputerManage\obj\Debug\SAGA.GplotRelationComputerManage.csprojResolveAssemblyReference.cache
-D:\GitCode\MBI\SAGA.GplotRelationComputerManage\obj\Debug\SAGA.GplotRelationComputerManage.csproj.CoreCompileInputs.cache
-D:\GitCode\MBI\SAGA.GplotRelationComputerManage\obj\Debug\SAGA.GplotRelationComputerManage.dll
-D:\GitCode\MBI\SAGA.GplotRelationComputerManage\obj\Debug\SAGA.GplotRelationComputerManage.pdb

BIN
MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.csprojResolveAssemblyReference.cache


BIN
MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.dll


BIN
MBI/SAGA.GplotRelationComputerManage/obj/Debug/SAGA.GplotRelationComputerManage.pdb


+ 0 - 0
MBI/SAGA.GplotRelationComputerManage/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs


+ 0 - 0
MBI/SAGA.GplotRelationComputerManage/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs


+ 0 - 0
MBI/SAGA.GplotRelationComputerManage/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs


+ 1 - 1
MBI/SAGA.MBI/Common/CommonTool.cs

@@ -49,7 +49,7 @@ namespace SAGA.MBI.Common
                 imageName = "folder_go.png";   
             }
             var OFImage = System.IO.Path.Combine(basePath, imageName);
-            return OFImage; 
+            return OFImage;  
         }
 
        

+ 3 - 10
MBI/SAGA.MBI/DataArrange/DalProjectTree.cs

@@ -140,7 +140,7 @@ namespace SAGA.MBI.DataArrange
         /// </summary>
         /// <param name="isOnlyPermission">仅获取有权限的楼层</param>
         /// <returns></returns>
-        public static List<MFloor> GetSelectedProjectFloors(bool isOnlyPermission)
+        public static List<MFloor> GetSelectedFloors()
         {
             List<MFloor> floors = new List<MFloor>();
             foreach (TreeNodeItem buildingTree in MBIControl.ProjectTree.Children)
@@ -150,17 +150,10 @@ namespace SAGA.MBI.DataArrange
                 {
                     foreach (TreeNodeItem floorTree in buildingTree.Children)
                     {
+                        if (!floorTree.IsSelected) continue;
                         if (floorTree.Item is MFloor floor)
                         {
-                            if (isOnlyPermission)
-                            {
-                                if (floor.FloorLock.LockState == MFloorLockState.LockBySelf)
-                                    floors.Add(floor);
-                            }
-                            else
-                            {
-                                floors.Add(floor);
-                            }
+                            floors.Add(floor);
                         }
                     }
                 }

+ 11 - 2
MBI/SAGA.MBI/SAGA.MBI.csproj

@@ -281,10 +281,15 @@
     <Compile Include="ToolsData\DataCheck\DataCheckBase.cs" />
     <Compile Include="ToolsData\CheckBase\CheckContext.cs" />
     <Compile Include="ToolsData\DataCheck\DataCheckResultBase.cs" />
+    <Compile Include="ToolsData\DataCheck\MissDutyOrModeCheck.cs" />
+    <Compile Include="ToolsData\DataCheck\MissDutyOrModeCheckResult.cs" />
     <Compile Include="ToolsData\DataCheck\QRCodeContextCheck.cs" />
     <Compile Include="ToolsData\DataCheck\DutyFMInfoCheck.cs" />
     <Compile Include="ToolsData\DataCheck\QRCodeContextCheckResult.cs" />
     <Compile Include="ToolsData\DataCheck\DutyFMInfoCheckResult.cs" />
+    <Compile Include="ToolsData\DataCheck\WinDataCheckSetting.xaml.cs">
+      <DependentUpon>WinDataCheckSetting.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ToolsData\ModeCheck\ModeCheckBase.cs" />
     <Compile Include="ToolsData\ModeCheck\DataCheckRule.cs" />
     <Compile Include="ToolsData\CheckBase\DCElementType.cs" />
@@ -323,7 +328,7 @@
     <Compile Include="ToolsData\CheckBase\WinDataCheckProgressBar.xaml.cs">
       <DependentUpon>WinDataCheckProgressBar.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ToolsData\CheckBase\WinModeCheckSetting.xaml.cs">
+    <Compile Include="ToolsData\ModeCheck\WinModeCheckSetting.xaml.cs">
       <DependentUpon>WinModeCheckSetting.xaml</DependentUpon>
     </Compile>
     <Compile Include="ToolsData\CorrectLossDuty.cs" />
@@ -672,10 +677,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ToolsData\CheckBase\WinModeCheckSetting.xaml">
+    <Page Include="ToolsData\ModeCheck\WinModeCheckSetting.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ToolsData\DataCheck\WinDataCheckSetting.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="WinView\BeModingDutyList\WinBeModeDutyList.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

+ 3 - 2
MBI/SAGA.MBI/ToolCommand.cs

@@ -19,11 +19,12 @@ using SAGA.DotNetUtils.Logger;
 using SAGA.MBI.Common;
 using SAGA.MBI.ToolsData;
 using SAGA.MBI.ToolsData.CheckBase;
+using SAGA.MBI.ToolsData.DataCheck;
 using SAGA.MBI.ToolsData.ModeCheck;
 using SAGA.MBI.WinView.Login;
 using SAGA.RevitUtils;
 using SAGA.RevitUtils.Extends;
-using WinModeCheckSetting = SAGA.MBI.ToolsData.CheckBase.WinModeCheckSetting;
+using WinModeCheckSetting = SAGA.MBI.ToolsData.ModeCheck.WinModeCheckSetting;
 
 namespace SAGA.MBI
 {
@@ -258,7 +259,7 @@ namespace SAGA.MBI
                 var checkType = CheckType.DataCheck;
                 var checkItems = CheckOperation.GetCheckItems(checkType);
 
-                WinModeCheckSetting win = new WinModeCheckSetting(checkItems,CheckType.DataCheck);
+                WinDataCheckSetting win = new WinDataCheckSetting(checkItems,CheckType.DataCheck);
                 if (win.ShowDialog() != true) return Result.Cancelled;
                 CheckOperation.Execute(checkItems, win.GetCheckContext());
             }

+ 1 - 5
MBI/SAGA.MBI/ToolsData/CheckBase/CheckContext.cs

@@ -24,11 +24,7 @@ namespace SAGA.MBI.ToolsData.CheckBase
         /// 建筑Id
         /// </summary>
         public string BuildingId { get; set; }
-
-        /// <summary>
-        /// 仅检查有权限的
-        /// </summary>
-        public bool IsOnlyCheckHasPermission { get; set; }
+        
 
         /// <summary>
         /// 保存路径

+ 193 - 0
MBI/SAGA.MBI/ToolsData/DataCheck/MissDutyOrModeCheck.cs

@@ -0,0 +1,193 @@
+/* ==============================================================================
+ * 功能描述:岗位和资产信息点一致性检查
+ * 创 建 者:Garrett
+ * 创建日期:2018/10/23 15:08:55
+ * ==============================================================================*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Autodesk.Revit.DB;
+using Autodesk.Revit.DB.Mechanical;
+using Newtonsoft.Json.Linq;
+using NPOI.SS.UserModel;
+using SAGA.DotNetUtils.Extend;
+using SAGA.DotNetUtils.Others;
+using SAGA.MBI.DataArrange;
+using SAGA.MBI.JsonConvert;
+using SAGA.MBI.Model;
+using SAGA.MBI.RequestData;
+using SAGA.MBI.Tools;
+using SAGA.MBI.ToolsData.CheckBase;
+using SAGA.MBI.ToolsData.ModeCheck;
+using SAGA.RevitUtils.Extends;
+
+namespace SAGA.MBI.ToolsData.DataCheck
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    class MissDutyOrMode : DataCheckBase
+    {
+        public MissDutyOrMode()
+        {
+            Name = "岗位与模型一致性检查";
+        }
+        [DataCheckProcessAspect]
+        public override bool Check()
+        {
+            IsRight = GetCheckResult();
+            return IsRight;
+        }
+
+        public override void Correct()
+        {
+            throw new NotImplementedException();
+        }
+
+        #region CheckMethod
+        /// <summary>
+        /// 缓存建筑下的所有岗位信息
+        /// </summary>
+        /// <returns></returns>
+        private List<MRevitEquipBase> CacheBuildingDutys()
+        {
+            return CommonConvert.CacheEqEc(this.Context.BuildingId);
+        }
+        /// <summary>
+        /// 缓存 建筑下的所有资产
+        /// </summary>
+        /// <returns></returns>
+        private List<MEquipFM> CacheBuildingFMs()
+        {
+            return MatchFMConvert.GetAllEquipFmFromScanBuilding(this.Context.BuildingId); ;
+        }
+        /// <summary>
+        /// 对比信息点是否一致
+        /// </summary>
+        /// <returns></returns>
+        private bool GetCheckResult()
+        {
+            bool result = true;
+            string buildingId = this.Context.BuildingId;
+            if (buildingId.IsNullOrEmptyExt())
+            {
+                result = false;
+                return result;
+            }
+            var dutys = CacheBuildingDutys();
+            var fms = CacheBuildingFMs();
+            foreach (var duty in dutys)       {
+                while (true)
+                {
+                    string fmid = duty.FMID;
+                    if (fmid.IsNullOrEmptyExt()) break;
+                    var fm = fms.FirstOrDefault(t => t.Id == fmid);
+                    if (fm == null) break;
+                    var rs = GetCheckResult(duty,fm);
+                    if (rs == null) break;
+                    Results.Add(rs);
+                    break;
+                }
+            }
+            return result;
+        }
+
+        private DutyFMInfoCheckResult GetCheckResult(MRevitEquipBase duty, MEquipFM fm)
+        {
+            DutyFMInfoCheckResult result = null;
+            try
+            {
+                var dutyJObject = duty.CloundJObject;
+                var fmJson = fm.FMJson;
+                var fmJObject = JObject.Parse(fmJson);
+
+                PropertyDefineTb pdtb = PEPCodeConvert.GetPropertyDefineTb(duty.EquipClassCode);
+                StringBuilder sb = new StringBuilder();
+                foreach (KeyValuePair<string, JToken> pair in dutyJObject)
+                {
+                    string key = pair.Key;
+                    string dutyValue = pair.Value.ToString();
+                    string fmValue = fmJObject.GetValueEx(key);
+                    if (dutyValue.IsNotNullEmptyExt() && fmValue.IsNotNullEmptyExt() && !dutyValue.Equals(fmValue))
+                    {
+                        var define = pdtb.PropertyDefineItems.FirstOrDefault(t => t.CodeName == key);
+                        sb.Append($"{define?.Name??key}、");
+                    }
+                }
+                result = new DutyFMInfoCheckResult();
+                result.FloorName = DalProjectTree.GetFloorNameByFloorId(duty.FloorId);
+                result.DutyId = duty.Id;
+                result.DutyName = duty.ToString();
+                result.BIMID = duty.BimID.GetBIMID().ToString();
+                result.FMId = fm.Id;
+                result.FMName = fm.ToString();
+                result.IsRight = sb.Length == 0;
+                result.RMessage = result.IsRight ? "" : $"值不一致的信息点有:{sb}";
+            }
+            catch (Exception e)
+            {
+                return result;
+            }
+            return result;
+        }
+
+
+        #endregion
+
+        //[DataCheckProcessAspect]
+        public override void Export()
+        {
+            //   Check();
+            try
+            {
+                IWorkbook book = DCRExport.GetWorkbook();
+                //ISheet sheet = book.CreateSheet(Name);
+                ISheet sheet = book.GetSheet(Name);
+
+                #region 添加数据
+                int index = 3;
+                //添加 共检查XXX条数据,未通过检查的如下 提示
+                IRow rowTip = sheet.CreateRow(index - 1);
+                rowTip.AddCell(0, $"总检查{Results.Count}条数据,未通过检查的如下", DataCheckNPOIStyle.Title);
+                //IRow row4 = sheet.CreateRow(index);
+                //row4.HeightInPoints = 15;
+
+                //row4.AddCell(0, "楼层本地名称", DataCheckNPOIStyle.Title);
+                //row4.AddCell(1, "文件名", DataCheckNPOIStyle.Title);
+                //row4.AddCell(2, "文件地址", DataCheckNPOIStyle.Title);
+                //row4.AddCell(3, "族名称", DataCheckNPOIStyle.Title);
+                //row4.AddCell(4, "类型", DataCheckNPOIStyle.Title);
+                //row4.AddCell(5, "ID", DataCheckNPOIStyle.Title);
+                //row4.AddCell(6, "通过", DataCheckNPOIStyle.Title);
+                //row4.AddCell(7, "备注(失败原因)", DataCheckNPOIStyle.Title);
+                foreach (DutyFMInfoCheckResult result in Results)
+                {
+                    //数量过多,只显示有问题的
+                    if (result.IsRight) continue;
+                    index++;
+                    IRow rowN = sheet.CreateRow(index);
+                    DataCheckNPOIStyle style = result.IsRight ? DataCheckNPOIStyle.Content : DataCheckNPOIStyle.Error;
+                    int i = 0;
+                    rowN.AddCell(i++, result.FloorName, style);
+                    rowN.AddCell(i++, result.FMId, style);
+                    rowN.AddCell(i++, result.FMName, style);
+                    rowN.AddCell(i++, result.DutyId, style);
+                    rowN.AddCell(i++, result.DutyName, style);
+                    rowN.AddCell(i++, result.BIMID, style);
+                    string rowN4 = result.IsRight ? "通过" : "不通过";
+                    rowN.AddCell(i++, rowN4, style);
+                    rowN.AddCell(i++, result.RMessage, style);
+                }
+                #endregion
+
+            }
+            catch (Exception e)
+            {
+                MessageShowBase.Show(e);
+            }
+        }
+    }
+}

+ 23 - 0
MBI/SAGA.MBI/ToolsData/DataCheck/MissDutyOrModeCheckResult.cs

@@ -0,0 +1,23 @@
+/* ==============================================================================
+ * 功能描述:岗位和资产信息点一致性检查结果
+ * 创 建 者:Garrett
+ * 创建日期:2018/10/23 15:13:17
+ * ==============================================================================*/
+
+using SAGA.MBI.ToolsData.ModeCheck;
+
+namespace SAGA.MBI.ToolsData.DataCheck
+{
+    /// <summary>
+    /// UnitCheckResult
+    /// </summary>
+    class MissDutyOrModeCheckResult : DataCheckResultBase
+    {
+        public string FloorName { get; set; }
+        public string DutyId { get; set; }
+        public string DutyName { get; set; }
+        public string FMId { get; set; }
+        public string FMName { get; set; }
+        public string BIMID { get; set; }
+    }
+}

+ 12 - 17
MBI/SAGA.MBI/ToolsData/CheckBase/WinModeCheckSetting.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="SAGA.MBI.ToolsData.CheckBase.WinModeCheckSetting"
+<Window x:Class="SAGA.MBI.ToolsData.DataCheck.WinDataCheckSetting"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,7 +8,8 @@
              xmlns:converter="clr-namespace:SAGA.DotNetUtils.WPF.Converter;assembly=SAGA.DotNetUtils"
              xmlns:userControl="clr-namespace:SAGA.DotNetUtils.WPF.UserControl;assembly=SAGA.DotNetUtils"
              xmlns:checkBase="clr-namespace:SAGA.MBI.ToolsData.CheckBase"
-             mc:Ignorable="d"  Title="数据检查" WindowStartupLocation="CenterScreen"
+             xmlns:dataCheck="clr-namespace:SAGA.MBI.ToolsData.DataCheck"
+             mc:Ignorable="d"  Title="垃圾数据检查" WindowStartupLocation="CenterScreen"
              Height="587" Width="600">
     <Window.Resources>
         <converter:BoolToInverserConverter x:Key="BoolInverseConverter"></converter:BoolToInverserConverter>
@@ -34,12 +35,11 @@
             <Grid Grid.Column="0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*"></RowDefinition>
-                    <RowDefinition Height="60"></RowDefinition>
                 </Grid.RowDefinitions>
                 <GroupBox Grid.Row="0" Header="请选择需要检查的建筑">
                     <TreeView ItemsSource="{Binding Path=ProjectList}">
                         <TreeView.Resources>
-                            <checkBase:FloorRadioButtonVisibleConverter x:Key="FloorRadioButtonVisibleConverter"></checkBase:FloorRadioButtonVisibleConverter>
+                            <dataCheck:FloorRadioButtonVisibleConverter x:Key="FloorRadioButtonVisibleConverter"></dataCheck:FloorRadioButtonVisibleConverter>
                         </TreeView.Resources>
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Path=Children}">
@@ -64,19 +64,6 @@
                         </TreeView.ItemContainerStyle>
                     </TreeView>
                 </GroupBox>
-                <GroupBox Grid.Row="1" Header="请选择楼层范围">
-                    <Grid HorizontalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"></ColumnDefinition>
-                        </Grid.ColumnDefinitions>
-                        <WrapPanel  VerticalAlignment="Center" HorizontalAlignment="Center">
-                            <Label  Content="全部楼层"></Label>
-                            <userControl:SliderCheckBox   IsChecked="{Binding Path=CheckBase.IsOnlyCheckHasPermission,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></userControl:SliderCheckBox>
-                            <Label  Content="有权限楼层"></Label>
-                        </WrapPanel>
-
-                    </Grid>
-                </GroupBox>
             </Grid>
             <Grid Grid.Column="1">
                 <GroupBox Header="请选择检查项">
@@ -130,3 +117,11 @@
 
 
 
+
+
+
+
+
+
+
+

+ 5 - 20
MBI/SAGA.MBI/ToolsData/CheckBase/WinModeCheckSetting.xaml.cs

@@ -10,29 +10,29 @@ using SAGA.DotNetUtils.Extend;
 using SAGA.MBI.Common;
 using SAGA.MBI.DataArrange;
 using SAGA.MBI.Model;
+using SAGA.MBI.ToolsData.CheckBase;
 using SAGA.MBI.ToolsData.ModeCheck;
 
-namespace SAGA.MBI.ToolsData.CheckBase
+namespace SAGA.MBI.ToolsData.DataCheck
 {
     /// <summary>
     /// WinModeCheckSetting.xaml 的交互逻辑
     /// </summary>
-    public partial class WinModeCheckSetting : INotifyPropertyChanged
+    public partial class WinDataCheckSetting : INotifyPropertyChanged
     {
         private CheckType m_CheckType;
-        public WinModeCheckSetting(List<ICheckBase> checkItems, CheckType checkType)
+        public WinDataCheckSetting(List<ICheckBase> checkItems, CheckType checkType)
         {
             InitializeComponent();
             m_CheckType = checkType;
             myListbox.ItemsSource = checkItems;
             Init();
             this.DataContext = this;
+
         }
 
         private void Init()
         {
-            IsOnlyCheckHasPermission = false;
-
             ProjectList = MBIControl.ProjectTree.Children;
             if (ProjectList.FirstOrDefault() != null)
                 ProjectList.FirstOrDefault().IsSelected = true;
@@ -44,20 +44,6 @@ namespace SAGA.MBI.ToolsData.CheckBase
 
         #region BindingProperty
 
-        private bool m_IsOnlyCheckHasPermission;
-
-        /// <summary>
-        /// 仅检查有权限的
-        /// </summary>
-        public bool IsOnlyCheckHasPermission
-        {
-            get { return m_IsOnlyCheckHasPermission; }
-            set
-            {
-                m_IsOnlyCheckHasPermission = value;
-            }
-        }
-
         private ObservableCollection<TreeNodeItem> m_ProjectList;
 
         public ObservableCollection<TreeNodeItem> ProjectList
@@ -144,7 +130,6 @@ namespace SAGA.MBI.ToolsData.CheckBase
         {
             CheckContext context = new CheckContext();
             context.BuildingId = DalProjectTree.GetSelectedBuilding()?.Id;
-            context.IsOnlyCheckHasPermission = IsOnlyCheckHasPermission;
             context.SavePath = SavePath;
             context.TemplatePath = CheckOperation.GetSaveTemplatePath(m_CheckType);
             return context;

+ 10 - 4
MBI/SAGA.MBI/ToolsData/ModeCheck/DCRExport.cs

@@ -15,6 +15,7 @@ using NPOI.HSSF.Util;
 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
+using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Logger;
 using SAGA.DotNetUtils.Others;
 using SAGA.MBI.Common;
@@ -32,13 +33,18 @@ namespace SAGA.MBI.ToolsData.ModeCheck
         /// 获取导出Excel
         /// </summary>
         /// <returns></returns>
-        public static string GetExportPath(string defaultPath=null)
+        public static string GetExportPath(string defaultPath = null)
         {
             SaveFileDialog sflg = new SaveFileDialog();
-            sflg.InitialDirectory = defaultPath;
+            if (File.Exists(defaultPath))
+                sflg.InitialDirectory = defaultPath;
             sflg.Filter = "Excel(*.xlsx)|*.xlsx";
-            if (sflg.ShowDialog() != true) return "";
+            if (sflg.ShowDialog() != true) return defaultPath;
             string fileName = sflg.FileName;
+            if (fileName.IsNullOrEmpty())
+            {
+                fileName = defaultPath;
+            }
             return fileName;
         }
 
@@ -71,7 +77,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
                 {
                     m_ExportWorkBook = null;
                 }
-               
+
             }
 
             return m_ExportWorkBook;

+ 1 - 1
MBI/SAGA.MBI/ToolsData/ModeCheck/SagaSignCheck.cs

@@ -60,7 +60,7 @@ namespace SAGA.MBI.ToolsData.ModeCheck
         {
             bool allRight = true;
             //获取建筑下的楼层
-            var floors = DalProjectTree.GetSelectedProjectFloors(Context.IsOnlyCheckHasPermission);
+            var floors = DalProjectTree.GetSelectedFloors();
             int i = 0;
             foreach (MFloor mFloor in floors)
             {

+ 120 - 0
MBI/SAGA.MBI/ToolsData/ModeCheck/WinModeCheckSetting.xaml

@@ -0,0 +1,120 @@
+<Window x:Class="SAGA.MBI.ToolsData.ModeCheck.WinModeCheckSetting"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:SAGA.MBI.ToolsData.ModeCheck"
+             xmlns:common="clr-namespace:SAGA.MBI.Common"
+             xmlns:converter="clr-namespace:SAGA.DotNetUtils.WPF.Converter;assembly=SAGA.DotNetUtils"
+             xmlns:userControl="clr-namespace:SAGA.DotNetUtils.WPF.UserControl;assembly=SAGA.DotNetUtils"
+             xmlns:checkBase="clr-namespace:SAGA.MBI.ToolsData.CheckBase"
+             xmlns:dataCheck="clr-namespace:SAGA.MBI.ToolsData.DataCheck"
+             mc:Ignorable="d"  Title="模型检查" WindowStartupLocation="CenterScreen"
+             Height="587" Width="600">
+    <Window.Resources>
+        <converter:BoolToInverserConverter x:Key="BoolInverseConverter"></converter:BoolToInverserConverter>
+        <converter:StringToImageConverter x:Key="StringToImageConverter"></converter:StringToImageConverter>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40"></RowDefinition>
+            <RowDefinition Height="*"></RowDefinition>
+            <RowDefinition Height="80"></RowDefinition>
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <WrapPanel VerticalAlignment="Center">
+                <Label Margin="5,0,0,0" Content="当前项目:" FontSize="15"></Label>
+                <Label Content="{x:Static common:MBIControl.ProjectCur}" FontSize="15"></Label>
+            </WrapPanel>
+        </Grid>
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"></ColumnDefinition>
+                <ColumnDefinition Width="*"></ColumnDefinition>
+            </Grid.ColumnDefinitions>
+            <Grid Grid.Column="0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"></RowDefinition>
+                </Grid.RowDefinitions>
+                <GroupBox Grid.Row="0" Header="请选择需要检查的建筑">
+                    <TreeView ItemsSource="{Binding Path=ProjectList}">
+                        <TreeView.ItemTemplate>
+                            <HierarchicalDataTemplate ItemsSource="{Binding Path=Children}">
+                                <WrapPanel>
+                                    <CheckBox IsChecked="{Binding Path=IsSelected,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"
+                                              Width="Auto" VerticalContentAlignment="Center" 
+                                              Checked="TreeItemChecked_OnChecked"
+                                              Unchecked="TreeItemChecked_OnChecked">
+                                    </CheckBox>
+                                    <Label Content="{Binding Path=Item.TvItemName}"></Label>
+                                </WrapPanel>
+                            </HierarchicalDataTemplate>
+                        </TreeView.ItemTemplate>
+                        <TreeView.ItemContainerStyle>
+                            <Style TargetType="{x:Type TreeViewItem}">
+                                <Setter Property="IsExpanded" Value="True" />
+                            </Style>
+                        </TreeView.ItemContainerStyle>
+                    </TreeView>
+                </GroupBox>
+            </Grid>
+            <Grid Grid.Column="1">
+                <GroupBox Header="请选择检查项">
+                    <ListBox  x:Name="myListbox" >
+                        <!--ItemsSource="{Binding Path=CheckList}"-->
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <WrapPanel  >
+                                    <CheckBox IsChecked="{Binding Path=RIsChecked,UpdateSourceTrigger=PropertyChanged}" 
+                                      IsEnabled="{Binding Path=RIsReadOnly,Converter={StaticResource BoolInverseConverter}}"
+                                      VerticalContentAlignment="Center"></CheckBox>
+                                    <Label Content="{Binding Path=Name}"></Label>
+                                </WrapPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                </GroupBox>
+            </Grid>
+        </Grid>
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition></RowDefinition>
+                <RowDefinition></RowDefinition>
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <userControl:SelectFile_Hyperlink Margin="5,0"  x:Name="btnSelectPath" VerticalContentAlignment="Center"
+                                                  Text="{Binding Path=SavePath,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                                  BtnImage="{Binding Path=OFImage,Converter={StaticResource StringToImageConverter}}"
+                                                  OverrideClickAction="SelectFile_Click"></userControl:SelectFile_Hyperlink>
+            </Grid>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Button Grid.Column="0" Width="100" Height="25" Content="确定" HorizontalAlignment="Right" Margin="0,0,20,0" VerticalAlignment="Center" Click="ButtonNext_OnClick" IsDefault="True"></Button>
+                <Button Grid.Column="1" Width="100" Height="25" Content="取消" HorizontalAlignment="Left" Margin="20,0,0,0" VerticalAlignment="Center" IsCancel="True"  Background="White"></Button>
+
+            </Grid>
+        </Grid>
+
+    </Grid>
+</Window>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 178 - 0
MBI/SAGA.MBI/ToolsData/ModeCheck/WinModeCheckSetting.xaml.cs

@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using SAGA.DotNetUtils.Extend;
+using SAGA.MBI.Common;
+using SAGA.MBI.DataArrange;
+using SAGA.MBI.Model;
+using SAGA.MBI.ToolsData.CheckBase;
+
+namespace SAGA.MBI.ToolsData.ModeCheck
+{
+    /// <summary>
+    /// WinModeCheckSetting.xaml 的交互逻辑
+    /// </summary>
+    public partial class WinModeCheckSetting : INotifyPropertyChanged
+    {
+        private CheckType m_CheckType;
+        public WinModeCheckSetting(List<ICheckBase> checkItems, CheckType checkType)
+        {
+            InitializeComponent();
+            m_CheckType = checkType;
+            myListbox.ItemsSource = checkItems;
+            Init();
+            this.DataContext = this;
+            
+        }
+
+        private void Init()
+        {
+            ProjectList = MBIControl.ProjectTree.Children;
+            if (ProjectList.FirstOrDefault() != null)
+                SetTreeState(ProjectList.FirstOrDefault(), true);
+            SavePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),
+                $"{MBIControl.ProjectCur}{m_CheckType.GetDescription()}检查结果.xlsx");
+            OFImage = CommonTool.GetBtnImagePath(SavePath);
+        }
+
+
+        #region BindingProperty
+
+        private ObservableCollection<TreeNodeItem> m_ProjectList;
+
+        public ObservableCollection<TreeNodeItem> ProjectList
+        {
+            get { return m_ProjectList; }
+            set { m_ProjectList = value; }
+        }
+
+        private string m_SavePath;
+
+        /// <summary>
+        /// 保存路径
+        /// </summary>
+        public string SavePath
+        {
+            get { return m_SavePath; }
+            set
+            {
+                m_SavePath = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SavePath)));
+            }
+        }
+
+        private string m_OFImage;
+
+
+        /// <summary>
+        /// 打开关闭按钮图片
+        /// </summary>
+        public string OFImage
+        {
+            get { return m_OFImage; }
+            set { m_OFImage = value; }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion
+
+
+        #region Action
+
+        private void SelectFile_Click(object sender, RoutedEventArgs e)
+        {
+            SavePath = DCRExport.GetExportPath(SavePath);
+        }
+
+        private void ButtonNext_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (CanExecute())
+            {
+                this.DialogResult = true;
+            }
+        }
+
+        private bool CanExecute()
+        {
+            bool result = DalProjectTree.GetSelectedBuilding()?.Id != null; ;
+            if (!result)
+            {
+                MessageBox.Show("请选择需要检查的建筑");
+                if (ProjectList.FirstOrDefault() != null)
+                    SetTreeState(ProjectList.FirstOrDefault(), true);
+            }
+            else
+            {
+                var list = myListbox.ItemsSource as List<ICheckBase>;
+                result = list.Any(t => t.RIsChecked);
+                if (!result)
+                {
+                    MessageBox.Show("请至少选择一个检查项");
+                }
+            }
+
+
+            return result;
+        }
+        #endregion
+        /// <summary>
+        /// 获取数据检查上下文
+        /// </summary>
+        /// <param name="savepath"></param>
+        /// <returns></returns>
+        public CheckContext GetCheckContext()
+        {
+            CheckContext context = new CheckContext();
+            context.BuildingId = DalProjectTree.GetSelectedBuilding()?.Id;
+            context.SavePath = SavePath;
+            context.TemplatePath = CheckOperation.GetSaveTemplatePath(m_CheckType);
+            return context;
+        }
+
+        private void TreeItemChecked_OnChecked(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox chk)
+            {
+                bool state = chk.IsChecked == true;
+                if (chk.DataContext is TreeNodeItem node)
+                {
+                    //SetTreeState(node, state);
+                    SetChildrenState(node, state);
+                    SetParentState(node, state);
+                }
+            }
+        }
+
+        private void SetTreeState(TreeNodeItem node, bool state)
+        {
+            node.IsSelected = state;
+            SetChildrenState(node, state);
+            SetParentState(node, state);
+        }
+
+        private void SetChildrenState(TreeNodeItem node, bool state)
+        {
+            foreach (TreeNodeItem child in node.Children)
+            {
+                child.IsSelected = state;
+            }
+        }
+
+        private void SetParentState(TreeNodeItem node, bool state)
+        {
+            if (node.Parent != null)
+            {
+                node.Parent.IsSelected = state;
+                SetParentState(node.Parent, state);
+            }
+
+        }
+    }
+}
+

+ 59 - 9
MBI/SAGA.MBI/WinView/ModeInfoMaintenance/VMMatchFM.cs

@@ -395,23 +395,73 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
         {
             FloorName = floorName;
             FMList = new ObservableCollection<MEquipFM>();
-
-            foreach (var item in list)
+            //1,首先按方案1过滤
+            //1.a,如果有值,过滤没有关联岗位的。
+            //1.b,1.a有值,推荐1.a;没有值,推荐1;
+            //2,1没有值,按方案2过滤
+            var tempList = list.Where(t => IsMathPlan1(t, equip));
+            if (tempList.Any())
             {
-                if (IsMath(item, equip))
-                    FMList.Add(item);
+                var nodutyList = tempList.Where(t => t.EquipmentId.IsNotNullEmpty());
+                if (nodutyList.Any())
+                {
+                    foreach (MEquipFM fm in nodutyList)
+                    {
+                        FMList.Add(fm);
+                    }
+                }
+                else
+                {
+                    foreach (MEquipFM fm in tempList)
+                    {
+                        FMList.Add(fm);
+                    }
+                }
+            }
+            else
+            {
+                foreach (var item in list)
+                {
+                    if (IsMathPlan2(item, equip))
+                        FMList.Add(item);
+                }
             }
         }
-
-        private bool IsMath(MEquipFM equipFm, MRevitEquipBase equip)
+        /// <summary>
+        /// 推荐方案1,同设备族and距离近
+        /// </summary>
+        /// <param name="equipFm"></param>
+        /// <param name="equip"></param>
+        /// <returns></returns>
+        private bool IsMathPlan1(MEquipFM equipFm, MRevitEquipBase equip)
         {
             bool result = false;
-            List<Func< MEquipFM , MRevitEquipBase ,bool>> funcs=new List<Func<MEquipFM, MRevitEquipBase, bool>>();
+            List<Func<MEquipFM, MRevitEquipBase, bool>> funcs = new List<Func<MEquipFM, MRevitEquipBase, bool>>();
+            funcs.Add(IsLocationNear);
+            while (true)
+            {
+                if (equipFm.FamilyCode != equip.Family.Code)
+                    break;
+                result = funcs.Any(t => t(equipFm, equip));
+                break;
+            }
+            return result;
+        }
+        /// <summary>
+        /// 推荐方案2,同设备族and没有与其它岗位关联,
+        /// 同一楼层or点位同一楼层or安装位置同一楼层or本地名称或本地编码不为null,且相等
+        /// </summary>
+        /// <param name="equipFm"></param>
+        /// <param name="equip"></param>
+        /// <returns></returns>
+        private bool IsMathPlan2(MEquipFM equipFm, MRevitEquipBase equip)
+        {
+            bool result = false;
+            List<Func<MEquipFM, MRevitEquipBase, bool>> funcs = new List<Func<MEquipFM, MRevitEquipBase, bool>>();
             funcs.Add(IsSameFloor);
             funcs.Add(IsSamePointFloor);
             funcs.Add(IsSameInstallLocation);
             funcs.Add(IsSameLocalNameOrId);
-            funcs.Add(IsLocationNear);
             while (true)
             {
                 //不推荐已经绑定过的
@@ -419,7 +469,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
                     break;
                 if (equipFm.FamilyCode != equip.Family.Code)
                     break;
-                result=funcs.Any(t => t(equipFm, equip));
+                result = funcs.Any(t => t(equipFm, equip));
                 break;
             }
             return result;

BIN
MBI/SAGA.RevitMenu/obj/Debug/DesignTimeResolveAssemblyReferences.cache


BIN
MBI/SAGA.RevitMenu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 0 - 74
MBI/SAGA.RevitMenu/obj/Debug/Dockpane/WinDockPaneTest.g.i.cs

@@ -1,74 +0,0 @@
-#pragma checksum "..\..\..\Dockpane\WinDockPaneTest.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FE2C85824A967D26DE62A3EEDD22AEFEA8317909"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为,并且如果
-//     重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SAGA.RevitMenu.Dockpane {
-    
-    
-    /// <summary>
-    /// WinDockPaneTest
-    /// </summary>
-    public partial class WinDockPaneTest : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SAGA.RevitMenu;component/dockpane/windockpanetest.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Dockpane\WinDockPaneTest.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 0 - 0
MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.csproj.CopyComplete


+ 0 - 1
MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-89fb8a4e6a598234ae79a959c4ff28e995f3afe4

+ 0 - 29
MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.csproj.FileListAbsolute.txt

@@ -1,29 +0,0 @@
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.csprojResolveAssemblyReference.cache
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\SAGA.RevitMenu\obj\Debug\Dockpane\WinDockPaneTest.baml
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\SAGA.RevitMenu\obj\Debug\Dockpane\WinDockPaneTest.g.cs
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu_MarkupCompile.cache
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.g.resources
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.csproj.CoreCompileInputs.cache
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\OutputDll\Logger\log4net.config
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\OutputDll\SAGA.RevitMenu.dll
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\OutputDll\SAGA.RevitMenu.pdb
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.dll
-D:\SVN\YS-01 上帝之手\v1.0 revit整体工具(MBI)\03-Code\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.pdb
-D:\SVNCode\MBI\OutputDll\Logger\log4net.config
-D:\SVNCode\MBI\OutputDll\Logger\NLog.config
-D:\SVNCode\MBI\OutputDll\ShortKey\KeyboardShortcuts.xml
-D:\SVNCode\MBI\OutputDll\SAGA.RevitMenu.dll
-D:\SVNCode\MBI\OutputDll\SAGA.RevitMenu.pdb
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.csprojResolveAssemblyReference.cache
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.csproj.CoreCompileInputs.cache
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.dll
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.pdb
-D:\GitCode\MBI\OutputDll\Logger\log4net.config
-D:\GitCode\MBI\OutputDll\Logger\NLog.config
-D:\GitCode\MBI\OutputDll\ShortKey\KeyboardShortcuts.xml
-D:\GitCode\MBI\OutputDll\SAGA.RevitMenu.dll
-D:\GitCode\MBI\OutputDll\SAGA.RevitMenu.pdb
-D:\GitCode\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.csprojResolveAssemblyReference.cache
-D:\GitCode\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.csproj.CoreCompileInputs.cache
-D:\GitCode\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.dll
-D:\GitCode\MBI\SAGA.RevitMenu\obj\Debug\SAGA.RevitMenu.pdb

BIN
MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.csprojResolveAssemblyReference.cache


BIN
MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.dll


BIN
MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu.pdb


+ 0 - 20
MBI/SAGA.RevitMenu/obj/Debug/SAGA.RevitMenu_MarkupCompile.i.cache

@@ -1,20 +0,0 @@
-SAGA.RevitMenu
-
-
-library
-C#
-.cs
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\Debug\
-SAGA.RevitMenu
-none
-false
-DEBUG;TRACE
-
-11471631069
-131366784
-17-755253384
-21523538358
-Dockpane\WinDockPaneTest.xaml;
-
-False
-

+ 0 - 0
MBI/SAGA.RevitMenu/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs


BIN
MBI/SAGA.RevitMenu/obj/R17/DesignTimeResolveAssemblyReferencesInput.cache


+ 0 - 74
MBI/SAGA.RevitMenu/obj/R17/Dockpane/WinDockPaneTest.g.i.cs

@@ -1,74 +0,0 @@
-#pragma checksum "..\..\..\Dockpane\WinDockPaneTest.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "39C389F64A3361F879347B6F234C54C5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为,并且如果
-//     重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SAGA.RevitMenu.Dockpane {
-    
-    
-    /// <summary>
-    /// WinDockPaneTest
-    /// </summary>
-    public partial class WinDockPaneTest : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SAGA.RevitMenu;component/dockpane/windockpanetest.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Dockpane\WinDockPaneTest.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 0 - 1
MBI/SAGA.RevitMenu/obj/R17/SAGA.RevitMenu.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-4a1721cffcf27e4603ef10b51fe6eaee97c0c2fa

+ 0 - 20
MBI/SAGA.RevitMenu/obj/R17/SAGA.RevitMenu_MarkupCompile.i.cache

@@ -1,20 +0,0 @@
-SAGA.RevitMenu
-
-
-library
-C#
-.cs
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\R17\
-SAGA.RevitMenu
-none
-false
-DEBUG;TRACE
-
-11471631069
-131366784
-311248574175
-18-831463022
-Dockpane\WinDockPaneTest.xaml;
-
-False
-

+ 0 - 0
MBI/SAGA.RevitMenu/obj/R17/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/R17/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/R17/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/R17/build.force


BIN
MBI/SAGA.RevitMenu/obj/R18/DesignTimeResolveAssemblyReferencesInput.cache


+ 0 - 74
MBI/SAGA.RevitMenu/obj/R18/Dockpane/WinDockPaneTest.g.i.cs

@@ -1,74 +0,0 @@
-#pragma checksum "..\..\..\Dockpane\WinDockPaneTest.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "39C389F64A3361F879347B6F234C54C5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为,并且如果
-//     重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SAGA.RevitMenu.Dockpane {
-    
-    
-    /// <summary>
-    /// WinDockPaneTest
-    /// </summary>
-    public partial class WinDockPaneTest : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SAGA.RevitMenu;component/dockpane/windockpanetest.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Dockpane\WinDockPaneTest.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 0 - 1
MBI/SAGA.RevitMenu/obj/R18/SAGA.RevitMenu.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-2d17e6724f7325b0caa26c36ce77c51ac13ab707

+ 0 - 20
MBI/SAGA.RevitMenu/obj/R18/SAGA.RevitMenu_MarkupCompile.i.cache

@@ -1,20 +0,0 @@
-SAGA.RevitMenu
-
-
-library
-C#
-.cs
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\R18\
-SAGA.RevitMenu
-none
-false
-DEBUG;TRACE
-
-11471631069
-131366784
-31-1307395339
-18-1223146826
-Dockpane\WinDockPaneTest.xaml;
-
-False
-

+ 0 - 0
MBI/SAGA.RevitMenu/obj/R18/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/R18/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/R18/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/R18/build.force


BIN
MBI/SAGA.RevitMenu/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache


+ 0 - 74
MBI/SAGA.RevitMenu/obj/Release/Dockpane/WinDockPaneTest.g.i.cs

@@ -1,74 +0,0 @@
-#pragma checksum "..\..\..\Dockpane\WinDockPaneTest.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "39C389F64A3361F879347B6F234C54C5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为,并且如果
-//     重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SAGA.RevitMenu.Dockpane {
-    
-    
-    /// <summary>
-    /// WinDockPaneTest
-    /// </summary>
-    public partial class WinDockPaneTest : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SAGA.RevitMenu;component/dockpane/windockpanetest.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Dockpane\WinDockPaneTest.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 0 - 1
MBI/SAGA.RevitMenu/obj/Release/SAGA.RevitMenu.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-723c7375db3568659816f2ee2c73ae613a25de4b

+ 0 - 20
MBI/SAGA.RevitMenu/obj/Release/SAGA.RevitMenu_MarkupCompile.i.cache

@@ -1,20 +0,0 @@
-SAGA.RevitMenu
-
-
-library
-C#
-.cs
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\Release\
-SAGA.RevitMenu
-none
-false
-TRACE
-
-11471631069
-131366784
-31146132709
-18-124632608
-Dockpane\WinDockPaneTest.xaml;
-
-False
-

+ 0 - 0
MBI/SAGA.RevitMenu/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/Release/build.force


BIN
MBI/SAGA.RevitMenu/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache


BIN
MBI/SAGA.RevitMenu/obj/x64/Debug/Dockpane/WinDockPaneTest.baml


+ 0 - 74
MBI/SAGA.RevitMenu/obj/x64/Debug/Dockpane/WinDockPaneTest.g.cs

@@ -1,74 +0,0 @@
-#pragma checksum "..\..\..\..\Dockpane\WinDockPaneTest.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "39C389F64A3361F879347B6F234C54C5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为,并且如果
-//     重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SAGA.RevitMenu.Dockpane {
-    
-    
-    /// <summary>
-    /// WinDockPaneTest
-    /// </summary>
-    public partial class WinDockPaneTest : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SAGA.RevitMenu;component/dockpane/windockpanetest.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\Dockpane\WinDockPaneTest.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 0 - 74
MBI/SAGA.RevitMenu/obj/x64/Debug/Dockpane/WinDockPaneTest.g.i.cs

@@ -1,74 +0,0 @@
-#pragma checksum "..\..\..\..\Dockpane\WinDockPaneTest.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "39C389F64A3361F879347B6F234C54C5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为,并且如果
-//     重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SAGA.RevitMenu.Dockpane {
-    
-    
-    /// <summary>
-    /// WinDockPaneTest
-    /// </summary>
-    public partial class WinDockPaneTest : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SAGA.RevitMenu;component/dockpane/windockpanetest.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\Dockpane\WinDockPaneTest.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 0 - 1
MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-f3500ddb110103374ea2c77f302e9ba492eecadb

+ 0 - 6
MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu.csproj.FileListAbsolute.txt

@@ -1,6 +0,0 @@
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\Debug\SAGA.RevitMenu.csprojResolveAssemblyReference.cache
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\Debug\Dockpane\WinDockPaneTest.baml
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\Debug\Dockpane\WinDockPaneTest.g.cs
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\Debug\SAGA.RevitMenu_MarkupCompile.cache
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\Debug\SAGA.RevitMenu.g.resources
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\Debug\SAGA.RevitMenu.csproj.CoreCompileInputs.cache

BIN
MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu.csprojResolveAssemblyReference.cache


BIN
MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu.g.resources


+ 0 - 20
MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu_MarkupCompile.cache

@@ -1,20 +0,0 @@
-SAGA.RevitMenu
-
-
-library
-C#
-.cs
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\Debug\
-SAGA.RevitMenu
-none
-false
-DEBUG;TRACE
-
-11471631069
-131366784
-27-377550281
-18-1758549166
-Dockpane\WinDockPaneTest.xaml;
-
-False
-

+ 0 - 20
MBI/SAGA.RevitMenu/obj/x64/Debug/SAGA.RevitMenu_MarkupCompile.i.cache

@@ -1,20 +0,0 @@
-SAGA.RevitMenu
-
-
-library
-C#
-.cs
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\Debug\
-SAGA.RevitMenu
-none
-false
-DEBUG;TRACE
-
-11471631069
-131366784
-31-1250252675
-18-1758549166
-Dockpane\WinDockPaneTest.xaml;
-
-False
-

+ 0 - 0
MBI/SAGA.RevitMenu/obj/x64/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/x64/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/x64/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs


BIN
MBI/SAGA.RevitMenu/obj/x64/R17/DesignTimeResolveAssemblyReferencesInput.cache


+ 0 - 74
MBI/SAGA.RevitMenu/obj/x64/R17/Dockpane/WinDockPaneTest.g.i.cs

@@ -1,74 +0,0 @@
-#pragma checksum "..\..\..\..\Dockpane\WinDockPaneTest.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "39C389F64A3361F879347B6F234C54C5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为,并且如果
-//     重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace SAGA.RevitMenu.Dockpane {
-    
-    
-    /// <summary>
-    /// WinDockPaneTest
-    /// </summary>
-    public partial class WinDockPaneTest : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/SAGA.RevitMenu;component/dockpane/windockpanetest.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\Dockpane\WinDockPaneTest.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-

+ 0 - 1
MBI/SAGA.RevitMenu/obj/x64/R17/SAGA.RevitMenu.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-28c317d1b2755e0bb127e6c28b188440435f4cd7

+ 0 - 20
MBI/SAGA.RevitMenu/obj/x64/R17/SAGA.RevitMenu_MarkupCompile.i.cache

@@ -1,20 +0,0 @@
-SAGA.RevitMenu
-
-
-library
-C#
-.cs
-D:\SVNCode\MBI\SAGA.RevitMenu\obj\x64\R17\
-SAGA.RevitMenu
-none
-false
-DEBUG;TRACE
-
-11471631069
-131366784
-3110226011
-181519922878
-Dockpane\WinDockPaneTest.xaml;
-
-False
-

+ 0 - 0
MBI/SAGA.RevitMenu/obj/x64/R17/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/x64/R17/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/x64/R17/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs


+ 0 - 0
MBI/SAGA.RevitMenu/obj/x64/R17/build.force