修复bug，更新族

RookieStation/CommonTools/ExecuteCmd/CmdChangeBackgroundColor.cs

@@ -0,0 +1,32 @@
+using Autodesk.Revit.DB;
+using Autodesk.Revit.UI;
+using Autodesk.Revit.UI.Selection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RookieStation.CommonTools.ExecuteCmd
+{
+    [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
+    [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]
+    internal class CmdChangeBackgroundColor : IExternalCommand
+    {
+        public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
+        {
+            UIApplication uiapp = commandData.Application;
+            UIDocument uidoc = commandData.Application.ActiveUIDocument;
+            Color col = uiapp.Application.BackgroundColor;
+            if (col.Red == 255 && col.Green == 255 && col.Blue == 255)
+            {
+                uiapp.Application.BackgroundColor = new Color(32, 40, 49);
+            }
+            else
+            {
+                uiapp.Application.BackgroundColor = new Color(255, 255, 255);
+            }
+            return Result.Succeeded;
+        }
+    }
+}

RookieStation/CommonTools/Views/WpfFamilyDockablePane.xaml

@@ -56,7 +56,7 @@
             VerticalAlignment="Stretch"
             hc:InfoElement.Placeholder="请输入搜索的族文件名"
             FontFamily="{StaticResource IconFont}"
-            TextChanged="tbSearch_TextChanged" />
+            TextChanged="TbSearch_TextChanged" />
         <Button
             x:Name="btnSearch"
             Grid.Row="1"

RookieStation/CommonTools/Views/WpfFamilyDockablePane.xaml.cs

@@ -49,8 +49,10 @@ namespace RookieStation.CommonTools.Views
         {
             data.FrameworkElement = this as FrameworkElement;
 
-            data.InitialState = new DockablePaneState();
+            data.InitialState = new DockablePaneState
-            data.InitialState.DockPosition = DockPosition.Left;
+            {
+                DockPosition = DockPosition.Left
+            };
         }
 
         private Dictionary<string, string> GetTopDirectoryFolder(string folder)
@@ -155,7 +157,7 @@ namespace RookieStation.CommonTools.Views
             lbFamilyLib.ItemsSource = searchfamily;
         }
 
-        private void tbSearch_TextChanged(object sender, TextChangedEventArgs e)
+        private void TbSearch_TextChanged(object sender, TextChangedEventArgs e)
         {
             if (tbSearch.Text == "")
             {

RookieStation/Drawing/ExecuteCmds/CmdCreateLightLegend.cs

@@ -52,7 +52,7 @@ namespace RookieStation.Drawing.ExecuteCmds
                         {
                             RsRevitUtils.SetLegendLocation(doc, legend);
                         });
-                    });
+                    }, "创建灯具图例");
                 }
                 catch (Autodesk.Revit.Exceptions.OperationCanceledException)
                 {
@@ -106,6 +106,12 @@ namespace RookieStation.Drawing.ExecuteCmds
         private void CreateLightLegend(Document doc, List<LegendItem> items, View newLegend, int viewScale)
         {
             TextNoteType textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Where(x => x.Name.Contains(UserConstant.FontName)).FirstOrDefault() as TextNoteType;
+            if (textNoteType == null)
+            {
+                textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Cast<TextNoteType>().FirstOrDefault().Duplicate(UserConstant.FontName) as TextNoteType;
+                textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).SetValueString("2.5");
+                textNoteType.get_Parameter(BuiltInParameter.TEXT_WIDTH_SCALE).SetValueString("0.8");
+            }
             double fontSize = textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).AsDouble();
             double actualTextHeight = fontSize * 1.6;
             double tableGridHeight = actualTextHeight * viewScale * 2;//图例网格高度

RookieStation/Drawing/ExecuteCmds/CmdCreateShelvesLegend.cs

@@ -51,7 +51,7 @@ namespace RookieStation.Drawing.ExecuteCmds
                         {
                             RsRevitUtils.SetLegendLocation(doc, legend);
                         });
-                    });
+                    }, "创建货架图例");
                 }
                 catch (Autodesk.Revit.Exceptions.OperationCanceledException)
                 {
@@ -79,7 +79,7 @@ namespace RookieStation.Drawing.ExecuteCmds
             foreach (var group in shelfGroup)
             {
                 var instance = group.ElementAt(0);
-                var l = Math.Round(instance.Symbol.GetParameters("长度").FirstOrDefault().AsDouble() * 304.8 / 1000);
+                var l = instance.Symbol.GetParameters("长度").FirstOrDefault().AsValueString();
 
                 ShelfStatistic shelfStatistic = new ShelfStatistic
                 {
@@ -88,8 +88,8 @@ namespace RookieStation.Drawing.ExecuteCmds
                     GroundArea = Math.Round(area, 2),
                     DesignOrders = UserConstant.Orders
                 };
-                shelfStatistic.LinearMetre = shelfStatistic.Count * l;
+                shelfStatistic.LinearMetre = shelfStatistic.Count * Convert.ToDouble(l) / 1000;
-                shelfStatistic.CapacityOrders = (int)shelfStatistic.LinearMetre * 80;
+                shelfStatistic.CapacityOrders = Convert.ToInt32(shelfStatistic.LinearMetre * 80);
                 statistics.Add(shelfStatistic);
             }
             return statistics;
@@ -105,6 +105,12 @@ namespace RookieStation.Drawing.ExecuteCmds
         private void CreateShelfLegend(Document doc, List<ShelfStatistic> statistics, View newLegend, int viewScale)
         {
             TextNoteType textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Where(x => x.Name.Contains(UserConstant.FontName)).FirstOrDefault() as TextNoteType;
+            if (textNoteType == null)
+            {
+                textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Cast<TextNoteType>().FirstOrDefault().Duplicate(UserConstant.FontName) as TextNoteType;
+                textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).SetValueString("2.5");
+                textNoteType.get_Parameter(BuiltInParameter.TEXT_WIDTH_SCALE).SetValueString("0.8");
+            }
             double fontSize = textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).AsDouble();
             double actualTextHeight = fontSize * 1.6;
             double tableGridHeight = actualTextHeight * viewScale * 1.2;//图例网格高度
@@ -152,13 +158,21 @@ namespace RookieStation.Drawing.ExecuteCmds
                 TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableGridWidth * 2.5) + yElevation,
                     statistics[i].LinearMetre.ToString(), opts);
             }
-            TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableGridWidth * 3.5) + XYZ.BasisY * tableGridHeight * statistics.Count() / 2, statistics[0].CapacityOrders.ToString(), opts);
+            //承载单量总和
-            TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableGridWidth * 4.5) + XYZ.BasisY * tableGridHeight * statistics.Count() / 2, statistics[0].DesignOrders.ToString(), opts);
+            int orders = 0;
-            TextNote tn = TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableGridWidth * 5.5) + XYZ.BasisY * tableGridHeight * statistics.Count() / 2, statistics[0].GroundArea + "m2".ToString(), opts);
+            for (int i = 0; i < statistics.Count; i++)
-            FormattedText formattedText = new FormattedText(tn.Text);
+            {
-            TextRange range = new TextRange(tn.Text.Length - 2, 1);
+                orders += statistics[i].CapacityOrders;
+            }
+            TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableGridWidth * 3.5) + XYZ.BasisY * tableGridHeight * statistics.Count() / 2, orders.ToString(), opts);
+            //设计单量
+            TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableGridWidth * 4.5) + XYZ.BasisY * tableGridHeight * statistics.Count() / 2, statistics.FirstOrDefault().DesignOrders.ToString(), opts);
+            //面积
+            TextNote area = TextNote.Create(doc, newLegend.Id, XYZ.BasisX * (tableGridWidth * 5.5) + XYZ.BasisY * tableGridHeight * statistics.Count() / 2, statistics[0].GroundArea + "m2".ToString(), opts);
+            FormattedText formattedText = new FormattedText(area.Text);
+            TextRange range = new TextRange(area.Text.Length - 2, 1);
             formattedText.SetSuperscriptStatus(range, true);
-            tn.SetFormattedText(formattedText);
+            area.SetFormattedText(formattedText);
             var curves = doc.Create.NewDetailCurveArray(newLegend, curveArray);
         }
     }

RookieStation/Drawing/ExecuteCmds/CmdCreateSocketLegend.cs

@@ -51,7 +51,7 @@ namespace RookieStation.Drawing.ExecuteCmds
                         {
                             RsRevitUtils.SetLegendLocation(doc, legend);
                         });
-                    });
+                    }, "创建插座图例");
                 }
                 catch (Autodesk.Revit.Exceptions.OperationCanceledException)
                 {
@@ -104,6 +104,12 @@ namespace RookieStation.Drawing.ExecuteCmds
         private void CreateSocketLegend(Document doc, List<LegendItem> items, View newLegend, int viewScale)
         {
             TextNoteType textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Where(x => x.Name.Contains(UserConstant.FontName)).FirstOrDefault() as TextNoteType;
+            if (textNoteType == null)
+            {
+                textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Cast<TextNoteType>().FirstOrDefault().Duplicate(UserConstant.FontName) as TextNoteType;
+                textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).SetValueString("2.5");
+                textNoteType.get_Parameter(BuiltInParameter.TEXT_WIDTH_SCALE).SetValueString("0.8");
+            }
             double fontSize = textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).AsDouble();
             double actualTextHeight = fontSize * 1.6;
             double tableGridHeight = actualTextHeight * viewScale * 2;//图例网格高度

RookieStation/Drawing/ExecuteCmds/CmdCreateSwitchLegend.cs

@@ -51,7 +51,7 @@ namespace RookieStation.Drawing.ExecuteCmds
                         {
                             RsRevitUtils.SetLegendLocation(doc, legend);
                         });
-                    });
+                    }, "创建开关图例");
                 }
                 catch (Autodesk.Revit.Exceptions.OperationCanceledException)
                 {
@@ -102,6 +102,12 @@ namespace RookieStation.Drawing.ExecuteCmds
         private void CreateSwitchLegend(Document doc, List<LegendItem> items, View newLegend, int viewScale)
         {
             TextNoteType textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Where(x => x.Name.Contains(UserConstant.FontName)).FirstOrDefault() as TextNoteType;
+            if (textNoteType == null)
+            {
+                textNoteType = new FilteredElementCollector(doc).OfClass(typeof(TextNoteType)).Cast<TextNoteType>().FirstOrDefault().Duplicate(UserConstant.FontName) as TextNoteType;
+                textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).SetValueString("2.5");
+                textNoteType.get_Parameter(BuiltInParameter.TEXT_WIDTH_SCALE).SetValueString("0.8");
+            }
             double fontSize = textNoteType.get_Parameter(BuiltInParameter.TEXT_SIZE).AsDouble();
             double actualTextHeight = fontSize * 1.6;
             double tableGridHeight = actualTextHeight * viewScale * 2;//图例网格高度

RookieStation/Drawing/ExecuteCmds/CmdCreateViewPlanAnnotation.cs

@@ -62,7 +62,6 @@ namespace RookieStation.Drawing.ExecuteCmds
             }
             else
             {
-                //message = "请打开平、立、剖视图";
                 TaskDialog.Show("温馨提示", "需在平面视图使用此命令");
                 return Result.Failed;
             }
@@ -85,8 +84,10 @@ namespace RookieStation.Drawing.ExecuteCmds
                     var faces = RsRevitUtils.GetSideFacesByElement(familyInstance);
                     if (faces.Count == 0)//找不到实例的几何元素时，需从类型集合查找
                     {
-                        Options options = new Options();
+                        Options options = new Options
-                        options.ComputeReferences = true;
+                        {
+                            ComputeReferences = true
+                        };
                         faces = RsRevitUtils.GetFacesByFamilyInstance(familyInstance, options);
                         for (int i = faces.Count - 1; i >= 0; i--)
                         {
@@ -124,8 +125,10 @@ namespace RookieStation.Drawing.ExecuteCmds
                     var faces = RsRevitUtils.GetSideFacesByElement(familyInstance);
                     if (faces.Count == 0)//找不到实例的几何元素时，需从类型集合查找
                     {
-                        Options options = new Options();
+                        Options options = new Options
-                        options.ComputeReferences = true;
+                        {
+                            ComputeReferences = true
+                        };
                         faces = RsRevitUtils.GetFacesByFamilyInstance(familyInstance, options);
                         for (int i = faces.Count - 1; i >= 0; i--)
                         {
@@ -365,7 +368,7 @@ namespace RookieStation.Drawing.ExecuteCmds
                 }
                 if (loc != null && lightcategory != null && lightcategory.Id.IntegerValue == -2001120)
                 {
-                    IndependentTag independentTag = IndependentTag.Create(doc, doc.ActiveView.Id, new Reference(light), false, TagMode.TM_ADDBY_CATEGORY, TagOrientation.Horizontal, loc);
+                    IndependentTag.Create(doc, doc.ActiveView.Id, new Reference(light), false, TagMode.TM_ADDBY_CATEGORY, TagOrientation.Horizontal, loc);
                     lights.Add(light);
                 }
             }
@@ -472,7 +475,6 @@ namespace RookieStation.Drawing.ExecuteCmds
                 var cate = ele.Category;
                 var loc = RsRevitUtils.GetLocationPointByElement(ele);
                 var d = ele as FamilyInstance;
-                var rotateaxis = Line.CreateUnbound(new XYZ(), XYZ.BasisZ);
                 if (loc != null && cate != null)
                 {
                     if (cate.Id.IntegerValue == -2000023 || cate.Id.IntegerValue == -2000014)
@@ -524,7 +526,7 @@ namespace RookieStation.Drawing.ExecuteCmds
                 LogicalOrFilter orFilter = new LogicalOrFilter(isInsideFilter, intersectsFilter);
 
                 columncol.WherePasses(orFilter);
-
+                StringBuilder sb = new StringBuilder();
                 foreach (FamilyInstance column in columncol)
                 {
                     if (!JoinGeometryUtils.AreElementsJoined(doc, wall, column))
@@ -535,10 +537,11 @@ namespace RookieStation.Drawing.ExecuteCmds
                         }
                         catch (Exception)
                         {
-                            TaskDialog.Show("error", column.Id.ToString());
+                            sb.Append(column.Id.IntegerValue.ToString() + "\n\r");
                         }
                     }
                 }
+                TaskDialog.Show("连接墙柱存在错误", sb.ToString());
             }
         }
 
@@ -586,7 +589,7 @@ namespace RookieStation.Drawing.ExecuteCmds
             var loc = wall.Location as LocationCurve;
             Curve curve = loc.Curve;
             FilteredElementCollector col = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Walls).WhereElementIsNotElementType();
-            IntersectionResultArray intersection = new IntersectionResultArray();
+            IntersectionResultArray intersection;
             //StringBuilder sb = new StringBuilder();
             foreach (Wall w in col)
             {
@@ -627,7 +630,7 @@ namespace RookieStation.Drawing.ExecuteCmds
             var loc = w.Location as LocationCurve;
             Curve curve = loc.Curve;
             FilteredElementCollector eles = new FilteredElementCollector(doc).OfCategory(BuiltInCategory.OST_Walls).WhereElementIsNotElementType();
-            IntersectionResultArray intersection = new IntersectionResultArray();
+            IntersectionResultArray intersection;
             StringBuilder sb = new StringBuilder();
             foreach (Wall ele in eles)
             {

RookieStation/Drawing/ExecuteCmds/CmdCreateWires.cs

@@ -5,6 +5,7 @@ using Autodesk.Revit.UI.Selection;
 using RookieStation.Extension;
 using RookieStation.ParcelAreaModule.Views;
 using RookieStation.Utils;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Controls;
@@ -31,61 +32,85 @@ namespace RookieStation.Drawing.ExecuteCmds
                     //var instances = refers.Select(refer => doc.GetElement(refer) as FamilyInstance);
                     var instances = uidoc.Selection.PickElementsByRectangle(new SelectFilter<FamilyInstance>(), "请选择灯具").Cast<FamilyInstance>();
                     //var instances = refers.Select(refer => doc.GetElement(refer) as FamilyInstance).OrderBy(fi => RsRevitUtils.GetLocationPointByElement(fi).X).ThenBy(fi => RsRevitUtils.GetLocationPointByElement(fi).Y);
-                    var instancesGroupByX = instances.GroupBy(fi => RsRevitUtils.GetLocationPointByElement(fi).X);
+                    var instancesGroupByX = instances.GroupBy(fi => Math.Round(RsRevitUtils.GetLocationPointByElement(fi).X, 5));
-                    var instancesGroupByY = instances.GroupBy(fi => RsRevitUtils.GetLocationPointByElement(fi).Y);
+                    var instancesGroupByY = instances.GroupBy(fi => Math.Round(RsRevitUtils.GetLocationPointByElement(fi).Y, 5));
                     IOrderedEnumerable<FamilyInstance> instancesOrdered = null;
                     if (instancesGroupByX.Count() <= instancesGroupByY.Count())
                     {
-                        instancesOrdered = instances.OrderBy(fi => RsRevitUtils.GetLocationPointByElement(fi).X).ThenBy(fi => RsRevitUtils.GetLocationPointByElement(fi).Y);
+                        instancesOrdered = instances.OrderBy(fi => Math.Round(RsRevitUtils.GetLocationPointByElement(fi).X, 5)).ThenBy(fi => Math.Round(RsRevitUtils.GetLocationPointByElement(fi).Y, 5));
                     }
                     else
                     {
-                        instancesOrdered = instances.OrderBy(fi => RsRevitUtils.GetLocationPointByElement(fi).Y).ThenBy(fi => RsRevitUtils.GetLocationPointByElement(fi).X);
+                        instancesOrdered = instances.OrderBy(fi => Math.Round(RsRevitUtils.GetLocationPointByElement(fi).Y, 5)).ThenBy(fi => Math.Round(RsRevitUtils.GetLocationPointByElement(fi).X, 5));
                     }
-                    doc.InvokeGroup(tg =>
+                    doc.InvokeGroup<Result>(tg =>
-                    {
+                   {
-                        for (int i = 0; i < instancesOrdered.Count() - 1; i++)
+                       for (int i = 0; i < instancesOrdered.Count() - 1; i++)
-                        {
+                       {
-                            var fi = instancesOrdered.ElementAt(i);
+                           var fi = instancesOrdered.ElementAt(i);
-                            var fi1 = instancesOrdered.ElementAt(i + 1);
+                           var fi1 = instancesOrdered.ElementAt(i + 1);
-                            CreateWire(doc, fi, fi1, i);
+                           try
-                        }
+                           {
+                               CreateWire(doc, fi, fi1, i);
+                           }
+                           catch (Exception)
+                           {
+                               TaskDialog.Show("错误", "存在部分照明设备族未设置导线连接件");
+                               return Result.Failed;
+                           }
+                       }
 
-                        foreach (var instance in instances)
+                       foreach (var instance in instances)
-                        {
+                       {
-                            FamilyInstance closestInstance = null;
+                           FamilyInstance closestInstance = null;
-                            if (instance.MEPModel.ConnectorManager.UnusedConnectors.Size > 0)
+                           if (instance.MEPModel.ConnectorManager.UnusedConnectors.Size > 0)
-                            {
+                           {
-                                var p = RsRevitUtils.GetLocationPointByElement(instance);
+                               var p = RsRevitUtils.GetLocationPointByElement(instance);
-                                var mindistance = 10.0;
+                               var mindistance = 10.0;
-                                foreach (var instanceSearched in instances)
+                               foreach (var instanceSearched in instances)
-                                {
+                               {
-                                    var sp = RsRevitUtils.GetLocationPointByElement(instanceSearched);
+                                   var sp = RsRevitUtils.GetLocationPointByElement(instanceSearched);
-                                    var sdistance = sp.DistanceTo(p);
+                                   var sdistance = sp.DistanceTo(p);
-                                    if (sdistance < mindistance && sdistance != 0)
+                                   if (sdistance < mindistance && sdistance != 0)
-                                    {
+                                   {
-                                        closestInstance = instanceSearched;
+                                       closestInstance = instanceSearched;
-                                        mindistance = sdistance;
+                                       mindistance = sdistance;
-                                    }
+                                   }
-                                }
+                               }
-                                CreateWire(doc, instance, closestInstance, 0);
+                               try
-                            }
+                               {
-                        }
+                                   CreateWire(doc, instance, closestInstance, 0);
-                    }, "创建导线");
+                               }
+                               catch (Exception)
+                               {
+                                   TaskDialog.Show("错误", "存在部分照明设备族未设置导线连接件");
+                                   return Result.Failed;
+                               }
+                           }
+                       }
+                       return Result.Succeeded;
+                   }, "创建导线");
                 }
+                return Result.Failed;
             }
             catch (Autodesk.Revit.Exceptions.OperationCanceledException)
             {
+                return Result.Succeeded;
             }
-
-            return Result.Succeeded;
         }
 
         public void CreateWire(Document doc, FamilyInstance firstInstance, FamilyInstance endInstance, int i)
         {
             var wireTypeId = doc.GetDefaultElementTypeId(ElementTypeGroup.WireType);
-            var firstConnectors = firstInstance.MEPModel.ConnectorManager.Connectors;
+            var connManager = firstInstance.MEPModel.ConnectorManager;
+            //if (connManager == null)
+            //{
+            //    TaskDialog.Show("错误", "存在部分照明设备族未设置导线连接件");
+            //    return;
+            //}
+            var firstConnectors = connManager.Connectors;
             Connector connector = null;
+
             foreach (Connector it in firstConnectors)
             {
                 connector = it;
@@ -106,10 +131,14 @@ namespace RookieStation.Drawing.ExecuteCmds
             List<XYZ> pts = new List<XYZ>();
             pts.Add(loc);
             var l = Line.CreateBound(loc, loc1);
-            if (l.Length > 2200 / 304.8)
+            //if (l.Length > 2200 / 304.8)
-            {
+            //{
-                return;
+            //    return;
-            }
+            //}
+            //if (l.Length > 3000 / 304.8)
+            //{
+            //    return;
+            //}
             var off = l.Direction.CrossProduct(XYZ.BasisZ * 2);
             var cp = (loc + loc1) / 2;
             if (i % 2 == 0)

RookieStation/ParcelAreaModule/ExecuteCmds/CmdPlaceShelves.cs

@@ -246,7 +246,10 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds
                          if (vm.IsPlaceShelfCards == true)
                          {
                              var cardInstances = CreateAndNumberCards(doc, referline, shelf, ShelfInstances);
-                             DeleteOverlapCards(doc, cardInstances);
+                             doc.Invoke(ts =>
+                             {
+                                 RsRevitUtils.DeleteOverlapFamilyInstance(doc, cardInstances);
+                             }, "删除重合端牌");
                          }
                      }
                      if (vm.IsPlaceCableTray == true)
@@ -740,39 +743,6 @@ namespace RookieStation.ParcelAreaModule.ExecuteCmds
             return firstRowPoints;
         }
 
-        /// <summary>
-        /// 删除多余端牌
-        /// </summary>
-        /// <param name="doc"></param>
-        /// <param name="cardInstances"></param>
-        private void DeleteOverlapCards(Autodesk.Revit.DB.Document doc, List<FamilyInstance> cardInstances)
-        {
-            using (Transaction ts = new Transaction(doc, "删除多余端牌"))
-            {
-                ts.Start();
-                List<ElementId> idsToDelete = new List<ElementId>();
-
-                foreach (var ins in cardInstances)
-                {
-                    var lp = RsRevitUtils.GetLocationPointByElement(ins);
-                    foreach (var card in cardInstances)
-                    {
-                        var lpt = RsRevitUtils.GetLocationPointByElement(card);
-                        if (!card.Id.Equals(ins.Id) && lp.IsAlmostEqualTo(lpt))
-                        {
-                            idsToDelete.Add(ins.Id);
-                            idsToDelete.Add(card.Id);
-
-                            break;
-                        }
-                    }
-                }
-                doc.Delete(idsToDelete);
-
-                ts.Commit();
-            }
-        }
-
         private void Application_DocumentChanged(object sender, Autodesk.Revit.DB.Events.DocumentChangedEventArgs e)
         {
             ICollection<ElementId> idsAdded = e.GetAddedElementIds();

RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml

@@ -8,7 +8,7 @@
     Title="货架端牌"
     Width="129"
     Height="140"
-    MinWidth="240"
+    MinWidth="400"
     MinHeight="180"
     ShowInTaskbar="False"
     mc:Ignorable="d">
@@ -27,7 +27,8 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="1.2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <GroupBox Margin="2" Header="起始编号">
             <TextBox
@@ -48,19 +49,31 @@
                 <ComboBoxItem Content="三联货架" />
             </ComboBox>
         </GroupBox>
-
+        <CheckBox
+            x:Name="cbAutoIncreas"
+            Grid.Column="2"
+            Content="编号自增"
+            IsChecked="True"
+            ToolTip="编号自增可以连续布置端牌或对端牌编号" />
         <Button
             x:Name="btnPlace"
             Grid.Row="1"
             Grid.Column="0"
+            Click="btnConfirm_Click"
+            Content="单个布置" />
+        <Button
+            x:Name="btnBatchPlace"
+            Grid.Row="1"
+            Grid.Column="1"
             HorizontalAlignment="Center"
             Click="btnConfirm_Click"
-            Content="布置" />
+            Content="批量布置" />
+
         <Button
             x:Name="btnNumber"
             Grid.Row="1"
-            Grid.Column="1"
+            Grid.Column="2"
             Click="btnConfirm_Click"
-            Content="编号" />
+            Content="批量编号" />
     </Grid>
 </Window>

RookieStation/ParcelAreaModule/Views/WpfShelfCards.xaml.cs

@@ -24,6 +24,7 @@ namespace RookieStation.ParcelAreaModule.Views
         public int GroupNumber { get; set; }
         public bool IsPlace { get; set; }
         public bool IsContinue { get; set; }
+        public bool? IsAutoIncrease { get; set; }
         public int CurrentNumber { get; set; }
         public UIApplication UIApplication { get; set; }
 
@@ -43,11 +44,16 @@ namespace RookieStation.ParcelAreaModule.Views
             {
                 GroupNumber = cbGroup.SelectedIndex + 1;
                 CurrentNumber = num;
+                IsAutoIncrease = cbAutoIncreas.IsChecked;
                 Hide();
-                if (btn.Name == "btnPlace")
+                if (btn.Name == "btnBatchPlace")
                 {
                     PlaceCards(this, uidoc);
                 }
+                else if (btn.Name == "btnPlace")
+                {
+                    PlaceCard(this, uidoc);
+                }
                 else
                 {
                     NumberCards(this, uidoc);
@@ -65,6 +71,11 @@ namespace RookieStation.ParcelAreaModule.Views
             e.Handled = re.IsMatch(e.Text);
         }
 
+        /// <summary>
+        /// 端牌编号
+        /// </summary>
+        /// <param name="wpfShelfCards"></param>
+        /// <param name="uidoc"></param>
         private void NumberCards(WpfShelfCards wpfShelfCards, UIDocument uidoc)
         {
             Document doc = uidoc.Document;
@@ -75,9 +86,7 @@ namespace RookieStation.ParcelAreaModule.Views
             {
                 while (isContinue)
                 {
-                    List<FamilyInstance> instances = uidoc.Selection.PickElementsByRectangle(new CardsFilter(), "请框选要修改的端牌")
+                    List<FamilyInstance> instances = uidoc.Selection.PickElementsByRectangle(new CardsFilter(), "请框选要修改的端牌").Cast<FamilyInstance>().ToList();
-                                                                            .Cast<FamilyInstance>()
-                                                                            .ToList();
                     //var selected = uidoc.Selection.GetElementIds();
                     if (instances.Count == 0)
                     {
@@ -165,25 +174,131 @@ namespace RookieStation.ParcelAreaModule.Views
             }
         }
 
+        /// <summary>
+        /// 单个布置端牌
+        /// </summary>
+        /// <param name="wpfShelfCards"></param>
+        /// <param name="uidoc"></param>
+        private void PlaceCard(WpfShelfCards wpfShelfCards, UIDocument uidoc)
+        {
+            Document doc = uidoc.Document;
+            int CurrentNumber = wpfShelfCards.CurrentNumber;
+            bool isCoutinue = wpfShelfCards.IsContinue;
+            int GroupNumber = wpfShelfCards.GroupNumber;
+            int initialNumber = wpfShelfCards.CurrentNumber;
+            try
+            {
+                while (IsContinue)
+                {
+                    if (IsAutoIncrease == false || IsAutoIncrease == null)
+                    {
+                        CurrentNumber = initialNumber;
+                    }
+                    var shelfRefer = uidoc.Selection.PickObject(ObjectType.Element, new ShelfFilter(), "请选择需要布置端牌的货架");
+                    FamilyInstance shelf = doc.GetElement(shelfRefer) as FamilyInstance;
+                    Reference front_face = shelf.GetReferences(FamilyInstanceReferenceType.Front).FirstOrDefault();
+                    Reference back_face = shelf.GetReferences(FamilyInstanceReferenceType.Back).FirstOrDefault();
+                    var hand = shelf.HandOrientation;
+                    var width = shelf.Symbol.GetParameters("宽度").FirstOrDefault().AsDouble();
+                    doc.Invoke(ts =>
+                    {
+                        string file = UserConstant.FamilyLibraryDirectory + "货架\\货架端牌.rfa";
+                        Family family = RsRevitUtils.GetLoadedFamily(doc, file);
+
+                        ISet<ElementId> symbolIds = family.GetFamilySymbolIds();
+
+                        FamilySymbol symbol = null;
+                        foreach (ElementId syid in symbolIds)
+                        {
+                            var sy = doc.GetElement(syid) as FamilySymbol;
+                            var w = sy.GetParameters("宽度").FirstOrDefault().AsDouble();
+                            if (w == width)
+                            {
+                                symbol = sy;
+                            }
+                        }
+
+                        if (!symbol.IsActive)
+                        {
+                            symbol.Activate();
+                        }
+                        if (shelf.HandFlipped)
+                        {
+                            hand = -hand;
+                        }
+
+                        var location_XYZ = RsRevitUtils.GetLocationPointByElement(shelf);
+                        int LastNum = CurrentNumber + wpfShelfCards.GroupNumber - 1;
+
+                        var frontInstance = doc.Create.NewFamilyInstance(front_face, location_XYZ, hand, symbol);
+                        if (frontInstance.CanFlipWorkPlane)
+                        {
+                            frontInstance.IsWorkPlaneFlipped = true;
+                        }
+                        var backInstance = doc.Create.NewFamilyInstance(back_face, location_XYZ, -hand, symbol);
+                        string cardStr = string.Empty;
+                        string firstNumber = $"{CurrentNumber}";
+                        string lastNumber = $"{LastNum}";
+                        if (CurrentNumber < 10)
+                        {
+                            firstNumber = $"0{CurrentNumber}";
+                        }
+                        if (LastNum < 10)
+                        {
+                            lastNumber = $"0{LastNum}";
+                        }
+                        cardStr = $"{firstNumber}~{lastNumber}";
+                        frontInstance.GetParameters("货架号").FirstOrDefault().Set(cardStr);
+                        backInstance.GetParameters("货架号").FirstOrDefault().Set(cardStr);
+                        if (GroupNumber == 1)
+                        {
+                            frontInstance.GetParameters("货架号").FirstOrDefault().Set(CurrentNumber.ToString());
+                            backInstance.GetParameters("货架号").FirstOrDefault().Set(CurrentNumber.ToString());
+                        }
+                        CurrentNumber = LastNum + 1;
+                        doc.Regenerate();
+                        var fis = doc.QueryByType<FamilyInstance>().Cast<FamilyInstance>().Where(e => e.Symbol.FamilyName.Contains("货架端牌")).ToList();
+                        RsRevitUtils.DeleteOverlapFamilyInstance(doc, fis);
+                    }, "创建端牌");
+                }
+            }
+            catch (Autodesk.Revit.Exceptions.OperationCanceledException)
+            {
+                if (wpfShelfCards != null)
+                {
+                    wpfShelfCards.tbCurrentNum.Text = CurrentNumber.ToString();
+                    wpfShelfCards.ShowDialog();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 批量布置端牌
+        /// </summary>
+        /// <param name="wpfShelfCards"></param>
+        /// <param name="uidoc"></param>
         private void PlaceCards(WpfShelfCards wpfShelfCards, UIDocument uidoc)
         {
             Document doc = uidoc.Document;
             int CurrentNumber = wpfShelfCards.CurrentNumber;
             bool isCoutinue = wpfShelfCards.IsContinue;
             int GroupNumber = wpfShelfCards.GroupNumber;
+            int initialNumber = wpfShelfCards.CurrentNumber;
             try
             {
                 while (isCoutinue)
                 {
-                    List<FamilyInstance> instances = uidoc.Selection.PickElementsByRectangle(new ShelfFilter(), "请框选需要布置端牌的货架")
+                    if (IsAutoIncrease == false || IsAutoIncrease == null)
-                                                                        .Cast<FamilyInstance>()
+                    {
-                                                                        .ToList();
+                        CurrentNumber = initialNumber;
-                    if (instances.Count == 0)
+                    }
+                    List<FamilyInstance> instances = uidoc.Selection.PickElementsByRectangle(new ShelfFilter(), "请框选需要布置端牌的货架").Cast<FamilyInstance>().ToList();
+                    if (instances.Count <= 1)
                     {
                         continue;
                     }
-                    Reference cardRefer = uidoc.Selection.PickObject(ObjectType.Element, new ShelvessSelectedFilter(instances), "请选择起始货架");
+                    Reference shelfRefer = uidoc.Selection.PickObject(ObjectType.Element, new ShelvessSelectedFilter(instances), "请选择起始货架");
-                    FamilyInstance firstShelf = doc.GetElement(cardRefer) as FamilyInstance;
+                    FamilyInstance firstShelf = doc.GetElement(shelfRefer) as FamilyInstance;
                     var firstLocation = RsRevitUtils.GetLocationPointByElement(firstShelf);
 
                     List<XYZ> locationPoints = new List<XYZ>();
@@ -210,7 +325,7 @@ namespace RookieStation.ParcelAreaModule.Views
                         var distance = firstLocation.DistanceTo(p);
                         dictInstanceDouble.Add(f, distance);
                     }
-                    var dictSorted = dictInstanceDouble.OrderBy(x => x.Value);
+                    var dictSorted = dictInstanceDouble.OrderBy(d => d.Value);
 
                     Reference front_face = firstShelf.GetReferences(FamilyInstanceReferenceType.Front).FirstOrDefault();
                     Reference back_face = firstShelf.GetReferences(FamilyInstanceReferenceType.Back).FirstOrDefault();
@@ -308,6 +423,9 @@ namespace RookieStation.ParcelAreaModule.Views
                         //var p = lp.Point;
                         ////族的左右方向向量（重要，且常用）
                         //var hand = fi.HandOrientation;
+                        doc.Regenerate();
+                        var fis = doc.QueryByType<FamilyInstance>().Cast<FamilyInstance>().Where(e => e.Symbol.FamilyName.Contains("货架端牌")).ToList();
+                        RsRevitUtils.DeleteOverlapFamilyInstance(doc, fis);
 
                         #endregion 备用
                     }, "布置端牌");
@@ -329,7 +447,7 @@ namespace RookieStation.ParcelAreaModule.Views
         public bool AllowElement(Element elem)
         {
             FamilyInstance fi = elem as FamilyInstance;
-            return fi != null && fi.Symbol.FamilyName.Contains("端牌");
+            return fi != null && fi.Symbol.FamilyName.Contains("货架端牌");
         }
 
         public bool AllowReference(Reference refer, XYZ point)
@@ -371,7 +489,7 @@ namespace RookieStation.ParcelAreaModule.Views
         public bool AllowElement(Element elem)
         {
             FamilyInstance instance = elem as FamilyInstance;
-            if (instance != null && instance.Symbol.FamilyName.Contains("货架"))
+            if (instance != null && instance.Symbol.FamilyName.Contains("仓储货架"))
             {
                 return true;
             }

RookieStation/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Resources;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -6,7 +7,7 @@ using System.Runtime.InteropServices;
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("RookieStation")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("菜鸟驿站工具")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("永特新工程")]
 [assembly: AssemblyProduct("RookieStation")]
@@ -34,3 +35,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguage("zh")]

RookieStation/Properties/Settings.Designer.cs

@@ -59,20 +59,6 @@ namespace RookieStation.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<ArrayOfString xmlns:xsi=\"http://www.w3." +
-            "org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\r\n  <s" +
-            "tring>单个,1500,400</string>\r\n</ArrayOfString>")]
-        public global::System.Collections.Specialized.StringCollection Shelves {
-            get {
-                return ((global::System.Collections.Specialized.StringCollection)(this["Shelves"]));
-            }
-            set {
-                this["Shelves"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("C:\\ProgramData\\Autodesk\\Revit\\Addins\\2020\\RsTools\\FamilyLibrary")]
@@ -132,5 +118,19 @@ namespace RookieStation.Properties {
                 this["Scale"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<ArrayOfString xmlns:xsi=\"http://www.w3." +
+            "org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\r\n  <s" +
+            "tring>单个,1500,400</string>\r\n</ArrayOfString>")]
+        public global::System.Collections.Specialized.StringCollection Shelves {
+            get {
+                return ((global::System.Collections.Specialized.StringCollection)(this["Shelves"]));
+            }
+            set {
+                this["Shelves"] = value;
+            }
+        }
     }
 }

RookieStation/Properties/Settings.settings

@@ -11,12 +11,6 @@
     <Setting Name="CurrentNumber" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">1</Value>
     </Setting>
-    <Setting Name="Shelves" Type="System.Collections.Specialized.StringCollection" Scope="User">
-      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;string&gt;单个,1500,400&lt;/string&gt;
-&lt;/ArrayOfString&gt;</Value>
-    </Setting>
     <Setting Name="FamilyFolder" Type="System.String" Scope="User">
       <Value Profile="(Default)">C:\ProgramData\Autodesk\Revit\Addins\2020\RsTools\FamilyLibrary</Value>
     </Setting>
@@ -32,5 +26,11 @@
     <Setting Name="Scale" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="Shelves" Type="System.Collections.Specialized.StringCollection" Scope="User">
+      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;string&gt;单个,1500,400&lt;/string&gt;
+&lt;/ArrayOfString&gt;</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

RookieStation/RookieStation.csproj

@@ -45,9 +45,11 @@
     </Reference>
     <Reference Include="EPPlus, Version=5.6.4.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
       <HintPath>..\packages\EPPlus.5.6.4\lib\net45\EPPlus.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="HandyControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
+    <Reference Include="HandyControl, Version=3.2.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
-      <HintPath>..\packages\HandyControl.3.1.0\lib\net47\HandyControl.dll</HintPath>
+      <HintPath>..\packages\HandyControl.3.2.0\lib\net47\HandyControl.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.4.1\lib\net46\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
@@ -93,6 +95,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CommonTools\ExecuteCmd\CmdChangeBackgroundColor.cs" />
     <Compile Include="CommonTools\ExecuteCmd\CmdDecryptFamily.cs" />
     <Compile Include="CommonTools\ExecuteCmd\CmdEncryptFamily.cs" />
     <Compile Include="CommonTools\ViewModels\EncryptOrDecryptFamily.cs" />
@@ -203,9 +206,21 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Include="RsLibrary\FamilyLibrary\其他\雨棚.rfa">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="RsLibrary\FamilyLibrary\出入口\智能翼闸.rfa">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="RsLibrary\FamilyLibrary\家具\绿动回收台-1.5m.rfa">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="RsLibrary\FamilyLibrary\家具\绿动回收台-3.0m.rfa">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="RsLibrary\FamilyLibrary\家具\绿动回收台.rfa">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="RsLibrary\FamilyLibrary\开关\三联开关 - 暗装.rfa">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -233,6 +248,9 @@
     <None Include="RsLibrary\FamilyLibrary\标识标牌\腰封玻璃贴.rfa">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="RsLibrary\FamilyLibrary\灯具\平板灯.rfa">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="RsLibrary\FamilyLibrary\灯具\支架灯.rfa">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -251,6 +269,9 @@
     <None Include="RsLibrary\FamilyLibrary\设备\配电箱.rfa">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="RsLibrary\FamilyLibrary\设备\高拍仪.rfa">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="RsLibrary\FamilyLibrary\货架\仓储货架.rfa">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -263,12 +284,6 @@
     <None Include="RsLibrary\FamilyLibrary\设备\自助寄件机.rfa">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="RsLibrary\FamilyLibrary\家具\1.5m绿动箱.rfa">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="RsLibrary\FamilyLibrary\家具\3.0m绿动箱.rfa">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="RsLibrary\FamilyLibrary\家具\圆形餐桌组.rfa">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

RookieStation/RsApp.cs

@@ -68,7 +68,7 @@ namespace RookieStation.RibbonMenu
 
                 CreatePushButton<CmdPlaceReceptionArea>(receptionAreaPanel, "前台布置", Properties.Resources.Reception, ViewPlanCmdEnabled);
 
-                //CreatePushButton<CmdLogoExtrusion>(receptionAreaPanel, "标识挤出", Properties.Resources.LogoExtrusion, ViewPlanCmdEnabled);
+                CreatePushButton<CmdLogoExtrusion>(receptionAreaPanel, "标识挤出", Properties.Resources.LogoExtrusion, ViewPlanCmdEnabled);
 
                 //出入口布置
                 RibbonPanel packAreaPanel = application.CreateRibbonPanel(TabName, EntranceAndExitGatePanelName);
@@ -102,6 +102,7 @@ namespace RookieStation.RibbonMenu
                 RibbonPanel drawingPanel = application.CreateRibbonPanel(TabName, DrawingPanelName);
 
                 CreatePushButton<CmdCreateMainMaterialsTable>(drawingPanel, "主材表", Properties.Resources.MainMaterials, DrawingSheetCmdEnabled);
+
                 SplitButtonData splitButtonData = new SplitButtonData("创建图例", "创建图例");
                 var spb = drawingPanel.AddItem(splitButtonData) as SplitButton;
 
@@ -134,11 +135,6 @@ namespace RookieStation.RibbonMenu
                 spb.AddPushButton(socketButtonData);
                 spb.AddPushButton(switchButtonData);
 
-                //CreatePushButton<CmdCreateShelvesLegend>(drawingPanel, "货架说明", Properties.Resources.ShelfLegend, DrawingSheetCmdEnabled);
-                //CreatePushButton<CmdCreateLightLegend>(drawingPanel, "灯具说明", Properties.Resources.LightLegend, DrawingSheetCmdEnabled);
-                //CreatePushButton<CmdCreateSocketLegend>(drawingPanel, "插座说明", Properties.Resources.SocketLegend, DrawingSheetCmdEnabled);
-                //CreatePushButton<CmdCreateSwitchLegend>(drawingPanel, "开关说明", Properties.Resources.SwitchLegend, DrawingSheetCmdEnabled);
-
                 CreatePushButton<CmdCreateViewPlanAnnotation>(drawingPanel, "平面标注", Properties.Resources.ViewPlanDim, ViewPlanCmdEnabled);
                 CreatePushButton<CmdCreateViewSectionAnnotation>(drawingPanel, "立面标注", Properties.Resources.ViewSectionDim, ViewSectionCmdEnabled);
                 CreatePushButton<CmdCreateWires>(drawingPanel, "创建导线", Properties.Resources.Wire, ViewPlanCmdEnabled);

RookieStation/Utils/RsRevitUtils.cs

@@ -98,6 +98,33 @@ namespace RookieStation.Utils
             viewport.ChangeTypeId(ele.Id);//选择视口-无标题
         }
 
+        /// <summary>
+        /// 删除定位点重合的族实例
+        /// </summary>
+        /// <param name="doc"></param>
+        /// <param name="cardInstances"></param>
+        public static void DeleteOverlapFamilyInstance(Autodesk.Revit.DB.Document doc, List<FamilyInstance> cardInstances)
+        {
+            List<ElementId> idsToDelete = new List<ElementId>();
+
+            foreach (var ins in cardInstances)
+            {
+                var lp = RsRevitUtils.GetLocationPointByElement(ins);
+                foreach (var card in cardInstances)
+                {
+                    var lpt = RsRevitUtils.GetLocationPointByElement(card);
+                    if (!card.Id.Equals(ins.Id) && lp.IsAlmostEqualTo(lpt))
+                    {
+                        idsToDelete.Add(ins.Id);
+                        idsToDelete.Add(card.Id);
+
+                        break;
+                    }
+                }
+            }
+            doc.Delete(idsToDelete);
+        }
+
         /// <summary>
         /// 创建表格
         /// </summary>

RookieStation/app.config

@@ -2,7 +2,7 @@
 <configuration>
 	<configSections>
 		<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-			<section name="RookieStation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+			<section name="RookieStation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
 		</sectionGroup>
 	</configSections>
 	<userSettings>
@@ -16,14 +16,6 @@
    <setting name="CurrentNumber" serializeAs="String">
     <value>1</value>
    </setting>
-   <setting name="Shelves" serializeAs="Xml">
-    <value>
-     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <string>单个,1500,400</string>
-     </ArrayOfString>
-    </value>
-   </setting>
    <setting name="FamilyFolder" serializeAs="String">
     <value>C:\ProgramData\Autodesk\Revit\Addins\2020\RsTools\FamilyLibrary</value>
    </setting>
@@ -34,14 +26,21 @@
     <value>漳州职业技术学院</value>
    </setting>
    <setting name="Date" serializeAs="String">
-    <value />
+    <value/>
    </setting>
    <setting name="Scale" serializeAs="String">
-    <value />
+    <value/>
+   </setting>
+   <setting name="Shelves" serializeAs="Xml">
+    <value>
+     <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+      <string>单个,1500,400</string>
+     </ArrayOfString>
+    </value>
    </setting>
   </RookieStation.Properties.Settings>
 	</userSettings>
 	<startup>
-		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
 	</startup>
-</configuration>
+</configuration>

RookieStation/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EPPlus" version="5.6.4" targetFramework="net47" />
-  <package id="HandyControl" version="3.1.0" targetFramework="net47" />
+  <package id="HandyControl" version="3.2.0" targetFramework="net47" requireReinstallation="true" />
   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.4.1" targetFramework="net47" />
   <package id="Revit_API_x64" version="2020.0.0" targetFramework="net47" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.114.0" targetFramework="net47" />

RookieStationSetup/RookieStationSetup.vdproj

@@ -297,12 +297,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_6BD9A7A1F336A6A56438520C9B87D6AD"
-        "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_71787B3108634BBF9C24F1278140BD99"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -501,6 +495,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_C5748324BCD855B3577C398A6540A20C"
+        "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_C58BF8A450F44D988A6617D87A67A2E9"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -513,12 +513,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_C8B0C074C8F1440A82B5CCCA0362BBC5"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_C90548C0E250410999B35113FBE05958"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -567,12 +561,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_CECC41044D30CA62AB3DE090794D73D6"
-        "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_D7CE0EFBE9E549AF95F204F2459A3AAE"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -609,6 +597,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_E26E0990C8FE2CD4B9BDF57F61611379"
+        "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_E3284FAD08AD4FC0BC6DF97B2EF545B3"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -627,6 +621,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_EB51C6BA0CE545928C7DCB9E0EB678BA"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EBFD8D45275D43D3993A705B49D49673"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_EE5304E4B88C4949980DA38F88047BBF"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -651,7 +657,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_F5AD5DA6B45641049F1FC2DB7B4F4E5C"
+        "MsmKey" = "8:_F75F23881E914AFBB1455615D8EB0CF3"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -682,13 +688,13 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB"
+        "OwnerKey" = "8:_F3DBE5F365DC458EBC7E4BD1CFCF285D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_F3DBE5F365DC458EBC7E4BD1CFCF285D"
+        "OwnerKey" = "8:_FBE461B9D4BD4603919E2821D88FB7CB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -736,7 +742,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6BD9A7A1F336A6A56438520C9B87D6AD"
+        "OwnerKey" = "8:_E26E0990C8FE2CD4B9BDF57F61611379"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -754,7 +760,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CECC41044D30CA62AB3DE090794D73D6"
+        "OwnerKey" = "8:_C5748324BCD855B3577C398A6540A20C"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -968,7 +974,7 @@
             "SourcePath" = "8:RevitAddInUtility.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_32DF1D1EC9E84F45BE5D3FDF6E518B89"
+            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -1199,7 +1205,7 @@
             "SourcePath" = "8:RevitAPIUI.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_32DF1D1EC9E84F45BE5D3FDF6E518B89"
+            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -1550,7 +1556,7 @@
             "SourcePath" = "8:UIFrameworkServices.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_32DF1D1EC9E84F45BE5D3FDF6E518B89"
+            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -1776,37 +1782,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6BD9A7A1F336A6A56438520C9B87D6AD"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:HandyControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_6BD9A7A1F336A6A56438520C9B87D6AD"
-                    {
-                    "Name" = "8:HandyControl.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:HandyControl.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_71787B3108634BBF9C24F1278140BD99"
             {
             "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RookieStation.dll.config"
@@ -1974,7 +1949,7 @@
             "SourcePath" = "8:RevitAPI.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_32DF1D1EC9E84F45BE5D3FDF6E518B89"
+            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -2296,7 +2271,7 @@
             "SourcePath" = "8:UIFramework.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_32DF1D1EC9E84F45BE5D3FDF6E518B89"
+            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -2347,7 +2322,7 @@
             "SourcePath" = "8:AdWindows.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_32DF1D1EC9E84F45BE5D3FDF6E518B89"
+            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -2402,6 +2377,37 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C5748324BCD855B3577C398A6540A20C"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:System.Threading.Tasks, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+                "ScatterAssemblies"
+                {
+                    "_C5748324BCD855B3577C398A6540A20C"
+                    {
+                    "Name" = "8:System.Threading.Tasks.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:System.Threading.Tasks.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C58BF8A450F44D988A6617D87A67A2E9"
             {
             "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\寄件出口.png"
@@ -2442,26 +2448,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C8B0C074C8F1440A82B5CCCA0362BBC5"
-            {
-            "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\1.5m绿动箱.rfa"
-            "TargetName" = "8:1.5m绿动箱.rfa"
-            "Tag" = "8:"
-            "Folder" = "8:_C339685F5ECF4472982108116EDD1313"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C90548C0E250410999B35113FBE05958"
             {
             "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\壁挂灯箱.rfa"
@@ -2622,37 +2608,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CECC41044D30CA62AB3DE090794D73D6"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Threading.Tasks, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-                "ScatterAssemblies"
-                {
-                    "_CECC41044D30CA62AB3DE090794D73D6"
-                    {
-                    "Name" = "8:System.Threading.Tasks.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:System.Threading.Tasks.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_32DF1D1EC9E84F45BE5D3FDF6E518B89"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D7CE0EFBE9E549AF95F204F2459A3AAE"
             {
             "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\验视台卡.jpg"
@@ -2773,6 +2728,37 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E26E0990C8FE2CD4B9BDF57F61611379"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:HandyControl, Version=3.2.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_E26E0990C8FE2CD4B9BDF57F61611379"
+                    {
+                    "Name" = "8:HandyControl.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:HandyControl.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_7C1EF99E309C4A3FB02B902F06BE7F60"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E3284FAD08AD4FC0BC6DF97B2EF545B3"
             {
             "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\Texture\\禁止吸烟.png"
@@ -2833,6 +2819,46 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EB51C6BA0CE545928C7DCB9E0EB678BA"
+            {
+            "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\灯具\\平板灯.rfa"
+            "TargetName" = "8:平板灯.rfa"
+            "Tag" = "8:"
+            "Folder" = "8:_C856AF9B3EC949E29C78B2DE5C2C78EB"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EBFD8D45275D43D3993A705B49D49673"
+            {
+            "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\绿动回收台-1.5m.rfa"
+            "TargetName" = "8:绿动回收台-1.5m.rfa"
+            "Tag" = "8:"
+            "Folder" = "8:_C339685F5ECF4472982108116EDD1313"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EE5304E4B88C4949980DA38F88047BBF"
             {
             "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\标识标牌\\台卡.rfa"
@@ -2924,10 +2950,10 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F5AD5DA6B45641049F1FC2DB7B4F4E5C"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F75F23881E914AFBB1455615D8EB0CF3"
             {
-            "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\3.0m绿动箱.rfa"
+            "SourcePath" = "8:..\\RookieStation\\bin\\Release\\RsLibrary\\FamilyLibrary\\家具\\绿动回收台-3.0m.rfa"
-            "TargetName" = "8:3.0m绿动箱.rfa"
+            "TargetName" = "8:绿动回收台-3.0m.rfa"
             "Tag" = "8:"
             "Folder" = "8:_C339685F5ECF4472982108116EDD1313"
             "Condition" = "8:"
@@ -3258,15 +3284,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:菜鸟驿站工具集"
-        "ProductCode" = "8:{4738ED44-427C-41A5-823B-4161B6A956B8}"
+        "ProductCode" = "8:{955919C6-9AC0-4F22-A967-B744811AC465}"
-        "PackageCode" = "8:{E04C0F61-5561-44CF-951C-62BDAD2AE48F}"
+        "PackageCode" = "8:{5DBA2E94-5B58-46D5-B369-FB7A2BF796C3}"
         "UpgradeCode" = "8:{127EC3EC-7539-468B-84EA-E1ECDD6204E6}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.6"
+        "ProductVersion" = "8:1.0.7"
         "Manufacturer" = "8:YTX Engineering"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"