合并新代码

xm

2020-04-15 bff8993501334c4f3c5f902216fe03253be747f8

 ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

old mode 100644
new mode 100755
@@ -239,13 +239,8 @@
            if (listdevice.Count > 0 && Common.LocalDevice.Current.DeviceIsCanFixedPosition(listdevice[0]) == true)

            {

                //定位

                var btnPosition = new NormalViewControl(Application.GetRealWidth(184), rowMenu.Height, false);

                var btnPosition = rowMenu.AddEditorControl(false);

                btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;

                btnPosition.TextAlignment = TextAlignment.Center;

                btnPosition.TextSize = 12;

                btnPosition.TextColor = UserCenterColor.Current.White;

                btnPosition.BackgroundColor = 0xff4a4a4a;

                rowMenu.AddRightView(btnPosition);

                btnPosition.ButtonClickEvent += (sender, e) =>

                {

                    //定位

@@ -372,13 +367,8 @@
            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(device) == true)

            {

                //定位

                var btnPosition = new NormalViewControl(Application.GetRealWidth(184), rowDevice.Height, false);

                var btnPosition = rowDevice.AddEditorControl(false);

                btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;

                btnPosition.TextAlignment = TextAlignment.Center;

                btnPosition.TextSize = 12;

                btnPosition.TextColor = UserCenterColor.Current.White;

                btnPosition.BackgroundColor = 0xff4a4a4a;

                rowDevice.AddRightView(btnPosition);

                btnPosition.ButtonClickEvent += (sender, e) =>

                {

                    //定位