2020-12-02-4

陈嘉乐

2020-12-02 6b6a65cc86b668b57a84d6d8a7bec4c43ddcc0f5

2020-12-02-4

备份代码（模拟设备实现逻辑）

 .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.D4411691-F5B8-40F4-97C1-964F33115DBC" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="138" Column="24" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="138" Column="69" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="244" Column="71" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs" Line="5" Column="18" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
@@ -10,13 +16,17 @@
              <Node name="DAL" expanded="True">
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Enumerative" expanded="True" />
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI0-Public" 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="AddLogic.cs" selected="True" />
                      <Node name="LogicView" expanded="True">
                        <Node name="SelectTypeView.cs" selected="True" />
                      </Node>
                    </Node>
                  </Node>
                  <Node name="FuntionControlView" expanded="True" />

 HDL_ON/Entity/Function/Function.cs

@@ -13,6 +13,7 @@
        public Function()
        {
        }
      

        #region base info
        /// <summary>
@@ -72,15 +73,16 @@
                }
            }
        }
        /// <summary>
        /// 功能类型
        /// </summary>
        ///// <summary>
        ///// 功能类型
        ///// </summary>
        public FunctionType functionType
        {
            get
            {
                var _functionTypeString = sid.Substring(16, 4);
                return (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));

            }
        }


 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -135,7 +135,6 @@

                    }
                };

                ///删除控件
                inputView.btnDel.MouseUpEventHandler += (sender, e) =>
                {

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -123,8 +123,32 @@
        /// <returns></returns>
        public static List<HDL_ON.Entity.Function> GetGatewayDeviceList()
        {

            return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
            List<HDL_ON.Entity.Function> list = new List<Entity.Function>();
            for (int i=0;i<3;i++) {
                HDL_ON.Entity.Function function = new Entity.Function();
                switch (i) {
                    case 0: {
                            function.sid = "1234560001212121020182";
                            function.name ="灯光";
                            list.Add(function);
                        }
                        break;
                    case 1: {
                          
                            function.sid = "1234560001212121030182";
                            function.name = "窗帘";
                            list.Add(function);
                        } break;
                    case 2: {
                            function.sid = "1234560001212121040182";
                            function.name = "空调";
                            list.Add(function);
                        } break;
                     
                }
            }
            return list;
            //return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
        }
        /// <summary>
        /// 获取网关场景列表
@@ -296,11 +320,15 @@
            switch (if_type) {
                case condition_if: {
                        deviceTypeList.Add(FunctionType.Relay);
                        deviceTypeList.Add(FunctionType.Curtain);
                        deviceTypeList.Add(FunctionType.AC);
                    }
                    break;
                case target_if:
                    {
                        deviceTypeList.Add(FunctionType.Relay);
                        deviceTypeList.Add(FunctionType.Curtain);
                        deviceTypeList.Add(FunctionType.AC);
                    }
                    break;
            }

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs

@@ -120,6 +120,7 @@
            btnText.Gravity = Gravity.CenterVertical;
            btnText.TextAlignment = TextAlignment.CenterLeft;
            btnNextIcon.Gravity = Gravity.CenterVertical;
            btnDeviceName.Gravity= Gravity.CenterVertical;
            frameLayout.AddChidren(btnIcon);
            frameLayout.AddChidren(btnText);
            frameLayout.AddChidren(btnDeviceName);