新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -106,18 +106,18 @@
                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();

                foreach (var epoint in dicDeviceSaveName.Keys)

                {

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

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

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

                    {

                        //不能允许空白名字

                        continue;

                    }

                    string newName = dicDeviceSaveName[epoint];

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

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

                    if (oldName != newName)

                    {

                        //设备名称修改

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

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

                        if (result == false)

                        {

                            return;

@@ -143,7 +143,7 @@


            //回路备注

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

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

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

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

            {

                nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint];

@@ -159,7 +159,7 @@
            {

                frameDeviceName.txtInput.FinishInputEvent += () =>

                {

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

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

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

                    {

                        //将名字还原

@@ -168,7 +168,7 @@
                    if (oldName != frameDeviceName.Text.Trim())

                    {

                        //设备名称修改

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

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

                        if (result == false)

                        {

                            return;

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

        {

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

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

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

                || Common.Config.Instance.Home.IsShowTemplate == true)

            {

                return;

@@ -232,7 +232,7 @@
            int menuCount = 1;

            string deviceMenu = string.Empty;

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

            bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);

            bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice);

            //if (canTest == true)

            //{

            //    menuCount = 2;

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

                {

                    //发送定位功能

                    Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);

                    HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);

                });

            }



@@ -424,7 +424,7 @@
        private List<List<CommonDevice>> GetAllDeviceGroup()

        {

            bool hadDevice = false;

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

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

            var listRelay = new List<CommonDevice>();

            foreach (var device in listDevice)

            {

@@ -440,8 +440,8 @@
                }



                //获取设备属于【简约多功能面板】

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

                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)

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

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)

                {

                    if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)

                    {

@@ -522,7 +522,7 @@
            nowContr.TextColor = UserCenterColor.Current.TextColor1;



            nowSelectControl = nowContr;

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

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



            //重新初始化菜单行

            this.InitMenuRow();