.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,45 +1,25 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.220222E9-B9CA-4834-9318-2BC22465F050" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Mqtt/MqttClient.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs"> <Files> <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs" Line="211" Column="33" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs" Line="351" Column="10" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="446" Column="41" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="237" Column="52" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" Line="186" Column="54" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="400" Column="14" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="208" Column="51" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="67" Column="30" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="DAL" expanded="True"> <Node name="Mqtt" expanded="True"> <Node name="MqttClient.cs" selected="True" /> </Node> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="2-Classification" expanded="True" /> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True" /> <Node name="HDL-ON_Android" selected="True" /> </Node> </State> </Pad> <Pad Id="MonoDevelop.Debugger.WatchPad"> <State> <Value>function.spk</Value> </State> </Pad> </Pads> @@ -50,8 +30,8 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" /> <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_Android/Assets/Phone/FunctionIcon/AirFresh/HumiIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/AirFresh/HumiOnIcon.png
@@ -211,6 +211,7 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202110142" android:versionName="1.2.202110142" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202110143" android:versionName="1.2.202110143" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" /> <!-- 乐橙可视对讲需要的权限 --> <!--<uses-permission android:name="android.permission.INTERNET" />--> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1356,6 +1356,7 @@ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumiIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/HumiIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/HumiOnIcon.png
@@ -965,6 +965,10 @@ { case SPK.AirSwitch: AirSwitchPage.UpdataState(localFunction); if(localFunction.GetAttribute(FunctionAttributeKey.Power)!=null)//如果是带电量的空开也要更新能源界面 { EnergyMainPage.UpdataStatus(localFunction); } break; case SPK.ElectricEnergy: EnergyMainPage.UpdataStatus(localFunction); HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -482,6 +482,7 @@ { var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey); var revString = Encoding.UTF8.GetString(bytes); MainPage.Log($"mqtt 状态更新:{revString}"); Control.Ins.UpdataFunctionStatus(revString, null, true); } //一端口数据解析 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -212,9 +212,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //bodyDiv.AddChidren(btnCollectionIcon); //2020-12-16 如果是成员隐藏收藏功能 if ( !SPK.ArmSensorSpkList().Contains(function.spk) || !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && if ( !SPK.ArmSensorSpkList().Contains(function.spk) && !SPK.EnvironDeviceSpkList().Contains( function.spk))//!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && { bodyDiv.AddChidren(btnCollectionIcon); } HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
@@ -315,6 +315,7 @@ btnSetHumidity.X = this.FrameWhiteCentet1.Width - btnMode1.X - btnSetHumidity.IconSize; btnSetHumidity.Y = btnMode1.Y; btnSetHumidity.UnSelectedImagePath = "FunctionIcon/AirFresh/HumiIcon.png"; btnSetHumidity.SelectedImagePath = "FunctionIcon/AirFresh/HumiOnIcon.png"; this.FrameWhiteCentet1.AddChidren(btnSetHumidity); btnSetHumidity.ButtonClickEvent += (sender, e) => @@ -737,10 +738,12 @@ this.btnFanView.Text = this.dicText["1档"]; } this.btnFan.IsSelected = this.airFreshData.Open; this.btnFan.CanClick = this.airFreshData.Open; this.btnSetHumidityView.Text = this.airFreshData.Humidity.ToString() + "%"; this.btnSetHumidity.Enable = this.airFreshData.Open; this.btnSetHumidity.CanClick = this.airFreshData.Open; } #endregion
@@ -153,7 +153,7 @@ TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.TextFontSize, }; controlView.AddChidren(btnRunStatus); //controlView.AddChidren(btnRunStatus); //状态无法测试，暂时隐藏--2021-10-14 13:58:48 董泽斌 UpdataRunStatus(); }
@@ -179,6 +179,7 @@ double tt = 0; double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt); tt *= 100;//乘以100，小于1无法加载echart tt = Math.Round(tt, 2); list.Add(ene.name, tt.ToString()); } myEchartsView_Pie.ShowWithOption(new EchartsOption_Pie().InitDateJson(list)); @@ -506,10 +507,13 @@ row.Y = btnLine.Bottom; view.AddChidren(row); //记录需要更新的更新按钮 listButton_value.Add(row.btnValue); } /// <summary> /// 记录需要更新的更新按钮 /// </summary> public List<Button> listButton_value = new List<Button>(); /// <summary> @@ -530,7 +534,7 @@ var newValue = updataTemp.GetAttrState(FunctionAttributeKey.Power); //if (newValue != btn.Text) { btn.Text = newValue; btn.Text = Math.Round(double.Parse(newValue), 2).ToString(); UpdataValue(); } } @@ -553,17 +557,20 @@ Dictionary<string, string> list = new Dictionary<string, string>();//饼图数据 foreach (var ene in bodyView.energyList) { double power = 0; double power = 0.00; double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out power); power = Math.Round(power, 2); totalValue += power; int realTimePower = 0; int.TryParse(ene.GetAttrState(FunctionAttributeKey.Power), out realTimePower); double realTimePower = 0; double.TryParse(ene.GetAttrState(FunctionAttributeKey.Power), out realTimePower); realtimeValue += realTimePower; realtimeValue = Math.Round(realtimeValue, 2); #region 饼图数据 double tt = 0; double tt = 0.00; double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt); tt = Math.Round(tt, 2); tt *= 100;//乘以100，小于1无法加载echart list.Add(ene.name, tt.ToString()); #endregion
