海林传感器

wei

2021-07-09 bce17e5a91e596d29209056e2e4ac3a6f88c2219

海林传感器

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,9 +1,14 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Function.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/LoginPage.cs">
    <Files>
      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="190" Column="57" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="420" Column="21" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="760" Column="169" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs" />
      <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="154" Column="69" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1848" Column="82" />
      <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="346" Column="86" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="527" Column="46" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -12,11 +17,15 @@
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True" />
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True">
                  <Node name="Function.cs" selected="True" />
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI1-Login" expanded="True">
                  <Node name="LoginPage.cs" selected="True" />
                </Node>
              </Node>
            </Node>
@@ -32,8 +41,8 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.7374d754" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" />

 HDL_ON/Common/ApiUtlis.cs

@@ -187,6 +187,7 @@
                        //处理剩下的新增功能
                        foreach (var newFunction in deviceList.list) 
                        {
                            newFunction.AssembleStatus();
                            newFunction.SaveFunctionFile();
                            FunctionList.List.IniFunctionList(newFunction.savePath);
                        }

 HDL_ON/Entity/Function/Function.cs

@@ -285,6 +285,16 @@
        /// 功能的属性状态列表
        /// </summary>
        public List<AttributesStatus> status = new List<AttributesStatus>();
        /// <summary>
        /// 通过状态列表组装属性里面的状态
        /// </summary>
        public void AssembleStatus()
        {
            foreach (var sta in status)
            {
                SetAttrState(sta.key, sta.value);
            }
        }


        /// <summary>

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Threading;
using HDL_ON.Common;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -522,7 +523,12 @@
            };
            bodyView.AddChidren(btnDomeLogin);
            btnDomeLogin.MouseUpEventHandler = (sender, e) => {

                MainPage.NoLoginMode = true;
#if DEBUG
                FileUtlis.Files.DeleteAllFile();
#endif

                //楼层房间列表
                var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
                floor1.SaveRoomFile();
@@ -664,9 +670,9 @@
                {
                    sid = "light4",
                    deviceId = "light4",
                    name = Language.CurrentLanguage == "Chinese" ? "大灯" : "light 1" ,
                    name = Language.CurrentLanguage == "Chinese" ? "大灯" : "light 1",
                    spk = SPK.LightSwitch,
                    roomIds = new List<string>() { "1405771024583090178"},
                    roomIds = new List<string>() { "1405771024583090178" },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on"   },
@@ -1056,11 +1062,6 @@
                #endregion

                var fileList = Common.FileUtlis.Files.ReadFiles();

                //foreach (var file in fileList)
                //{
                //    FunctionList.List.IniFunctionList(file,true);
                //}

                Room.CurrentSpatial.InitRoomListFunctions();