From cda2410f9c29f2fadc16e9de38ccae95b75a89dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 10:51:13 +0800
Subject: [PATCH] 1
---
HDL-ON_iOS/Resources/Language.ini | 4 +---
HDL-ON_Android/Assets/Language.ini | 4 +---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 24 +++++++++++-------------
3 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index fd0c567..4a69535 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -3,24 +3,22 @@
<MonoDevelop.Ide.Workbench>
<Files>
<File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="8" Column="17" IsPinned="True" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="360" Column="50" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="220" Column="56" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="23" Column="55" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="353" Column="41" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="720" Column="14" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs" Line="135" Column="35" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="153" Column="59" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs" />
<File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="421" Column="19" />
+ <File FileName="HDL_ON/Common/R.cs" Line="118" Column="43" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1928" Column="1" />
</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="Server" expanded="True" />
- </Node>
- </Node>
- <Node name="HDL-ON_iOS" expanded="True" selected="True" />
+ <Node name="HDL-ON_Android" selected="True" />
</Node>
</State>
</Pad>
@@ -32,7 +30,7 @@
<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>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 4c5c822..61be5a1 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -412,8 +412,6 @@
426=Air dry time
427=Disinfect time
428=Anion Time
-429=Real time power consumption: {0}kw
-
429=H
430=Min
431=You are currently adding any platform devices to
@@ -424,7 +422,7 @@
436=Added Devices
437=Device List
438=humidity:{0}% air:{1} wind:{2}
-439=Real time power consumption: {0} kw
+439=Real time: {0} kw
440=Next step
441=Please select all areas of capture status
442=Generate Scene
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 4c5c822..61be5a1 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -412,8 +412,6 @@
426=Air dry time
427=Disinfect time
428=Anion Time
-429=Real time power consumption: {0}kw
-
429=H
430=Min
431=You are currently adding any platform devices to
@@ -424,7 +422,7 @@
436=Added Devices
437=Device List
438=humidity:{0}% air:{1} wind:{2}
-439=Real time power consumption: {0} kw
+439=Real time: {0} kw
440=Next step
441=Please select all areas of capture status
442=Generate Scene
--
Gitblit v1.8.0