2021-7-9-1

JLChen

2021-07-08 3c58dd269afcb1d19e05d1417bb8994145bbe48d

2021-7-9-1

修改红外宝学习按键key备注

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,6 +1,12 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="196" Column="76" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="57" Column="19" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
@@ -12,9 +18,14 @@
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True">
                      <Node name="LogicMethod.cs" selected="True" />
                    </Node>
                  </Node>
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="PirDevice" expanded="True">
                      <Node name="AddButton.cs" selected="True" />
                      <Node name="View" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="FuntionControlView" expanded="True" />

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

@@ -113,7 +113,8 @@
            ///下一步的点击事件
            saveBtn.MouseUpEventHandler += (sender, e) =>
            {
                if (control.status.Count>29) {
                if (control.status.Count > 29)
                {
                    ///超出30个红外宝内存满了会出现异常
                    new PirMethod().ErrorShow(null, "添加按钮超出30个");
                    return;
@@ -137,7 +138,8 @@

                //添加数据对象
                Entity.AttributesStatus buttonObj = new Entity.AttributesStatus();
                buttonObj.key = "key" + control.status.Count.ToString();
                string keyName = GetKeyName(control.status);
                buttonObj.key = keyName;
                buttonObj.value = texts;

                PirSend.CodeStudy(control, buttonObj, (mqttdate) =>
@@ -168,7 +170,7 @@
                    {
                        replication.RemView();
                        PirMethod method = new PirMethod();
                        method.ErrorShow(null,"添加失败");
                        method.ErrorShow(null, "添加失败");
                    }

                });
@@ -185,5 +187,28 @@
            PirMethod.RefreshView("PirMain");
            base.RemoveFromParent();
        }

        /// <summary>
        /// 查找唯一健名值
        /// </summary>
        /// <param name="listKeyName">已经存在健名列表</param>
        /// <returns></returns>
        private string GetKeyName(List<Entity.AttributesStatus> listKeyName)
        {
            //目前红外宝学习按钮最多是30个；
            for (int i = 0; i < 50; i++)
            {
                string keyName = "key" + i.ToString();
                ///查找是否存在
                var currKeyName = listKeyName.Find((c) => c.key == keyName);
                if (currKeyName == null)
                {
                    return keyName;
                }
            }

            return "key" + listKeyName.Count;
        }

    }
}