Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ed9547e90c664739da9d3535bc01f66f24e184db

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -98,12 +98,6 @@
            };
            contentView.AddChidren(btnBackIcon);

            btnBack = new Button()
            {
                Width = Application.GetRealWidth(100),
            };
            contentView.AddChidren(btnBack);

            Button btnTilte = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
@@ -117,6 +111,12 @@
            };
            contentView.AddChidren(btnTilte);


            btnBack = new Button()
            {
                Width = Application.GetRealWidth(70),
            };
            contentView.AddChidren(btnBack);

            LoadEventList();
        }
@@ -147,7 +147,7 @@
            };

            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -177,7 +177,7 @@
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
            };
            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -210,7 +210,7 @@
            };

            //如果是成员隐藏编辑功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                contentView.AddChidren(btnSetting);
            }
@@ -365,7 +365,7 @@
        /// </summary>
        public void LoadTopView_ArmCenter(Action skipAction)//(Action callBack, Action action)
        {
            //LoadTopView();
            LoadTopView();
            //backAction = action;

            var btnAddIcon = new Button()