发布的1.0.20052901

xm

2020-05-29 ca233e3c6154859a17948d892fbc6bbf723b60a8

 ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

old mode 100755
new mode 100644
@@ -32,7 +32,23 @@
        /// <summary>

        /// 中央空调的版本控件

        /// </summary>

        private NormalViewControl btnAirConditionerVersion = null;

        private NormalViewControl btnAirConditionerVersion = null;
        /// <summary>
        /// 简约面板绑定的温度目标名字
        /// </summary>
        private string bindTemperatureName = string.Empty;
        /// <summary>
        /// 简约面板绑定的湿度目标名字
        /// </summary>
        private string bindHumidityName = string.Empty;
        /// <summary>
        /// 简约面板绑定被绑目标是温度
        /// </summary>
        private CommonDevice bindTemperatureDev;
        /// <summary>
        /// 简约面板绑定被绑目标是湿度
        /// </summary>
        private CommonDevice bindHumidityDev;



        #endregion



@@ -247,6 +263,20 @@
            {

                //添加【室内机设置】行(空调专用)

                this.AddIndoorUnitSettionRow();

            }

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

            {

                //简约多功能面板

                this.AddIBindRow();

                this.AddFunctionSettionRow();

                this.AddHumiditySourceRow();
                this.AddTemperatureSensorRow();



            }

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)

            {
                //添加【绑定目标】行(简约环境面板用) 
                this.AddSimplePanelSettionRow();

            }

            else

            {

@@ -529,8 +559,32 @@
                var form = new DevicePanel.PanelButtonSettionForm();

                form.AddForm(listNewDevice[0]);

            };

        }

        #region ■ 简约环境(面板)_____________________


        /// <summary>

        /// 添加【按键设置】行简约环境(面板)

        /// </summary>

        private void AddSimplePanelSettionRow()

        {
            //按键设置
            string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);

            var btnFunction = new FrameRowControl(listview.rowSpace / 2);

            listview.AddChidren(btnFunction);

            btnFunction.AddLeftCaption(caption, 600);

            //向右图标

            btnFunction.AddRightArrow();

            //底线

            btnFunction.AddBottomLine();

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

            {
                var form = new DeviceBind.PanelSimpleEnvironmentTargetsForm();


            };

        }



        #endregion

        #endregion



        #region ■ 按键设置(方悦)_____________________

@@ -921,12 +975,120 @@
                var form = new DeviceAirConditioner.IndoorUnitListForm();

                form.AddForm(listNewDevice[0].DeviceAddr);

            };

        }
        #endregion

        #region ■  简约多功能面板用___________________

        /// <summary>

        /// 添加【绑定目标】行 
        /// </summary>

        private void AddIBindRow()

        {
            string bindTargets = Language.StringByID(R.MyInternationalizationString.uBindTargets);

            var btnBindTargets = new FrameRowControl(listview.rowSpace / 2);

            listview.AddChidren(btnBindTargets);

            btnBindTargets.AddLeftCaption(bindTargets, 600);

            //向右图标

            btnBindTargets.AddRightArrow();

            //底线

            btnBindTargets.AddBottomLine();

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

            {

                var form = new DeviceBind.PanelSimpleMutilfunctionTargetsForm();
            };

        }

        /// <summary>
        ///  湿度来源行
        /// </summary>
        private void AddHumiditySourceRow()
        {
            //湿度
            var rowHumidity = new FrameRowControl(listview.rowSpace / 2);
            listview.AddChidren(rowHumidity);
            rowHumidity.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600);
            //底线
            rowHumidity.AddBottomLine();
            //右箭头
            rowHumidity.AddRightArrow();
            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
            if (!string.IsNullOrEmpty(bindHumidityName))
            {
                msg = bindHumidityName;
            }
            var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
            rowHumidity.ButtonClickEvent += (sender, e) =>
            {
                //var key = new Panel();
                //var bindHumiditySensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionBindSensorForm(key, bindHumidityDev, 3);
                //Shared.Phone.UserView.HomePage.Instance.AddChidren(bindHumiditySensorPage);
                //Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                //bindHumiditySensorPage.Show();

                //bindHumiditySensorPage.actionHumidityTarget += (bindName) =>
                //{
                //    Application.RunOnMainThread(() =>
                //    {
                //        if (string.IsNullOrEmpty(bindName))
                //        {
                //            btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
                //        }
                //        else
                //        {
                //            btnHumidityStatu.Text = bindName;
                //        }
                //    });
                //};
            };
        }



        /// <summary>
        ///  温度来源行
        /// </summary>
        private void AddTemperatureSensorRow()

        {

            //温度来源
            var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
            listview.AddChidren(rowTemPerature);
            rowTemPerature.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600);
            //底线
            rowTemPerature.AddBottomLine();
            //右箭头
            rowTemPerature.AddRightArrow();
            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
            if (!string.IsNullOrEmpty(bindTemperatureName))
            {
                msg = bindTemperatureName;
            }
            var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
            rowTemPerature.ButtonClickEvent += (sender, e) =>
            {
                //var key = new Panel();
                //var bindTemperatureSensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(key, bindTemperatureDev, 2);
                //Shared.Phone.UserView.HomePage.Instance.AddChidren(bindTemperatureSensorPage);
                //Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                //bindTemperatureSensorPage.Show();

                //bindTemperatureSensorPage.actionTemperatureTarget += (bindName) =>
                //{
                //    Application.RunOnMainThread(() =>
                //    {
                //        if (string.IsNullOrEmpty(bindName))
                //        {
                //            btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
                //        }
                //        else
                //        {
                //            btnTemperatureStatu.Text = bindName;
                //        }
                //    });
                //};
            };
        }
        #endregion




        #region ■ 功能类型(空气开关专用)_____________




        /// <summary>

        /// 添加【功能类型】行(空气开关专用)

        /// </summary>