.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,9 +1,20 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control.cs"> <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/ResponseEntity/CityInfo.cs"> <Files> <File FileName="HDL_ON/UI/MainPage.cs" Line="16" Column="17" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="108" Column="1" /> <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPage.cs" Line="72" Column="11" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="9" Column="45" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="692" Column="21" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="693" Column="36" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" Line="363" Column="55" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="531" Column="80" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="265" Column="45" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs" Line="157" Column="50" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" Line="127" Column="74" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="203" Column="52" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="179" Column="46" /> <File FileName="HDL_ON/Entity/ResponseEntity/CityInfo.cs" Line="32" Column="32" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -11,13 +22,45 @@ <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True"> <Node name="Control.cs" selected="True" /> <Node name="Mqtt" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> <Node name="ResponseEntity" expanded="True"> <Node name="CityInfo.cs" selected="True" /> </Node> </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="AddFunction" expanded="True" /> </Node> <Node name="HDL-ON_iOS" expanded="True" /> <Node name="FuntionControlView" expanded="True"> <Node name="EnvironmentalScience" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True"> <Node name="Phone" expanded="True"> <Node name="FunctionIcon" expanded="True"> <Node name="Icon" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True"> <Node name="Phone" expanded="True"> <Node name="FunctionIcon" expanded="True"> <Node name="Icon" expanded="True" /> </Node> </Node> </Node> </Node> </Node> </State> </Pad> @@ -29,12 +72,13 @@ <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.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/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1841" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL-ON_Android/Assets/Language.ini
@@ -445,7 +445,7 @@ 458=Date 459=Real time energy consumption 460=Energy consumption of this month 461=Indoor/Outdoor 461=Outdoor/Indoor 1000=Room Humidity 1001=V-chip @@ -1247,7 +1247,7 @@ 458=日期 459=实时能耗 460=本月能耗 461=室内/室外 461=室外/室内 1000=室内湿度 1001=童锁 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensormegahealth.png
@@ -1142,6 +1142,7 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irstb_blue.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irstb_white.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Energy\EnergyDrodUpIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensormegahealth.png" /> </ItemGroup> <ItemGroup> <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1245,6 +1245,7 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irpjt.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irstb.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Energy\EnergyDrodUpIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensormegahealth.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Info.plist
@@ -104,9 +104,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.2.202105251</string> <string>1.2.202105252</string> <key>CFBundleVersion</key> <string>1.2.05251</string> <string>1.2.05252</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL-ON_iOS/Resources/Language.ini
@@ -445,7 +445,7 @@ 458=Date 459=Real time energy consumption 460=Energy consumption of this month 461=Indoor/Outdoor 461=Outdoor/Indoor 1000=Room Humidity 1001=V-chip @@ -1247,7 +1247,7 @@ 458=日期 459=实时能耗 460=本月能耗 461=室内/室外 461=室外/室内 1000=室内湿度 1001=童锁 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensormegahealth.png
@@ -690,6 +690,7 @@ case "18778381374": case "18316672920": case "15971583093": case "15626203746": return; } @@ -824,6 +825,9 @@ var mqttInfoRequestResult_Obj = new HttpServerRequest().GetMqttRemoteInfo(GetRandomKey()); if (mqttInfoRequestResult_Obj != null) { MainPage.Log($"获取mqtt info 成功 /r/n clientId:{mqttInfoRequestResult_Obj.clientId}/r/n passWord:{mqttInfoRequestResult_Obj.passWord} /r/n url:{mqttInfoRequestResult_Obj.url}/r/n userName:{mqttInfoRequestResult_Obj.userName}"); MqttInfoConfig.Current.mMqttInfo = mqttInfoRequestResult_Obj; await MQTTConnectAsync(); //1.判断是否绑定了网关，获取网关远程连接的加密KEY HDL_ON/Entity/Function/Function.cs
@@ -1159,6 +1159,11 @@ /// （干接点） /// </summary> public const string SensorDryContact = "sensor.dryContact"; /// <summary> /// 毫米波传感器 /// </summary> public const string SenesorMegahealth = "sensor.megahealth"; /// <summary> /// 安防传感器spk列表 @@ -1177,6 +1182,7 @@ spkList.Add(SensorDuiShe); spkList.Add(SensoruUtrasonic); spkList.Add(SensorDryContact); spkList.Add(SenesorMegahealth); return spkList; } #endregion HDL_ON/Entity/ResponseEntity/CityInfo.cs
@@ -30,6 +30,14 @@ /// 时区 /// </summary> public string timeZone; /// <summary> /// 最低温 /// </summary> public string lowestTemperature = "--"; /// <summary> /// 最高温 /// </summary> public string highestTemperature = "--"; /// <summary> /// 温度 HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -77,7 +77,7 @@ foreach (var function in room.GetRoomFunctions(false)) { if (function.Spk_Prefix == FunctionCategory.Sensor) if (function.Spk_Prefix == FunctionCategory.Sensor || function.spk == SPK.ElectricEnergy) { continue; } HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
@@ -218,7 +218,7 @@ { EnergyRow(energy, energyListView, index); index++; DriverLayer.Control.Ins.SendReadCommand(energy); Control.Ins.SendReadCommand(energy); } @@ -690,6 +690,7 @@ Action backAction = () => { btnName.Text = energy.name; btnFromFloor.Text = energy.GetRoomListName(); }; var infoView = new FunctionBaseInfoSetPage(energy, backAction); MainPage.BasePageView.AddChidren(infoView); HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -153,7 +153,7 @@ TextColor = CSS_Color.TextualColor, TextAlignment = TextAlignment.CenterLeft, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, Text = "--°C", Text = $"{MainPage.cityInfo.highestTemperature}°C", }; topWeatherView.AddChidren(btnTempUpperLimitText); @@ -176,7 +176,7 @@ TextColor = CSS_Color.TextualColor, TextAlignment = TextAlignment.CenterLeft, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, Text = "--°C", Text = $"{MainPage.cityInfo.lowestTemperature}°C", }; topWeatherView.AddChidren(btnTempLowerLimitText);
@@ -360,7 +360,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(43), TextID = StringId.ExtremelyCold, TextID = StringId.SlightlyCold, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -475,7 +475,7 @@ tipValuesView.AddChidren(new Button() { Width = Application.GetRealWidth(151), Text = "70", Text = "40%", TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -483,7 +483,7 @@ tipValuesView.AddChidren(new Button() { Width = Application.GetRealWidth(151), Text = "40", Text = "70%", TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -491,7 +491,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(101), TextID = StringId.SensorReferenceTVOCTipLevel1, TextID = StringId.SensorReferenceHumidityTipLevel1, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -499,7 +499,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(101), TextID = StringId.SensorReferenceTVOCTipLevel2, TextID = StringId.SensorReferenceHumidityTipLevel2, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -507,7 +507,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(101), TextID = StringId.SensorReferenceTVOCTipLevel3, TextID = StringId.SensorReferenceHumidityTipLevel3, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
