2021-5-21-1

JLChen

2021-05-21 9bd930de5cb72d9e1ad0788961a469231b06338f

2021-5-21-1

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,12 +1,6 @@
<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 ActiveDocument="HDL_ON/DAL/Mqtt/MqttClient.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="211" Column="40" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs" Line="583" Column="34" />
      <File FileName="HDL_ON/Common/R.cs" Line="942" Column="26" />
      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="333" Column="1" />
    </Files>
  <MonoDevelop.Ide.Workbench>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
@@ -14,14 +8,14 @@
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="Mqtt" expanded="True">
                  <Node name="MqttClient.cs" selected="True" />
                </Node>
                <Node name="Mqtt" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="PirDevice" expanded="True" />
                    <Node name="PirDevice" expanded="True">
                      <Node name="PirMethod.cs" selected="True" />
                    </Node>
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Music" expanded="True" />
@@ -29,8 +23,8 @@
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True" />
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>
@@ -46,9 +40,7 @@
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="333" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 HDL-ON_Android/Assets/Language.ini

@@ -1450,6 +1450,7 @@
6091=不存在的产品
6092=设备不存在
6093=设备不在线
6094=网关设备不存在




 HDL-ON_iOS/Resources/Language.ini

@@ -1446,6 +1446,7 @@
6091=不存在的产品
6092=设备不存在
6093=设备不在线
6094=网关设备不存在




 HDL_ON/Common/R.cs

@@ -940,7 +940,7 @@
        public const int bucunzaichanpin = 6091;
        public const int shebeibucunzai = 6092;
        public const int shebeibuzaixian = 6093;

        public const int wangguanshebeibuzaixian = 6094;

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

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

@@ -61,12 +61,7 @@

            };
            middFLayout.AddChidren(addDevice);
            if (Pir.currPir.FunctioList.Count < 10)
            {
                //10个遥控器就会隐藏添加图标
                // middFLayout.AddChidren(addDevice);
                addDevice.Visible = true;
            }
         
            #endregion

            #region 界面点击事件
@@ -155,6 +150,12 @@
        /// <param name="vv">上下滑控件</param>
        private void UIView(VerticalRefreshLayout vv)
        {
            if (Pir.currPir.FunctioList.Count < 10)
            {
                //10个遥控器就会隐藏添加图标
                // middFLayout.AddChidren(addDevice);
                addDevice.Visible = true;
            }
            vv.RemoveAll();
            #region 红外宝图标 版本号 名称 状态
            FrameLayout fLayout = new FrameLayout

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

@@ -582,10 +582,9 @@
                            break;
                        case "9":
                            {
                                str = Language.StringByID(StringId.shebeibucunzai);
                                str = Language.StringByID(StringId.wangguanshebeibuzaixian);
                            }
                            break;
                           
                        case "2":
                            {
                                str = Language.StringByID(StringId.xitongweihuzhong);