2021-7-7-1

JLChen

2021-07-07 5e5b950e83dff438e64ce7e088aaa31455091b0c

2021-7-7-1

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -6,24 +6,27 @@
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True">
                      <Node name="LogicView" expanded="True" />
                      <Node name="LogicMethod.cs" selected="True" />
                    </Node>
                  </Node>
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="PirDevice" expanded="True" />
                    <Node name="PirDevice" expanded="True">
                      <Node name="AddButton.cs" selected="True" />
                    </Node>
                  </Node>
                  <Node name="FuntionControlView" expanded="True" />
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>
      </Pad>

 HDL-ON_Android/Assets/Language.ini

@@ -792,6 +792,7 @@
6092=The device does not exist
6093=The device is not online
6094=The gateway device does not exist
6095=More than 30 add buttons
 
 
7108=Leak/No Leak
@@ -1858,7 +1859,7 @@
6092=设备不存在
6093=设备不在线
6094=网关设备不存在
 
6095=添加按钮超出30个
 
 
7000=新建自动化

 HDL-ON_iOS/Resources/Language.ini

@@ -792,6 +792,7 @@
6092=The device does not exist
6093=The device is not online
6094=The gateway device does not exist
6095=More than 30 add buttons
 
 
7108=Leak/No Leak
@@ -1858,6 +1859,7 @@
6092=设备不存在
6093=设备不在线
6094=网关设备不存在
6095=添加按钮超出30个
 
 
 

 HDL_ON/Common/R.cs

@@ -1350,6 +1350,8 @@
        public const int shebeibucunzai = 6092;
        public const int shebeibuzaixian = 6093;
        public const int wangguanshebeibuzaixian = 6094;
        public const int anniuchaochu30 = 6095;


        public const int newAutomation = 7000;
        public const int editAutomation = 7001;

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

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

                var texts = editText.Text.Trim();
                if (string.IsNullOrEmpty(editText.Text))
                {

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

@@ -544,6 +544,9 @@
            {
                str = Language.StringByID(StringId.tianjiashibai);
            }
            else if (text== "添加按钮超出30个") {
                str = Language.StringByID(StringId.anniuchaochu30);
            }
            else
            {
                if (responsePackNew != null)