Merge branch 'wxr4' into temp-wxr

wxr

2021-04-19 bbcd6c2017762f9a0e6cf0ac6466bbf78f593b14

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -340,7 +340,7 @@
        /// <summary>
        /// 成员顶部栏
        /// </summary>
        public void LoadTopView_MemberTopView(Action callBack, Action action)
        public void LoadTopView_MemberTopView(Action addAction, Action action)
        {
            LoadTopView();
            backAction = action;
@@ -357,7 +357,30 @@

            btnAddIcon.MouseUpEventHandler += (sender, e) =>
            {
                callBack?.Invoke();
                addAction?.Invoke();
            };
        }
        /// <summary>
        /// 安防中心顶部栏
        /// </summary>
        public void LoadTopView_ArmCenter(Action skipAction)//(Action callBack, Action action)
        {
            //LoadTopView();
            //backAction = action;

            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "FunctionIcon/ArmCenter/HistoryIcon.png",
            };
            contentView.AddChidren(btnAddIcon);

            btnAddIcon.MouseUpEventHandler += (sender, e) =>
            {
                skipAction?.Invoke();
            };
        }
    }