Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-07-03 80fa15d5c3b239a4da7ebb86c534266300d6cdcd

 src/Bro.Common.Device/DeviceBase/MotionCardBase.cs

@@ -156,7 +156,46 @@

        public string GetDisplayText()
        {
            throw new NotImplementedException();
            string preCheck = "";
            PreCheckIOCollection.ForEach(i =>
            {
                preCheck += i.GetDisplayText() + " ";
            });
            if (preCheck != "")
            {
                preCheck = " 预检：" + preCheck;
            }

            string output = "";
            IOOutputCollection.ForEach(i =>
            {
                output += i.GetDisplayText() + " ";
            });
            if (output != "")
            {
                output = " 输出：" + output;
            }
            string confirm = "";
            IOConfirmCollection.ForEach(i =>
            {
                confirm += i.GetDisplayText() + " ";
            }); 
            if (confirm != "")
            {
                confirm = " 确认：" + confirm;
            }

            string moving = "";
            MovingOps.ForEach(i =>
            {
                moving += i.GetDisplayText() + " ";
            });
            if (moving != "")
            {
                moving = " 运动：" + moving;
            }

            return (preCheck + output + confirm + moving).Trim();
        }
    }

@@ -180,10 +219,31 @@
            return form;
        }

        //protected override object CreateInstance(Type itemType)
        //{
        //    return base.CreateInstance(itemType);
        //}
        protected override object CreateInstance(Type itemType)
        {
            if (itemType == typeof(IORefrenceItem))
            {
                IORefrenceItem item = new IORefrenceItem();
                if ((this.Context.Instance is IOperationConfig opConfig) && !string.IsNullOrWhiteSpace(opConfig.DeviceId))
                {
                    using (var scope = GlobalVar.Container.BeginLifetimeScope())
                    {
                        List<IDevice> deviceList = scope.Resolve<List<IDevice>>();

                        var device = deviceList.FirstOrDefault(u => u.Id == opConfig.DeviceId);

                        if (device != null && (device is MotionCardBase motionCard))
                        {
                            item.IOItemSource = (motionCard.InitialConfig as MotionCardInitialConfigBase).IODefinitionCollection;
                        }
                    }
                }

                return item;
            }

            return base.CreateInstance(itemType);
        }

        //protected override object[] GetItems(object editValue)
        //{
@@ -217,9 +277,12 @@

                    if (device is MotionCardBase motionCard)
                    {
                        if (value is IORefrenceItem item)
                        if (value is List<IORefrenceItem> items)
                        {
                            item.IOItemSource = (motionCard.InitialConfig as MotionCardInitialConfigBase).IODefinitionCollection;
                            items.ForEach(item =>
                            {
                                item.IOItemSource = (motionCard.InitialConfig as MotionCardInitialConfigBase).IODefinitionCollection;
                            });
                        }
                    }
                }