2020.06.24.01

陈嘉乐

2020-06-24 adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e

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

@@ -248,6 +248,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

            {

                //添加【工作模式】行(pir传感器专用)

@@ -531,6 +545,31 @@
            };

        }



        #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 ■ 按键设置(方悦)_____________________

@@ -922,7 +961,115 @@
                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 ■ 功能类型(空气开关专用)_____________

@@ -1035,7 +1182,7 @@
            btnNewVersion.Visible = false;

            btnNewVersion.X = Application.GetRealWidth(242);

            btnNewVersion.Y = Application.GetRealHeight(23);

            rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);

            rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);



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

            {