请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

old mode 100644
new mode 100755
@@ -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;

@@ -329,9 +329,9 @@
                        frameBack.Height = this.GetPictrueRealSize(354);

                        frameBack.Y = Application.GetRealHeight(153);

                        frameBack.Gravity = Gravity.Center;

                    }

                    //如果是PM2.5
                    }



                    //如果是PM2.5

                    if (deviceObj.Type == DeviceType.PMSensor)

                    {

                        frame.RemoveFromParent();

@@ -427,6 +427,18 @@
                    //只要同一种类型的

                    continue;

                }



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

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

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

                {

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

                    {

                        //简约多功能面板第1回路是一个绑定温湿度传感器第类型，不是真的温湿度的传感器，需要屏蔽掉

                        continue;

                    }

                }



                listRelay.Add(device);

                if (device.DeviceEpoint == deviceObj.DeviceEpoint)

                {

@@ -467,7 +479,6 @@
            }

            return listIcon;

        }



        #endregion



        #region ■ 回路选择___________________________