Merge branch 'dev-tzy' into dev-2020xm

xm

2020-06-19 eb5a57942bae8eb57fd7fb61124c247bebb67e8e

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

@@ -294,7 +294,7 @@
            }
            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)

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

            }

            else

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

        #endregion

@@ -1005,7 +1030,7 @@

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

        /// <summary>

        /// 添加【绑定目标】行 
        /// 添加【绑定目标】行

        /// </summary>

        private void AddIBindRow(string deviceMac)

        {
@@ -1056,7 +1081,7 @@
                }
                device.Type = DeviceType.OnOffSwitch;
                device.DeviceAddr = deviceMac;
                device.DeviceEpoint = 65;//能绑定湿度的回路 
                device.DeviceEpoint = 65;//能绑定湿度的回路
                var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Temperature);
                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -1077,6 +1102,7 @@
                };
            };
        }

        #endregion



        /// <summary>
        ///  温度来源行
@@ -1107,7 +1133,7 @@
                }
                device.Type = DeviceType.OnOffSwitch;
                device.DeviceAddr = deviceMac;
                device.DeviceEpoint = 64;//能绑定温度的回路 
                device.DeviceEpoint = 64;//能绑定温度的回路
                var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Temperature);
                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -1356,7 +1382,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) =>

            {