5月需求bug修复

wei

2021-06-02 e13a9980ce617db1394a76944186c5d5bd595d5d

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

old mode 100755
new mode 100644
@@ -100,8 +100,7 @@

            btnBack = new Button()
            {
                Width = Application.GetRealWidth(50),
                //BackgroundColor = CSS_Color.AuxiliaryColor2,
                Width = Application.GetRealWidth(100),
            };
            contentView.AddChidren(btnBack);

@@ -148,7 +147,7 @@
            };

            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -172,13 +171,13 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                Y = Application.GetRealHeight(28),
                Width = Application.GetMinRealAverage(32),
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
            };
            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -211,7 +210,7 @@
            };

            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -243,7 +242,33 @@

            btnAddIcon.MouseUpEventHandler += (sender, e) =>
            {
                LoadEvent_AddEvent(type, callBack);
                if (type == "floors")
                {
                    Action<string> callBackAction = (floorName) =>
                    {
                        callBack("add", floorName);
                    };
                    string newFloorName = "1F";
                    for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1;)
                    {
                        newFloorName = ++i + "F";
                        if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == newFloorName))
                        {
                            break;
                        }
                    }
                    var fs = new List<string>();
                    foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
                    {
                        fs.Add(f.roomName);
                    }
                    new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors, newFloorName, callBackAction, StringId.FloorNameCannotBeEmpty,
                        StringId.AddFloorFailed_FloorAlreadyExist, fs);
                }
                else
                {
                    callBack("", "");
                }
            };
        }

@@ -315,7 +340,7 @@
        /// <summary>
        /// 成员顶部栏
        /// </summary>
        public void LoadTopView_MemberTopView(Action callBack, Action action)
        public void LoadTopView_MemberTopView(Action addAction, Action action)
        {
            LoadTopView();
            backAction = action;
@@ -332,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();
            };
        }
    }