请合并小模块

xm

2020-04-30 2eacb04ca1ec0ad20fda4186b59a9bce67004cb4

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

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

        #endregion



        #region ■ 初始化_____________________________


        /// <summary>

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

        {

            this.deviceObj = i_device;

            //获取数据
            ReadDoorLockUserInfo(deviceObj);
            //获取数据

            ReadDoorLockUserInfo(deviceObj);



            //设置头部信息

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

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



            //初始化菜单行

            this.InitMenuRow();



            //初始化桌布完成

            this.InitMenuRow();

            //初始化桌布完成
            tableContr.FinishInitControl();

            tableContr = null;



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

                //关闭自身

                this.CloseForm();

            };

            };
        }



        /// <summary>

        /// 初始化菜单行

        /// </summary>

        private void InitMenuRow()

        {

        {
            this.listview.RemoveAll();

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



        #region ■ 新风目标_________________________ 
        /// <summary>
        ///  新风目标行
@@ -177,15 +178,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);