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

xcd

2020-07-14 6ca2f993973295e4da82634761da0e5c00e0ef8e

 src/Bro.Common.Model/Helper/EnumHelper.cs

@@ -392,6 +392,26 @@
            Measuring = 21,
            MeasureDoneOK = 22,
            MeasureDoneNG = 23,

            CanStretchLeft = 41,
            CanStretchRight = 42,
            CanStretchTop = 43,
            CanStretchBottom = 44,

            CanStretchLeftUpperCorner = 45,
            CanStretchLeftLowerCorner = 46,
            CanStretchRightUpperCorner = 47,
            CanStretchRightLowerCorner = 48,

            StretchingLeft = 31,
            StretchingRight = 32,
            StretchingTop = 33,
            StretchingBottom = 34,

            StretchingLeftUpperCorner = 35,
            StretchingLeftLowerCorner = 36,
            StretchingRightUpperCorner = 37,
            StretchingRightLowerCorner = 38,
        }

        public enum MouseState
@@ -400,15 +420,21 @@
            HoverElement = 2,
            InSideElement = 3,

            MoveElement = 4,

            StretchingLeft = 11,
            StretchingRight = 12,
            StretchingUp = 13,
            StretchingDown = 14,
            MoveElement = 15,
            StretchingTop = 13,
            StretchingBottom = 14,

            StretchingLeftUpperCorner = 15,
            StretchingLeftLowerCorner = 16,
            StretchingRightUpperCorner =17,
            StretchingRightLowerCorner = 18,

            New = 21,
            Editing = 22,
            SelectedElement = 23,
            //SelectedElement = 23,

            MovingAll = 31,

@@ -447,7 +473,7 @@
        /// <summary>
        /// 马达/运动板卡运行模式
        /// </summary>
        public enum MotorMoveMode
        public enum MotionMode
        {
            /// <summary>
            /// 普通点位运动
@@ -532,9 +558,9 @@

            [Description("指示灯-黄")]
            Light_Yellow = 1,
            [Description("指示灯-红")]
            Light_Green = 2,
            [Description("指示灯-绿")]
            Light_Green = 2,
            [Description("指示灯-红")]
            Light_Red = 3,
            [Description("蜂鸣器")]
            Beep = 4,
@@ -576,5 +602,42 @@
            [Description("OUTPUT")]
            OUTPUT = 1
        }

        public enum IOValue
        {
            [Description("关闭")]
            FALSE = 0,
            [Description("开启")]
            TRUE = 1,
            [Description("反转")]
            REVERSE = 2,
        }

        /// <summary>
        /// PubSubCenter事件中心的消息类型
        /// </summary>
        public enum PubSubCenterMessageType
        {
            /// <summary>
            /// 运行界面更新产品下拉
            /// </summary>
            [Description("更新产品下拉")]
            UpdateProductionCodes,
            ///// <summary>
            ///// 更新数据
            ///// </summary>
            //[Description("更新数据")]
            //UpdateData,
        }

        public enum MachineState
        {
            Unknown,
            Ready,
            Running,
            Alarm,
            Pause,
            Resetting,
        }
    }
}