合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs

@@ -95,18 +95,18 @@
                this.ShowProgressBar();

                foreach (var epoint in dicDeviceSaveName.Keys)

                {

                    var device = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, epoint);

                    var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);

                    if (device == null || dicDeviceSaveName[epoint] == string.Empty)

                    {

                        //不能允许空白名字

                        continue;

                    }

                    string newName = dicDeviceSaveName[epoint];

                    string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);

                    string oldName = Common.LocalDevice.Current.GetDeviceEpointName(device);

                    if (oldName != newName)

                    {

                        //设备名称修改

                        var result = HdlDeviceCommonLogic.Current.ReName(device, newName);

                        var result = Common.LocalDevice.Current.ReName(device, newName);

                        if (result == false)

                        {

                            //关闭

@@ -128,7 +128,7 @@
        {

            this.listview.RemoveAll();



            string nameValue = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice);

            string nameValue = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);

            if (dicDeviceSaveName.ContainsKey(nowSelectDevice.DeviceEpoint) == true)

            {

                nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint];

@@ -143,7 +143,7 @@
            btnDeviceName.AddBottomLine();

            btnDeviceName.txtInput.FinishInputEvent += () =>

            {

                string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice);

                string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);

                if (btnDeviceName.Text.Trim() == string.Empty)

                {

                    //将名字还原

@@ -152,7 +152,7 @@
                if (oldName != btnDeviceName.Text.Trim())

                {

                    //设备名称修改

                    var result = HdlDeviceCommonLogic.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());

                    var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());

                    if (result == false)

                    {

                        return;

@@ -194,7 +194,7 @@
        private void InitTopRightMenu()

        {

            //检测此回路是否拥有定位功能

            if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)

            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)

            {

                return;

            }

@@ -220,7 +220,7 @@
            frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>

            {

                //发送定位功能

                HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);

                Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);

            });

        }



@@ -264,7 +264,7 @@
        private void AddBackLightRow()

        {

            //河东设备才会开启此选项

            if (HdlDeviceCommonLogic.Current.IsHdlDevice(nowSelectDevice) == true)

            if (Common.LocalDevice.Current.IsHdlDevice(nowSelectDevice) == true)

            {

                //背光灯

                string caption = Language.StringByID(R.MyInternationalizationString.uBackLight);

@@ -279,7 +279,7 @@
                {

                    List<CommonDevice> listNewDevice = new List<CommonDevice> { };

                    listNewDevice.Add((Panel)nowSelectDevice);

                    var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listNewDevice);

                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice);

                    //如果设备是方悦开控设备，背光灯页需要滑动且有接近感应功能  

                    if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

@@ -308,7 +308,7 @@
        private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)

        {

            bool hadDevice = false;

            var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceObj.DeviceAddr);

            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);

            var listOffSwitch = new List<CommonDevice>();

            foreach (var device in listDevice)

            {

@@ -590,7 +590,7 @@
            nowContr.TextColor = 0xfffb744a;



            nowSelectControl = nowContr;

            nowSelectDevice = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("BUTTON", string.Empty)));

            nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("BUTTON", string.Empty)));



            //重新初始化菜单行

            this.InitMenuRow();