8月版本备份

wei

2021-09-02 bbef77b91909344fe48e5cfe71190534328ab7d3

8月版本备份

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,11 +1,22 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
    <Files>
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="89" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs" Line="304" Column="119" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="976" Column="47" />
      <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="605" Column="54" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="288" Column="103" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption.cs" Line="8" Column="31" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="213" Column="54" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" Line="895" Column="68" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs" Line="62" Column="49" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL-ON_iOS" selected="True" />
            <Node name="HDL-ON_Android" selected="True" />
          </Node>
        </State>
      </Pad>

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -1000,7 +1000,7 @@
                                    HomePage.LoadEvent_RefreshEnvirIndoorHumi();
                                }
                                EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
                                A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
                                //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
                                break;
                            case SPK.SensorEnvironment:
                            case SPK.SensorEnvironment2:
@@ -1014,7 +1014,7 @@
                                    HomePage.LoadEvent_RefreshEnvirIndoorHumi();
                                }
                                EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
                                A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
                                //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
                                break;
                            case SPK.ElectricSocket:
                                SocketPage.UpdataState(localFunction);

 HDL_ON/DAL/DriverLayer/Packet.cs

@@ -539,7 +539,7 @@
                                            break;
                                    }
                                    EnvironmentalPage.LoadEvent_UpdataStatus(sensor);
                                A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(sensor);
                                //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(sensor);
                                }
                            }
                        }
@@ -601,7 +601,7 @@
                                            break;
                                    }
                                    
                                A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(sensor);
                                //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(sensor);
                                    EnvironmentalPage.LoadEvent_UpdataStatus(sensor);
                                }
                            }

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -121,6 +121,7 @@
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                    ShowFunction.SecurityCenter
                                });
                        instance.SupportFacePass = false;
                        instance.SaveResidenceData();
                    }
                    catch (Exception ex)

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -210,7 +210,7 @@
                    //etAccount.Text = "18022428438";//wjc
                    //etAccount.Text = "13602944661";//kx
                    etAccount.Text = "13226233133";//豆豆
                    etAccount.Text = "18316672920";
                    //etAccount.Text = "18316672920";
                    //etAccount.Text = "18316120654";//tujie
                    //etAccount.Text = "15626203746";
                    //etAccount.Text = "13450425807";//黄竹溪 knx项目

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -973,8 +973,8 @@
                        btnName.TextID = StringId.EnvironmentalData;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            //var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
                            var skipView = new A_EnvironmentalDataCenter();// EnvironmentalSciencePage();
                            var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
                            //var skipView = new A_EnvironmentalDataCenter();// EnvironmentalSciencePage();
                            MainPage.BasePageView.AddChidren(skipView);
                            skipView.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption.cs

@@ -55,7 +55,7 @@
            grid = new EchartGrid
            {
                left = "5%",
                right = "5%",
                right = "8%",
                bottom = "5%",
                top = "5%",
                containLabel = true

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs

@@ -130,7 +130,7 @@
                    },
                    grid: {
                         top: '10%',
                        left: '10%',
                        left: '13%',
                        right: '10%',
                        bottom: '15%',
                    },

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs

@@ -285,7 +285,9 @@
                            deviceId = sensor.deviceId,
                            roomIds = sensor.roomIds,
                            attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = seTemp.state, curValue = seTemp.curValue }
                            ,new FunctionAttributes { key = "spk"} }
                            , new FunctionAttributes {key = "spk",state = seTemp.key,curValue = seTemp.key } 
                            //,new FunctionAttributes { key = "spk"}
                        }
                        };
                        switch (seTemp.key)
                        {

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs

@@ -862,6 +862,10 @@

                        var sensorType = sr.spk.Split(".")[1];
                        var queryType = sr.GetAttrState("spk").ToString();
                        if(queryType == "0")
                        {
                            queryType = "value";
                        }

                        var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId, queryType);
                        if (revertObj != null)