Merge branch 'WJC' into newBranch1

wxr

2021-11-19 a170a2ecef6d5c87883ed552dbbc81cfb0358d13

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs

@@ -91,15 +91,15 @@
            //获取宽度
            int widthValue = topNameBtn.GetTextWidth();
            int textWidth = (Application.GetRealWidth(255) - widthValue) / 2;
            Button locationBtn = new Button
            {
                Width = Application.GetRealWidth(18),
                Height = Application.GetRealWidth(18),
                X = Application.GetRealWidth(60 + 4) + textWidth + widthValue,
                Y = Application.GetRealHeight(34 + 1),
                UnSelectedImagePath = "LogicIcon/location.png",
            };
            frameLayout.AddChidren(locationBtn);
            //Button locationBtn = new Button
            //{
            //    Width = Application.GetRealWidth(18),
            //    Height = Application.GetRealWidth(18),
            //    X = Application.GetRealWidth(60 + 4) + textWidth + widthValue,
            //    Y = Application.GetRealHeight(34 + 1),
            //    UnSelectedImagePath = "LogicIcon/location.png",
            //};
            //frameLayout.AddChidren(locationBtn);

            Button textBtn = new Button
            {
@@ -107,7 +107,7 @@
                Y = Application.GetRealHeight(57),
                TextSize = LogicView.TextSize.text10,
                TextColor = CSS.CSS_Color.textCancelColor,
                //Text = "广东广州市番禺区石楼镇",
                Text =  Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress ,// "广东广州市番禺区石楼镇",
            };
            frameLayout.AddChidren(textBtn);
        }