2021-3-17-1

陈嘉乐

2021-03-17 23fd8d4f2f0d72226eb1a84e0798fc7db7574817

2021-3-17-1

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,5 +1,13 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="82" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="37" Column="16" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="18" Column="23" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" Line="142" Column="53" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" Line="221" Column="35" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" Line="22" Column="20" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
@@ -8,10 +16,10 @@
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="AddDevice" expanded="True" />
                    <Node name="AddFunction" expanded="True" />
                    <Node name="PirDevice" expanded="True">
                      <Node name="View" expanded="True" />
                      <Node name="Method.cs" selected="True" />
                      <Node name="DeviceSet.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>

 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs

@@ -218,7 +218,7 @@
                    {
                        var page = new UI2.PersonalCenter.PirDevice.PirMain();
                        MainPage.BasePageView.AddChidren(page);
                        page.Show();
                        page.Show(null);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    });
                });

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs

@@ -139,7 +139,7 @@
                                {
                                    var page = new UI2.PersonalCenter.PirDevice.PirMain();
                                    MainPage.BasePageView.AddChidren(page);
                                    page.Show();
                                    page.Show(device);
                                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                                });
                            });

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs

@@ -23,7 +23,9 @@
            {
                action();
                this.RemoveFromParent();

            };

            VerticalRefreshLayout vv = new VerticalRefreshLayout();
            vv.Height = Application.GetRealHeight(667 - 64);
            vv.Y = Application.GetRealHeight(64);
@@ -45,6 +47,18 @@
            };
            #endregion
            UIView(vv);
            topView.topIconBtn.MouseUpEventHandler += (sender, e) =>
            {
                var form = new AddMiniRemoteControlDirection1Page();
                form.AddForm();
                form.AddDeviceEvent += (device) =>
                {
                    var pir = device as Pir;
                    Pir.pirDeviceList.Add(pir);
                    UIView(vv);
                };

            };

        }
        /// <summary>

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs

@@ -15,7 +15,7 @@
        /// 临时储存设备类型列表
        /// </summary>
        List<DeviceType> DeviceTypeList = new List<DeviceType>();
        public void Show()
        public void Show(Entity.Function function)
        {
            #region 界面布局
            this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -79,18 +79,28 @@

            if (Pir.pirDeviceList.Count != 0)
            {
                //默认第一个红外宝

                if (function != null)
                {
                    var pir = function as Pir;
                    Pir.currPir = pir;
                }
                else
                {
                Pir.currPir = Pir.pirDeviceList[0];
                }
                //默认第一个红外宝
                int sum = 0;
                for (int i = 0; i < Pir.pirDeviceList.Count; i++)
                {
                    //查找
                    sum += Pir.pirDeviceList[i].FunctioList.Count;
                }
                deviceNameBtn.Text = Pir.pirDeviceList[0].name;
                deviceNameBtn.Text = Pir.currPir.name;
                mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
                mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
            }

            ///设备管理的点击事件
            mainView.clickBtn.MouseUpEventHandler += (sender, e) =>
            {