Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using Org.BouncyCastle.Bcpg.OpenPgp;
using Shared.Common;
using ZigBee.Common;
using ZigBee.Device;
@@ -40,7 +39,7 @@
        private string bindPmName = string.Empty;

        #endregion



        #region ■ 初始化_____________________________


        /// <summary>

@@ -50,8 +49,8 @@
        public void ShowForm(CommonDevice i_device)

        {

            this.deviceObj = i_device;

            //获取数据

            ReadDoorLockUserInfo(deviceObj);

            //获取数据
            ReadDoorLockUserInfo(deviceObj);


            //设置头部信息

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

@@ -87,9 +86,9 @@
            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);



            //初始化菜单行

            this.InitMenuRow();

            //初始化桌布完成
            this.InitMenuRow();



            //初始化桌布完成

            tableContr.FinishInitControl();

            tableContr = null;



@@ -101,14 +100,14 @@
            {

                //关闭自身

                this.CloseForm();

            };
            };

        }



        /// <summary>

        /// 初始化菜单行

        /// </summary>

        private void InitMenuRow()

        {
        {

            this.listview.RemoveAll();

            //添加新风目标
            this.AddFreshAirRow();
@@ -123,7 +122,7 @@
        }
        #endregion

        #region ■ 初始化数据_________________________ 
        #region ■ 初始化数据_________________________

        /// <summary>
        /// 初始化数据
@@ -164,8 +163,8 @@
            });
        }
        #endregion

        #region ■ 新风目标_________________________ 


        #region ■ 新风目标_________________________
        /// <summary>
        ///  新风目标行
        /// </summary>
@@ -178,15 +177,15 @@
            //底线

            rowNewWind.AddBottomLine();

            //右箭头

            rowNewWind.AddRightArrow();
            rowNewWind.AddRightArrow();


            var msg = Language.StringByID(R.MyInternationalizationString.nothing);

            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
            if (!string.IsNullOrEmpty(bindFreshAirName))
            {
                msg = bindFreshAirName;
            }
            var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);




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

            {

                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, 1);
@@ -262,7 +261,7 @@
            return result;
        }

        #region ■ PM2.5来源_________________________ 
        #region ■ PM2.5来源_________________________
        /// <summary>
        ///  PM2.5来源行
        /// </summary>
@@ -307,7 +306,7 @@
        }
        #endregion

        #region ■ 温度来源_________________________ 
        #region ■ 温度来源_________________________
        /// <summary>
        ///  温度来源行
        /// </summary>
@@ -352,7 +351,7 @@
        }
        #endregion

        #region ■ 湿度来源_________________________ 
        #region ■ 湿度来源_________________________
        /// <summary>
        ///  湿度来源行
        /// </summary>
@@ -397,7 +396,7 @@
        }
        #endregion

        #region ■ 亮度调节_________________________ 
        #region ■ 亮度调节_________________________
        /// <summary>
        ///  亮度调节行
        /// </summary>
@@ -424,7 +423,7 @@
        }
        #endregion


        #region ■ 右上角菜单_________________________ 
        #region ■ 右上角菜单_________________________
        /// <summary>

        /// 初始化右上角菜单

        /// </summary>