2020-05-19-4

陈嘉乐

2020-05-19 0e0584b87851c56745bf73b1a961b80613dd0721

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

@@ -84,7 +84,7 @@
            //初始化桌布

            this.tableContr = new InformationEditorControl();



            if (this.deviceObj.Type == DeviceType.FreshAir)

            if (this.deviceObj.Type == DeviceType.FreshAir || this.deviceObj.Type == DeviceType.PMSensor)

            {

                this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);

            }

@@ -100,7 +100,7 @@
            var btnFinish = new BottomClickButton();

            btnFinish.TextID = R.MyInternationalizationString.uSave;

            bodyFrameLayout.AddChidren(btnFinish);

            btnFinish.ButtonClickEvent += async (sender, e) =>

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

            {

                //记录起当前正在操作的回路名字

                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();

@@ -117,7 +117,7 @@
                    if (oldName != newName)

                    {

                        //设备名称修改

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

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

                        if (result == false)

                        {

                            return;

@@ -148,7 +148,7 @@
            listview.AddChidren(btnDeviceName);

            btnDeviceName.InitControl();

            btnDeviceName.AddBottomLine();

            btnDeviceName.txtInput.FinishInputEvent += async () =>

            btnDeviceName.txtInput.FinishInputEvent += () =>

            {

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

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

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

                {

                    //设备名称修改

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

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

                    if (result == false)

                    {

                        return;

@@ -330,6 +330,19 @@
                        frameBack.Y = Application.GetRealHeight(153);

                        frameBack.Gravity = Gravity.Center;

                    }



                    //如果是PM2.5

                    if (deviceObj.Type == DeviceType.PMSensor)

                    {

                        frame.RemoveFromParent();

                        frameBorder.Y = Application.GetRealHeight(0);

                        frameBorder.Height = Application.GetRealHeight(708);

                        frameBack.BackgroundImagePath = "RealDevice/SensorPMTwoPointFive.png";

                        frameBack.Width = this.GetPictrueRealSize(418);

                        frameBack.Height = this.GetPictrueRealSize(403);

                        frameBack.Y = Application.GetRealHeight(153);

                        frameBack.Gravity = Gravity.Center;

                    }

                }

                else

                {