From 78e535d5c5630ae34efc335c5cb87623e482d09c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 05 七月 2021 10:52:14 +0800
Subject: [PATCH] 2021-07-05-01
---
HDL-ON_iOS/Resources/Language.ini | 13 +++++-
HDL-ON_Android/Assets/Language.ini | 13 +++++-
HDL_ON/Common/R.cs | 2
.vs/HDL_APP_Project/xs/UserPrefs.xml | 32 ++++-----------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 6 +-
5 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index e699c1c..ce17c16 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,43 +1,30 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="1866" Column="42" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="516" Column="17" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="114" Column="22" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="1" 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="DriverLayer" expanded="True" />
- <Node name="Mqtt" expanded="True" />
- <Node name="Server" expanded="True" />
- </Node>
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- </Node>
+ <Node name="Common" expanded="True" />
<Node name="UI" expanded="True">
- <Node name="UI0-Stan" expanded="True">
- <Node name="Logic" expanded="True" />
- </Node>
<Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True">
- <Node name="TargetDeviceFunList.cs" selected="True" />
- </Node>
- </Node>
<Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True" />
+ <Node name="PirDevice" expanded="True">
+ <Node name="Matching.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_Android" expanded="True">
<Node name="Assets" expanded="True" />
+ </Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
@@ -58,7 +45,6 @@
<Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="118" column="1" />
<Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" line="546" column="1" />
<Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" line="86" column="1" />
- <Breakpoint file="/Users/jlchen/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" line="524" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index c678837..332b907 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -781,7 +781,7 @@
6081=Select IR brand
6082=Shaking
6083=Low speed
-6084=Medium speed
+6084=Wind Speed Switch
6085=High speed
6086=Auto
6087=Temperature+
@@ -822,6 +822,15 @@
7133=Executed
7134=Target State
7135=Tumble
+7136=Temperature
+7137=Humidity
+7138=PM2.5
+7139=CO2
+7140=TVOC
+7141=Exceeding
+7142=Serious
+7143=High
+7144=excellence
6000=Rename
@@ -1838,7 +1847,7 @@
6081=閫夋嫨绾㈠鍝佺墝
6082=鎽囧ご
6083=浣庨��
-6084=涓��
+6084=椋庨�熷垏鎹�
6085=楂橀��
6086=鑷姩
6087=娓╁害+
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 344e9b8..8bef956 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -781,7 +781,7 @@
6081=Select IR brand
6082=Shaking
6083=Low speed
-6084=Medium speed
+6084=Wind Speed Switch
6085=High speed
6086=Auto
6087=Temperature+
@@ -822,6 +822,15 @@
7133=Executed
7134=Target State
7135=Tumble
+7136=Temperature
+7137=Humidity
+7138=PM2.5
+7139=CO2
+7140=TVOC
+7141=Exceeding
+7142=Serious
+7143=High
+7144=excellence
6000=Rename
@@ -1838,7 +1847,7 @@
6081=閫夋嫨绾㈠鍝佺墝
6082=鎽囧ご
6083=浣庨��
-6084=涓��
+6084=椋庨�熷垏鎹�
6085=楂橀��
6086=鑷姩
6087=娓╁害+
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 5c93a96..3b2cf9b 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -1339,7 +1339,7 @@
public const int xuanzehongwaipinpai= 6081;
public const int yaotou = 6082;
public const int disu = 6083;
- public const int zhongsu = 6084;
+ public const int fengsuqiehuan = 6084;
public const int gaosu = 6085;
public const int zidong = 6086;
public const int wendujia = 6087;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
index ecd6e28..b59e237 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
@@ -323,9 +323,9 @@
value = "on";
}
break;
- case StringId.zhongsu:
+ case StringId.fengsuqiehuan:
{
- key = "middle";
+ key = "speed";
value = "";
}
break;
@@ -532,7 +532,7 @@
break;
case 2:
{
- textValue = StringId.zhongsu;
+ textValue = StringId.fengsuqiehuan;
}
break;
case 3:
--
Gitblit v1.8.0