???????

黄学彪

2020-04-15 23532fa8ad34c89b6d24b01eaef6475fd0aad898

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

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

                {

                    //定位

@@ -275,6 +270,8 @@


            rowMenu.frameTable.ButtonClickEvent += (sender, e) =>

            {

                //隐藏菜单

                rowMenu.HideMenu();

                //强制跳转真实设备界面

                if (UserCenterResourse.HideOption.GotoRealDeviceForm == 1)

                {

@@ -372,13 +369,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) =>

                {

                    //定位

@@ -388,6 +380,8 @@


            rowDevice.frameTable.ButtonClickEvent += (sender, e) =>

            {

                //隐藏菜单

                rowDevice.HideMenu();

                //界面跳转,记录当前的正在操作的设备的Mac地址

                this.nowActionDeviceMac = device.DeviceAddr;

                //显示设备功能配置界面

@@ -453,8 +447,9 @@
            //新风面板

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

            {

                var form = new DeviceFunctionSettionForm();

                form.AddForm(device, true);

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

                var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();

                form.AddForm(device);

            }

            //方悦面板

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo