From 47afa19e3761143d2c96131d7dcc38e8f67bb299 Mon Sep 17 00:00:00 2001
From: 温居城 <wenjucheng@wenjuchengdeMacBook-Pro.local>
Date: 星期四, 18 十一月 2021 22:45:52 +0800
Subject: [PATCH] 2021-11-18-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 2
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 12 +++---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 45 ++++++++--------------
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 1
HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs | 6 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs | 6 +-
6 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 725fb6e..5d63142 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,43 +1,32 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008101-001D2D8A363A001E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs">
<Files>
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="87" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="1142" Column="38" />
- <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="880" Column="6" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1575" Column="25" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="832" Column="30" />
- <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="224" Column="50" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="79" Column="30" />
<File FileName="HDL_ON/UI/MainPage.cs" Line="111" Column="27" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="312" Column="10" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs" Line="70" Column="65" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs" Line="171" Column="44" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs" Line="1054" Column="23" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="506" Column="61" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="93" Column="61" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs" Line="5" Column="18" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs" Line="5" Column="18" />
</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>
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- </Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True" />
+ </Node>
</Node>
- <Node name="MainPage.cs" selected="True" />
</Node>
</Node>
- <Node name="HDL-ON_iOS" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True" selected="True" />
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>this.Height</Value>
</State>
</Pad>
</Pads>
@@ -48,11 +37,11 @@
<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" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1415" column="1" />
+ <Breakpoint file="/Users/wenjucheng/Desktop/wjc/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1415" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 1c15401..d6d5c43 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -297,7 +297,7 @@
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
+ }, strname, Language.StringByID(StringId.save), true, latitude, longitude, r);
#endif
});
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs
index 5734dfa..92d1584 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs
@@ -57,17 +57,17 @@
if (text == Language.StringByID(StringId.kongqiyou))
{
//浼�
- value = "excellent";
+ value = "Excellent";
}
else if (text == Language.StringByID(StringId.kongqiliang))
{
//鑹�
- value = "good";
+ value = "Good";
}
else if (text == Language.StringByID(StringId.kongqicha))
{
//宸�
- value = "poor";
+ value = "Poor";
}
AddDic(value);
};
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index f616e2c..e6fc71d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -490,20 +490,20 @@
strtext = Language.StringByID(StringId.tianqibianhua);
switch (value)
{
- case "sunny":
+ case "Sunny":
{
strtext = Language.StringByID(StringId.clearday);
}
break;
- case "cloudy":
+ case "Cloudy":
{
strtext = Language.StringByID(StringId.cloudy);
}
break;
- case "rainy":
+ case "Rain":
{
strtext = Language.StringByID(StringId.rain);
}
@@ -518,20 +518,20 @@
strtext = Language.StringByID(StringId.kongqizhiliang);
switch (value)
{
- case "excellent":
+ case "Excellent":
{
strtext = Language.StringByID(StringId.kongqiyou);
}
break;
- case "good":
+ case "Good":
{
strtext = Language.StringByID(StringId.kongqiliang);
}
break;
- case "poor":
+ case "Poor":
{
strtext = Language.StringByID(StringId.kongqicha);
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index e6f0701..4e8a634 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -90,6 +90,7 @@
brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
brightnessView.btnText.TextID = StringId.brightnesLogic;
fLayout.AddChidren(brightnessView.FLayoutView());
+ brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
index 1c7ba43..1c683eb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
@@ -56,15 +56,15 @@
string text = view.btnClick.Tag.ToString();
if (text == Language.StringByID(StringId.clearday))
{
- value = "sunny";
+ value = "Sunny";
}
else if (text == Language.StringByID(StringId.cloudy))
{
- value = "cloudy";
+ value = "Cloudy";
}
else if (text == Language.StringByID(StringId.rain))
{
- value = "rainy";
+ value = "Rain";
}
AddDic(value);
};
--
Gitblit v1.8.0