合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs

@@ -25,6 +25,10 @@
        /// </summary>

        private List<CommonDevice> listDevice = null;

        /// <summary>

        /// 设备类型

        /// </summary>

        private DeviceEnumInfo deviceEnumInfo = null;

        /// <summary>

        /// 数据是否变更

        /// </summary>

        private bool valueChanged = false;

@@ -41,6 +45,7 @@
            this.ScrollEnabled = false;



            this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);

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



            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));

@@ -74,15 +79,20 @@


            //各种背光灯的容器

            var frameLinght = new FrameLayout();

            frameLinght.Height = Application.GetRealHeight(748);

            frameLinght.Height = Application.GetRealHeight(311 + 23);

            frameLinght.Y = Application.GetRealHeight(279);

            frameLinght.BackgroundColor = UserCenterColor.Current.White;

            bodyFrameLayout.AddChidren(frameLinght);



            //添加1-6干接点的背光灯进度条

            this.AddSixDryContactProgress(frameLinght);

            //第七干接点的背光灯进度条

            this.AddSevenDryContactProgress(frameLinght);

            //如果是国标3路10A继电器小模块,它没有第七干接点

            if (this.deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.Relay_NationalThreeLoadTenA)

            {

                //第七干接点的背光灯进度条

                frameLinght.Height = Application.GetRealHeight(748);

                this.AddSevenDryContactProgress(frameLinght);

            }

            //添加节能模式

            this.AddEnergyConservationRow(btnClickStatu, frameLinght);



@@ -340,6 +350,11 @@
            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";

            frameLinght.AddChidren(btnProgress1);

            //如果是国标3路10A继电器小模块,则为1-4

            if (this.deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.Relay_NationalThreeLoadTenA)

            {

                btnProgressView1.Text = "Dry1-4";

            }



            //进度条

            var seekBar1 = new SeekBarControl();

@@ -372,12 +387,16 @@
            btnTemp2.Text = "100%";

            frameLinght.AddChidren(btnTemp2);



            //线

            var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);

            btnLine.Y = Application.GetRealHeight(311);

            btnLine.Gravity = Gravity.CenterHorizontal;

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            frameLinght.AddChidren(btnLine);

            //如果不是国标3路10A继电器小模块

            if (this.deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.Relay_NationalThreeLoadTenA)

            {

                //线

                var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);

                btnLine.Y = Application.GetRealHeight(311);

                btnLine.Gravity = Gravity.CenterHorizontal;

                btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

                frameLinght.AddChidren(btnLine);

            }



            //如果当前是展示模板

            if (Common.Config.Instance.Home.IsShowTemplate == true)