合并新代码

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) =>

                {

                    //定位

@@ -452,9 +442,9 @@
            }

            //新风面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)

            {
                //方悦新风面板的按键配置
                var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
            {

                //方悦新风面板的按键配置

                var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();

                form.AddForm(device);

            }

            //方悦面板

@@ -464,10 +454,10 @@
            {

                //干接点

                if (device.Type == DeviceType.OnOffSwitch)

                {
                    //方悦面板的按键配置
                {

                    //方悦面板的按键配置

                    var form = new DevicePanel.PanelFangyueButtonSettionForm();

                    form.AddForm(device);
                    form.AddForm(device);

                }

                //继电器

                else if (device.Type == DeviceType.OnOffOutput)