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

wells

2020-07-11 ef6bff7f82b6cb9c37213fc6bc8c48acfb7ab2d6

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

 src/Bro.Common.Model/Model/MonitorSet.cs

@@ -207,6 +207,15 @@
        public int TriggerValue { get; set; } = -1;

        /// <summary>
        /// 传入数据地址的索引 按照监听地址从0开始的索引集合
        /// </summary>
        [Category("监听设置")]
        [Description("传入数据地址的索引 按照监听地址从0开始的索引")]
        [DisplayName("传入数据索引")]
        [TypeConverter(typeof(SimpleCollectionConvert<int>))]
        public List<int> InputDataIndex { get; set; } = new List<int>();

        /// <summary>
        /// 监听回传
        /// </summary>
        //[Category("回传设置")]

 src/Bro.Device.GTSCard/GTSCardDriver.cs

@@ -1128,10 +1128,10 @@
                            monitorSet.OpConfig = new OperationConfigBase();
                        }

                        //monitorSet.OpConfig.InputPara = monitorSet.InputDataIndex.ConvertAll(index =>
                        //{
                        //    return tempNew[index].Value;
                        //}).ToList();
                        monitorSet.OpConfig.InputPara = monitorSet.InputDataIndex.ConvertAll(index =>
                        {
                            return tempNew[index].Value == IOValue.TRUE ? 1 : 0;
                        }).ToList();

                        ExcuteMonitorInvoke(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet);
                    }

 src/Bro.UI.Config/MenuForms/FrmOperation.resx

@@ -125,7 +125,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADm
        CgAAAk1TRnQBSQFMAgEBAgEAAegBAAHoAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        CgAAAk1TRnQBSQFMAgEBAgEAAfABAAHwAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -182,7 +182,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD4
        CAAAAk1TRnQBSQFMAwEBAAHoAQAB6AEAARgBAAEYAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
        CAAAAk1TRnQBSQFMAwEBAAHwAQAB8AEAARgBAAEYAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
        AWADAAEYAwABAQEAAQgGAAEJGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
        AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
        AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm

 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs

@@ -45,6 +45,7 @@
            {
                if (ctr is IOIndicatorCtrl ioOut)
                {
                    ioOut.Cursor = Cursors.Hand;
                    ioOut.OnIODoubleClick += IoOut_DoubleClick;
                }
            }
@@ -79,6 +80,8 @@
                    }
                }
            }

            this.Invalidate();
        }
    }
}

 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs

@@ -35,10 +35,10 @@
            get => Device as MotionCardBase;
        }

        private void MotionCard_OnMonitorInvoke(DateTime arg1, string arg2, IDevice arg3, IMonitorSet arg4)
        {
            throw new NotImplementedException();
        }
        //private void MotionCard_OnMonitorInvoke(DateTime arg1, string arg2, IDevice arg3, IMonitorSet arg4)
        //{
        //    throw new NotImplementedException();
        //}

        private void InitialLayout()
        {
@@ -50,13 +50,10 @@
                    axisMovingStatus = new AxisMovingStatus();
                }
                CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(axisMovingStatus);
                //ctrlMotionCardAxisStatus.Dock = DockStyle.Fill;
                flowLayoutPanel1.Controls.Add(ctrlMotionCardAxisStatus);

            }

            CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(Device, MotionCard.MonitorValues);
            //ctrlMotionCardIOStatus.Dock = DockStyle.Fill;
            flowLayoutPanel2.Controls.Add(ctrlMotionCardIOStatus);
        }