2020-12-16 1.增加是否允许创建场景参数获取和判断

JLChen

2020-12-16 2763663f356b784404bcf81e873d1d24c10002be

2020-12-16 1.增加是否允许创建场景参数获取和判断

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,13 +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 ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs" Line="68" Column="53" IsPinned="True" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="227" Column="38" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs" Line="128" Column="55" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="131" Column="27" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -17,10 +12,11 @@
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True" />
                <Node name="Server" expanded="True" />
                <Node name="Server" expanded="True">
                  <Node name="HttpServerRequest.cs" selected="True" />
                </Node>
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
                <Node name="ResponseEntity" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
@@ -34,13 +30,14 @@
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="AC" expanded="True" />
                    <Node name="Curtain" expanded="True">
                      <Node name="MotorCurtainPage.cs" selected="True" />
                    </Node>
                    <Node name="Curtain" expanded="True" />
                    <Node name="Electrical" expanded="True" />
                    <Node name="EnvironmentalScience" expanded="True" />
                    <Node name="FoolHeating" expanded="True" />
                    <Node name="Light" expanded="True" />
                    <Node name="Music" expanded="True">
                      <Node name="View" expanded="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -503,6 +503,7 @@
                            homeRegionName = mHome.homeRegionName,
                            homeRegionId = mHome.homeRegionId,
                            Address = mHome.homeAddress,
                            isAllowCreateScene = mHome.isAllowCreateScene,
                        };
                        UserInfo.Current.regionList.Add(home);
                    }

 HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs

@@ -118,6 +118,10 @@
        /// 住宅区域名字
        /// </summary>
        public string homeRegionName;
        /// <summary>
        /// 是否允许创建场景
        /// </summary>
        public bool isAllowCreateScene;
        ///// <summary>
        ///// 是否绑定网关
        ///// </summary>
@@ -199,5 +203,9 @@
        /// 住宅地址
        /// </summary>

        public string homeAddress;
        /// <summary>
        /// 是否允许创建场景
        /// </summary>
        public bool isAllowCreateScene;
    }

}


 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -69,7 +69,8 @@
            };
            bodyView.AddChidren(topView);

            if (DB_ResidenceData.Instance.GatewayType == 0)
            //不是A网关或者是成员 只允许添加场景隐藏自动化
            if (DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                btnSceneTilte = new Button()
                {
@@ -485,6 +486,18 @@
            {
                if (!btnAutomationTitle.IsSelected)
                {
                    //如果是成员
                    if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
                    {
                        //如果没有场景权限
                        if (!DB_ResidenceData.Instance.CurrentRegion.isAllowCreateScene)
                        {
                            //提示没有场景的创建权限
                            Utlis.ShowTip(Language.StringByID(StringId.PermissionDenied));
                            return;
                        }
                    }

                    Action action = () =>
                    {
                        LoadSceneFunctionControlZone();