JLChen
2020-12-17 e5248512859d7c85e603d898319469e47cda7071
2020-12-17 1.修复自动化隐藏后还能滑动问题。
2个文件已修改
28 ■■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,8 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs">
    <Files>
      <File FileName="HDL-ON_Android/Other/JPush/JPushService.cs" Line="1" Column="1" />
      <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="170" Column="43" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="118" Column="14" />
      <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1423" Column="28" />
      <File FileName="HDL_ON/UI/UI0-Public/Widget/TextButton.cs" Line="42" Column="42" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="73" Column="13" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -18,8 +14,12 @@
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI0-Public" expanded="True">
                  <Node name="Widget" expanded="True">
                    <Node name="TextButton.cs" selected="True" />
                  <Node name="Widget" expanded="True" />
                </Node>
                <Node name="UI1-Login" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="IntelligencePage.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -70,7 +70,9 @@
            bodyView.AddChidren(topView);
            //不是A网关或者是成员 只允许添加场景隐藏自动化
            if (DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
            //判断是否需要隐藏自动化
            if (HideAutoPage)
            {
                btnSceneTilte = new Button()
                {
@@ -147,7 +149,11 @@
            bodyView.AddChidren(contentPageView);
            LoadScenePageView();
            LoadAutomationPageView();
            //判断是否需要隐藏自动化
            if (!HideAutoPage)
            {
                LoadAutomationPageView();
            }
            LoadEventList();
        }