From 197faa202beea7bc6723b24d3bc1de2d5fa48844 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 六月 2021 17:08:32 +0800
Subject: [PATCH] Merge branch 'wxr6' into temp-wxr
---
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIconOn.png | 0
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 4
HDL-ON_Android/Assets/Language.ini | 6
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIcon.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 13
HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs | 7
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIconOn.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIconOn.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIconOn.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIcon.png | 0
HDL-ON_Android/HDL-ON_Android.csproj | 15
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png | 0
HDL-ON_iOS/Resources/Language.ini | 6
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIcon.png | 0
HDL_ON/Common/OnAppConfig.cs | 5
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIcon.png | 0
HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs | 237 ++++++++++++++
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIconOn.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIconOn.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIcon.png | 0
HDL-ON_Android/Assets/Phone/Classification/Room/AllCloseIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIcon.png | 0
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 571 +++++++++++++++++++++++++----------
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIconOn.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/FanIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIconOn.png | 0
HDL-ON_iOS/Resources/Phone/Classification/Room/AllCloseIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIcon.png | 0
HDL_ON/Common/UserInfo.cs | 66 ++--
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 12
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/FanIcon.png | 0
HDL_ON/Common/R.cs | 12
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIcon.png | 0
36 files changed, 739 insertions(+), 215 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 7bb51b6..7a2d8de 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -463,6 +463,9 @@
474=Swing up and down
475=Swing left and right
476=Add residence
+477=Swing
+478=Pattern
+479=Air volume
1000=Room Humidity
1001=V-chip
@@ -1519,6 +1522,9 @@
474=涓婁笅鎵
475=宸﹀彸鎵
476=娣诲姞浣忓畢
+477=鎽嗗姩
+478=妯″紡
+479=椋庨噺
1000=瀹ゅ唴婀垮害
diff --git a/HDL-ON_Android/Assets/Phone/Classification/Room/AllCloseIcon2.png b/HDL-ON_Android/Assets/Phone/Classification/Room/AllCloseIcon2.png
new file mode 100644
index 0000000..bf7df5a
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/Classification/Room/AllCloseIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/FanIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/FanIcon.png
new file mode 100644
index 0000000..5ed6525
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/FanIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png
new file mode 100644
index 0000000..6839cb1
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png
new file mode 100644
index 0000000..2fbe4e2
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIcon.png
new file mode 100644
index 0000000..dbb0830
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIconOn.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIconOn.png
new file mode 100644
index 0000000..b663d9b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIconOn.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIcon.png
new file mode 100644
index 0000000..6cfa157
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIconOn.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIconOn.png
new file mode 100644
index 0000000..34bfbf2
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIconOn.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIcon.png
new file mode 100644
index 0000000..2a0fa78
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIconOn.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIconOn.png
new file mode 100644
index 0000000..e57e298
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIconOn.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIcon.png
new file mode 100644
index 0000000..177b58c
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIconOn.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIconOn.png
new file mode 100644
index 0000000..2ce5688
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIconOn.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 6f480ba..022f934 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -408,6 +408,18 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUD.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUDOn.png" />
<AndroidAsset Include="Assets\Phone\Public\ScanGrey.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\FanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\AllCloseIcon2.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" />
@@ -1295,6 +1307,9 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
+ </ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 97326f6..36a8f4e 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -450,6 +450,7 @@
<Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Resources\Phone\FunctionIcon\EnvirSensor\" />
<Folder Include="Resources\Phone\FunctionIcon\Energy\" />
+ <Folder Include="Resources\Phone\FunctionIcon\IrFan\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1291,6 +1292,18 @@
<BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconUD.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconUDOn.png" />
<BundleResource Include="Resources\Phone\Public\ScanGrey.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\FanIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PatternIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PatternIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PowerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PowerIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\TimingIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\TimingIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\SpeedIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\SpeedIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" />
+ <BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon2.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 7bb51b6..7a2d8de 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -463,6 +463,9 @@
474=Swing up and down
475=Swing left and right
476=Add residence
+477=Swing
+478=Pattern
+479=Air volume
1000=Room Humidity
1001=V-chip
@@ -1519,6 +1522,9 @@
474=涓婁笅鎵
475=宸﹀彸鎵
476=娣诲姞浣忓畢
+477=鎽嗗姩
+478=妯″紡
+479=椋庨噺
1000=瀹ゅ唴婀垮害
diff --git a/HDL-ON_iOS/Resources/Phone/Classification/Room/AllCloseIcon2.png b/HDL-ON_iOS/Resources/Phone/Classification/Room/AllCloseIcon2.png
new file mode 100644
index 0000000..bf7df5a
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/Classification/Room/AllCloseIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/FanIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/FanIcon.png
new file mode 100644
index 0000000..5ed6525
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/FanIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png
new file mode 100644
index 0000000..6839cb1
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png
new file mode 100644
index 0000000..2fbe4e2
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIcon.png
new file mode 100644
index 0000000..dbb0830
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIconOn.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIconOn.png
new file mode 100644
index 0000000..b663d9b
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIconOn.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIcon.png
new file mode 100644
index 0000000..6cfa157
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIconOn.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIconOn.png
new file mode 100644
index 0000000..34bfbf2
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIconOn.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIcon.png
new file mode 100644
index 0000000..2a0fa78
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIconOn.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIconOn.png
new file mode 100644
index 0000000..e57e298
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIconOn.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIcon.png
new file mode 100644
index 0000000..177b58c
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIconOn.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIconOn.png
new file mode 100644
index 0000000..2ce5688
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIconOn.png
Binary files differ
diff --git a/HDL_ON/Common/OnAppConfig.cs b/HDL_ON/Common/OnAppConfig.cs
index 496bf7a..99a7de5 100644
--- a/HDL_ON/Common/OnAppConfig.cs
+++ b/HDL_ON/Common/OnAppConfig.cs
@@ -46,6 +46,11 @@
public string SetLanguage = "";
/// <summary>
+ /// 鍒嗙被鐣岄潰鏄惁鏄剧ず澶у浘
+ /// </summary>
+ public bool IsShowBigPicture = true;
+
+ /// <summary>
/// 鏈�鍚庝竴浣嶇櫥褰曠殑璐﹀彿鐨処D
/// </summary>
public string LastLoginUserId = "";
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 0a0eb53..6dde3d0 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,18 @@
public static class StringId
{
/// <summary>
+ /// 椋庨噺
+ /// </summary>
+ public const int AirVolume = 479;
+ /// <summary>
+ /// 鎽嗗姩
+ /// </summary>
+ public const int Pattern = 478;
+ /// <summary>
+ /// 鎽嗗姩
+ /// </summary>
+ public const int HeadSwinging = 477;
+ /// <summary>
/// 娣诲姞浣忓畢
/// </summary>
public const int AddResidence = 476;
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index a242194..1c49f51 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -23,41 +23,41 @@
{
get
{
+ //Dome妯″紡
+ if (MainPage.NoLoginMode)
+ {
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ m_Current = new UserInfo()
+ {
+ ID = "浣撻獙璐﹀彿1234567890",
+ userName = "浣撻獙璐﹀彿",
+ AccountString = "浣撻獙璐﹀彿",
+ userMobileInfo = "浣撻獙璐﹀彿",
+ userEmailInfo = "浣撻獙璐﹀彿",
+ language = "Chinese",
+ areaCode = "86",
+ headImagePagePath = "LoginIcon/2.png",
+ };
+ }
+ else
+ {
+ m_Current = new UserInfo()
+ {
+ ID = "1234567890",
+ userName = "Trial account",
+ AccountString = "Trial account",
+ userMobileInfo = "Trial account",
+ userEmailInfo = "Trial account",
+ language = "English",
+ areaCode = "86",
+ headImagePagePath = "LoginIcon/2.png",
+ };
+ }
+ return m_Current;
+ }
if (m_Current == null)
{
- //Dome妯″紡
- if (MainPage.NoLoginMode)
- {
- if (Language.CurrentLanguage == "Chinese")
- {
- m_Current = new UserInfo()
- {
- ID = "浣撻獙璐﹀彿1234567890",
- userName = "浣撻獙璐﹀彿",
- AccountString = "浣撻獙璐﹀彿",
- userMobileInfo = "浣撻獙璐﹀彿",
- userEmailInfo = "浣撻獙璐﹀彿",
- language = "Chinese",
- areaCode = "86",
- headImagePagePath = "LoginIcon/2.png",
- };
- }
- else
- {
- m_Current = new UserInfo()
- {
- ID = "1234567890",
- userName = "Trial account",
- AccountString = "Trial account",
- userMobileInfo = "Trial account",
- userEmailInfo = "Trial account",
- language = "English",
- areaCode = "86",
- headImagePagePath = "LoginIcon/2.png",
- };
- }
- return m_Current;
- }
try
{
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 82d5d2b..0f50349 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -152,6 +152,10 @@
var clothesHangerpage = new ClothesHangerPage();
clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.FanIr:
+ var fanIr = new IrFanPage();
+ fanIr.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
case SPK.AcIr:
case SPK.AcStandard:
var acPage = new AcControlPage();
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 2f3552a..214f4d8 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -184,16 +184,22 @@
/// <summary>
/// 鏄剧ず鏂瑰紡鍒囨崲鎸夐挳
/// </summary>
- //btnSwitchDipaly = new Button()
- //{
- // X = Application.GetRealWidth(335),
- // Y = Application.GetRealHeight(12),
- // Width = Application.GetMinRealAverage(28),
- // Height = Application.GetMinRealAverage(28),
- // UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缂╃暐鍥�
- // SelectedImagePath = "Classification/ToggleDisplayLarge.png",
- //};
- //roomFloorChangeView.AddChidren(btnSwitchDipaly);
+ btnSwitchDipaly = new Button()
+ {
+ X = Application.GetRealWidth(335),
+ Y = Application.GetRealHeight(12),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缂╃暐鍥�
+ SelectedImagePath = "Classification/ToggleDisplayLarge.png",
+ IsSelected = OnAppConfig.Instance.IsShowBigPicture
+ };
+ roomFloorChangeView.AddChidren(btnSwitchDipaly);
+ btnSwitchDipaly.MouseUpEventHandler = (sender, e) => {
+ OnAppConfig.Instance.IsShowBigPicture = !OnAppConfig.Instance.IsShowBigPicture;
+ btnSwitchDipaly.IsSelected = OnAppConfig.Instance.IsShowBigPicture;
+ LoadRoomRows(true);
+ };
#endregion
/// <summary>
@@ -216,181 +222,406 @@
/// <summary>
/// 鍔犺浇鎴块棿鍒楄〃鍖哄煙
/// </summary>
- void LoadRoomRows()
+ /// <param name="animationEffect">鍔ㄧ敾鏁堟灉</param>
+ void LoadRoomRows(bool animationEffect = false)
{
- roomListView.RemoveAll();
- foreach (var room in roomsShowed)
+ if (animationEffect)
{
- var roomView = new FrameLayout()
+ ///绉诲姩鏂瑰悜
+ var runDirection = OnAppConfig.Instance.IsShowBigPicture ? 1 : -1;
+ for (int i = 0; i < roomListView.ChildrenCount; i++)
{
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
- Radius = (uint)Application.GetRealWidth(12),
- Tag = room.roomId,
- };
- roomListView.AddChidren(roomView);
+ var childView = roomListView.GetChildren(i);
- var roomViewbg = new ImageView()
- {
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
- //ImagePath = room.backgroundImage,
- Radius = (uint)Application.GetRealWidth(12),
- };
- roomView.AddChidren(roomViewbg);
-
- //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
- ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
-
- var roomViewbgColor = new Button()
- {
- Radius = (uint)Application.GetRealWidth(12),
- BackgroundColor = 0x19333333,
- };
- roomView.AddChidren(roomViewbgColor);
-
- var btnFloorAndRoomName = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(12 - 2),
- Width = Application.GetRealWidth(266),
- Height = Application.GetRealHeight(22 + 2 + 2),
- Text = room.floorName + room.roomName,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- };
- roomView.AddChidren(btnFloorAndRoomName);
-
- #region 鐜鏁版嵁
- //var environmentalView = new FrameLayout()
- //{
- // Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
- // Height = Application.GetRealHeight(32),
- // Tag = "EnvironmentalView",
- //};
- //roomView.AddChidren(environmentalView);
-
- //Button btnTempIcon = new Button()
- //{
- // X = Application.GetRealWidth(12),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
- //};
- //environmentalView.AddChidren(btnTempIcon);
-
- //var btnTempValues = new Button()
- //{
- // X = btnTempIcon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--掳",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "TempValues"
- //};
- //environmentalView.AddChidren(btnTempValues);
-
- //Button btnHumidityIcon = new Button()
- //{
- // X = btnTempValues.Right + Application.GetRealWidth(2),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
- //};
- //environmentalView.AddChidren(btnHumidityIcon);
-
- //var btnHumidityValues = new Button()
- //{
- // X = btnHumidityIcon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--%",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "HumidityValues"
- //};
- //environmentalView.AddChidren(btnHumidityValues);
-
- //Button btnPm25Icon = new Button()
- //{
- // X = btnHumidityValues.Right + Application.GetRealWidth(2),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
- //};
- //environmentalView.AddChidren(btnPm25Icon);
-
- //var btnPm25Values = new Button()
- //{
- // X = btnPm25Icon.Right + Application.GetRealWidth(4),
- // Width = Application.GetRealWidth(30),
- // Gravity = Gravity.CenterVertical,
- // TextColor = CSS_Color.MainBackgroundColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = "--",
- // TextAlignment = TextAlignment.CenterLeft,
- // Tag = "Pm25Values"
- //};
- //environmentalView.AddChidren(btnPm25Values);
- //roomView.AddChidren(environmentalView);
- #endregion
- var btnAllClose = new Button()
- {
- X = Application.GetRealWidth(282),
- Y = Application.GetRealWidth(126),
- Width = Application.GetMinRealAverage(58),
- Height = Application.GetMinRealAverage(58),
- UnSelectedImagePath = "Classification/Room/AllCloseIcon.png",
- Tag = "AllClose",
- Visible = false
- };
- roomView.AddChidren(btnAllClose);
- LoadEvent_CloseAllFunction(btnAllClose, room);
-
- var btn = new Button()
- {
- Height = Application.GetRealWidth(20),
- };
- roomListView.AddChidren(btn);
-
- roomViewbgColor.MouseUpEventHandler += (sender, e) =>
- {
- Action ReloadRoomName = () =>
+ if (childView.GetType() == typeof(FrameLayout))
{
- btnFloorAndRoomName.Text = room.floorName + room.roomName;
- };
+ var roomView = childView as FrameLayout;
- //鎴块棿鍒犻櫎浜嬩欢
- Action deleteAction = () =>
+ //澶у浘鏄剧ず
+ if (OnAppConfig.Instance.IsShowBigPicture)
+ {
+ LoadBigPirtureRoomRow(roomView, roomsShowed[i/2]);
+ }
+ else//鏃犲浘鏄剧ず
+ {
+ LoadSmallPirtureRoomRow(roomView, roomsShowed[i/2]);
+ }
+ }
+
+
+ new System.Threading.Thread(() =>
{
- roomView.RemoveFromParent();
- };
+ //闇�瑕佺Щ鍔ㄧ殑楂樺害
+ var runHeight = Application.GetRealWidth(i / 2 * 142);
- //鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�
- Action modifyImageAction = () =>
+ int runCount = 0;
+ //寰幆娆℃暟锛屽姩鐢绘晥鏋滈渶瑕佸湪1绉� 锛�10娆★級鍐呭畬鎴�
+ while (runCount == 9)
+ {
+ System.Threading.Thread.Sleep(100);
+ Application.RunOnMainThread(() =>
+ {
+ if (childView.GetType() == typeof(FrameLayout))
+ {
+ childView.Height += Application.GetRealWidth(14) * runDirection;
+ }
+ if (i > 0)
+ {
+ childView.Y += runDirection * Application.GetRealWidth(14 * i / 2);
+ }
+ });
+ runCount++;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ childView.Y += runHeight * runDirection;
+
+ if (childView.GetType() == typeof(FrameLayout))
+ {
+ if (runDirection == 1)
+ {
+ childView.Height = Application.GetRealWidth(192);
+ }
+ else
+ {
+ childView.Height = Application.GetRealWidth(70);
+ }
+ }
+ });
+ })
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+
+ //if (childView.GetType() == typeof(Button))
+ //{
+ // new System.Threading.Thread(() => {
+ // //寰幆娆℃暟锛屽姩鐢绘晥鏋滈渶瑕佸湪1绉� 锛�10娆★級鍐呭畬鎴�
+ // int runCount = 9;
+ // //闇�瑕佺Щ鍔ㄧ殑楂樺害
+ // var runHeight = i / 2 * Application.GetRealWidth(142);
+
+ // while (runCount == 0)
+ // {
+ // System.Threading.Thread.Sleep(100);
+ // Application.RunOnMainThread(() =>
+ // {
+ // childView.Height += Application.GetRealWidth(14) * runDirection;
+ // });
+ // }
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (runDirection == 1)
+ // {
+ // childView.Height = Application.GetRealWidth(192 + 20);
+ // }
+ // else
+ // {
+ // childView.Height = Application.GetRealWidth(70 + 20);
+ // }
+ // });
+ // })
+ // { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+ //}
+
+ }
+ }
+ else
+ {
+ roomListView.RemoveAll();
+ foreach (var room in roomsShowed)
+ {
+ //澶у浘鏄剧ず
+ if (OnAppConfig.Instance.IsShowBigPicture)
{
- //roomViewbg.ImagePath = room.backgroundImage;
- ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
- };
+ roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.MainBackgroundColor;
+ var roomView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealWidth(192 + 20),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
+ Radius = (uint)Application.GetRealWidth(12),
+ Tag = room.roomId,
+ };
+ roomListView.AddChidren(roomView);
- var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
- MainPage.BasePageView.AddChidren(view);
- view.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ LoadBigPirtureRoomRow(roomView, room);
+ }
+ else//鏃犲浘鏄剧ず
+ {
+ roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.BackgroundColor;
+ var roomView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealWidth(70 + 20),
+ Radius = (uint)Application.GetRealWidth(12),
+ Tag = room.roomId,
+ BackgroundColor = CSS_Color.BackgroundColor,
+ };
+ roomListView.AddChidren(roomView);
+ LoadSmallPirtureRoomRow(roomView, room);
+ }
+ }
}
}
/// <summary>
+ /// 鍔犺浇澶у浘鎴块棿row
+ /// </summary>
+ /// <param name="roomView"></param>
+ /// <param name="room"></param>
+ void LoadBigPirtureRoomRow(FrameLayout roomView, Room room)
+ {
+ roomView.RemoveAll();
+ roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.MainBackgroundColor;
+
+ var roomViewbg = new ImageView()
+ {
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
+ Radius = (uint)Application.GetRealWidth(12),
+ };
+ roomView.AddChidren(roomViewbg);
+
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+
+ var btnFloorAndRoomName = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(12 - 2),
+ Width = Application.GetRealWidth(266),
+ Height = Application.GetRealHeight(22 + 2 + 2),
+ Text = room.floorName + room.roomName,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ };
+ roomView.AddChidren(btnFloorAndRoomName);
+
+ #region 鐜鏁版嵁
+ //var environmentalView = new FrameLayout()
+ //{
+ // Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
+ // Height = Application.GetRealHeight(32),
+ // Tag = "EnvironmentalView",
+ //};
+ //roomView.AddChidren(environmentalView);
+
+ //Button btnTempIcon = new Button()
+ //{
+ // X = Application.GetRealWidth(12),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
+ //};
+ //environmentalView.AddChidren(btnTempIcon);
+
+ //var btnTempValues = new Button()
+ //{
+ // X = btnTempIcon.Right + Application.GetRealWidth(4),
+ // Width = Application.GetRealWidth(30),
+ // Gravity = Gravity.CenterVertical,
+ // TextColor = CSS_Color.MainBackgroundColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // Text = "--掳",
+ // TextAlignment = TextAlignment.CenterLeft,
+ // Tag = "TempValues"
+ //};
+ //environmentalView.AddChidren(btnTempValues);
+
+ //Button btnHumidityIcon = new Button()
+ //{
+ // X = btnTempValues.Right + Application.GetRealWidth(2),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
+ //};
+ //environmentalView.AddChidren(btnHumidityIcon);
+
+ //var btnHumidityValues = new Button()
+ //{
+ // X = btnHumidityIcon.Right + Application.GetRealWidth(4),
+ // Width = Application.GetRealWidth(30),
+ // Gravity = Gravity.CenterVertical,
+ // TextColor = CSS_Color.MainBackgroundColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // Text = "--%",
+ // TextAlignment = TextAlignment.CenterLeft,
+ // Tag = "HumidityValues"
+ //};
+ //environmentalView.AddChidren(btnHumidityValues);
+
+ //Button btnPm25Icon = new Button()
+ //{
+ // X = btnHumidityValues.Right + Application.GetRealWidth(2),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
+ //};
+ //environmentalView.AddChidren(btnPm25Icon);
+
+ //var btnPm25Values = new Button()
+ //{
+ // X = btnPm25Icon.Right + Application.GetRealWidth(4),
+ // Width = Application.GetRealWidth(30),
+ // Gravity = Gravity.CenterVertical,
+ // TextColor = CSS_Color.MainBackgroundColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // Text = "--",
+ // TextAlignment = TextAlignment.CenterLeft,
+ // Tag = "Pm25Values"
+ //};
+ //environmentalView.AddChidren(btnPm25Values);
+ //roomView.AddChidren(environmentalView);
+ #endregion
+
+ var roomViewbgColor = new Button()
+ {
+ Radius = (uint)Application.GetRealWidth(12),
+ BackgroundColor = 0x19333333,
+ };
+ roomView.AddChidren(roomViewbgColor);
+
+ var btnAllClose = new Button()
+ {
+ X = Application.GetRealWidth(282),
+ Y = Application.GetRealWidth(126),
+ Width = Application.GetMinRealAverage(48),
+ Height = Application.GetMinRealAverage(48),
+ UnSelectedImagePath = "Classification/Room/AllCloseIcon.png",
+ Tag = "AllClose",
+ Visible = false
+ };
+ roomView.AddChidren(btnAllClose);
+ LoadEvent_CloseAllFunction(btnAllClose, room);
+
+ var btn = new Button()
+ {
+ Y = Application.GetRealWidth(192),
+ Height = Application.GetRealWidth(20),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ roomView.AddChidren(btn);
+
+ roomViewbgColor.MouseUpEventHandler += (sender, e) =>
+ {
+ Action ReloadRoomName = () =>
+ {
+ btnFloorAndRoomName.Text = room.floorName + room.roomName;
+ };
+
+ //鎴块棿鍒犻櫎浜嬩欢
+ Action deleteAction = () =>
+ {
+ roomView.RemoveFromParent();
+ };
+
+ //鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�
+ Action modifyImageAction = () =>
+ {
+ //roomViewbg.ImagePath = room.backgroundImage;
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
+ MainPage.BasePageView.AddChidren(view);
+ view.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+ /// <summary>
+ /// 璁拌浇灏忓浘鎴块棿row
+ /// </summary>
+ void LoadSmallPirtureRoomRow(FrameLayout roomView, Room room)
+ {
+ roomView.RemoveAll();
+ roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.BackgroundColor;
+
+ var btnRoomName = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(12 - 2),
+ Width = Application.GetRealWidth(266),
+ Height = Application.GetRealHeight(52),
+ Text = room.roomName,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ };
+ roomView.AddChidren(btnRoomName);
+
+ var btnFloorName = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(42),
+ Width = Application.GetRealWidth(266),
+ Height = Application.GetRealHeight(46),
+ Text = room.floorName,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
+ };
+ roomView.AddChidren(btnFloorName);
+
+ var roomViewbg = new ImageView()
+ {
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealWidth(70),
+ Radius = (uint)Application.GetRealWidth(12),
+ };
+ roomView.AddChidren(roomViewbg);
+
+ var btnAllClose = new Button()
+ {
+ X = Application.GetRealWidth(288),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(58),
+ Height = Application.GetMinRealAverage(58),
+ UnSelectedImagePath = "Classification/Room/AllCloseIcon2.png",
+ Tag = "AllClose",
+ Visible = false
+ };
+ roomView.AddChidren(btnAllClose);
+ LoadEvent_CloseAllFunction(btnAllClose, room);
+
+ var btn = new Button()
+ {
+ Y = Application.GetRealWidth(70),
+ Height = Application.GetRealWidth(20),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ roomView.AddChidren(btn);
+
+ roomViewbg.MouseUpEventHandler += (sender, e) =>
+ {
+ Action ReloadRoomName = () =>
+ {
+ btnFloorName.Text = room.floorName;
+ btnRoomName.Text = room.roomName;
+ };
+
+ //鎴块棿鍒犻櫎浜嬩欢
+ Action deleteAction = () =>
+ {
+ roomView.RemoveFromParent();
+ };
+ Action action = () =>
+ {
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction, action);
+ MainPage.BasePageView.AddChidren(view);
+ view.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+
+
+ /// <summary>
/// 鍔犺浇鍔熻兘鍒楄〃鐣岄潰
/// </summary>
void LoadFunctionPageView()
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 6af040c..c21a787 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -237,16 +237,18 @@
//浣撻獙妯″紡
if(MainPage.NoLoginMode)
{
-
Button btnExit = new Button()
{
- Y = Application.GetRealHeight(58) + personalInfoView.Bottom,
- Height = Application.GetRealHeight(50),
+ Y = Application.GetRealHeight(258) + personalInfoView.Bottom,
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(60),
+ Width = Application.GetRealWidth(330),
TextAlignment = TextAlignment.Center,
SelectedTextColor = CSS_Color.MainColor,
- TextColor = CSS_Color.BackgroundColor,
+ TextColor = CSS_Color.WarningColor,
TextSize = CSS_FontSize.SubheadingFontSize,
TextID = StringId.NextStep,
+ Radius = 10,
BackgroundColor = CSS_Color.MainBackgroundColor,
SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -262,7 +264,7 @@
{
HDLCommon.Current.Logout();
};
-
+ bodyView.AddChidren(btnExit);
return;
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
index d701f51..190b378 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
@@ -451,15 +451,16 @@
/// </summary>
public bool Lighting = false;
- public ClothesHangerControl(string iconPath1, string iconPath2, string title, string time)
+
+ public ClothesHangerControl(string unSelectedIconPath, string selectedIconPath, string title, string time)
{
btnIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(28),
Height = Application.GetRealWidth(28),
- UnSelectedImagePath = iconPath1,
- SelectedImagePath = iconPath2,
+ UnSelectedImagePath = unSelectedIconPath,
+ SelectedImagePath = selectedIconPath,
};
this.AddChidren(btnIcon);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
index ab85ff9..535912c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
@@ -1,10 +1,239 @@
锘縰sing System;
-namespace HDL_ON.UI.UI2.FuntionControlView.Electrical
+using System.Collections.Generic;
+using HDL_ON.DriverLayer;
+using HDL_ON.Entity;
+using HDL_ON.Stan;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
{
- public class IrFanPage
+ public class IrFanPage : DeviceFunctionCardCommonForm
{
- public IrFanPage()
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍥炬爣
+ /// </summary>
+ private Button btnIcon = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鍒濆鍖栫櫧鑹插尯鍩熺殑鍐呭
+ /// </summary>
+ public override void InitFrameWhiteContent()
+ {
+ base.ShowColltionButton = false;
+ base.SetTitleText(Language.StringByID(StringId.Electric));
+
+ //鍒濆鍖栫涓�涓储寮曢〉鐨勫唴瀹�
+ this.InitFrameWhiteContent1();
+ ;
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栫涓�涓储寮曢〉鐨勫唴瀹�
+ /// </summary>
+ private void InitFrameWhiteContent1()
+ {
+ btnIcon = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(88),
+ Width = Application.GetRealWidth(134),
+ Height = Application.GetRealHeight(134),
+ UnSelectedImagePath = "FunctionIcon/IrFan/FanIcon.png",
+ };
+ FrameWhiteCentet1.AddChidren(btnIcon);
+
+ var patternView = new IrFanControl("FunctionIcon/IrFan/PatternIcon.png",
+ "FunctionIcon/IrFan/PatternIconOn.png",
+ Language.StringByID(StringId.Mode),
+ "");
+ patternView.Y = Application.GetRealHeight(263);
+ patternView.X = Application.GetRealWidth(57);
+ patternView.Width = Application.GetRealWidth(96);
+ patternView.Height = Application.GetRealHeight(74);
+ FrameWhiteCentet1.AddChidren(patternView);
+ EventHandler<MouseEventArgs> mode_EventHandler = (sender, e) =>
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("mode", "");
+ Control.Ins.SendWriteCommand(device, d);
+ };
+ patternView.SetThouchEvent(mode_EventHandler);
+
+ var swingView = new IrFanControl("FunctionIcon/IrFan/HeadSwingingIcon.png",
+ "FunctionIcon/IrFan/HeadSwingingIconOn.png",
+ Language.StringByID(StringId.HeadSwinging),
+ "");
+ swingView.Y = Application.GetRealHeight(263);
+ swingView.X = Application.GetRealWidth(216);
+ swingView.Width = Application.GetRealWidth(96);
+ swingView.Height = Application.GetRealHeight(74);
+ FrameWhiteCentet1.AddChidren(swingView);
+ EventHandler<MouseEventArgs> swing_EventHandler = (sender, e) =>
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("swing", "");
+ Control.Ins.SendWriteCommand(device, d);
+ };
+ swingView.SetThouchEvent(swing_EventHandler);
+
+
+ var timingView = new IrFanControl("FunctionIcon/IrFan/TimingIcon.png",
+ "FunctionIcon/IrFan/TimingIconOn.png",
+ Language.StringByID(StringId.Timing),
+ "");
+ timingView.Y = Application.GetRealHeight(366);
+ timingView.X = Application.GetRealWidth(57);
+ timingView.Width = Application.GetRealWidth(96);
+ timingView.Height = Application.GetRealHeight(74);
+ FrameWhiteCentet1.AddChidren(timingView);
+ EventHandler<MouseEventArgs> timing_EventHandler = (sender, e) =>
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("timer", "");
+ Control.Ins.SendWriteCommand(device, d);
+ };
+ timingView.SetThouchEvent(timing_EventHandler);
+
+
+ var airVolumeView = new IrFanControl("FunctionIcon/IrFan/SpeedIcon.png",
+ "FunctionIcon/IrFan/SpeedIconOn.png",
+ Language.StringByID(StringId.AirVolume),
+ "");
+ airVolumeView.Y = Application.GetRealHeight(263);
+ airVolumeView.X = Application.GetRealWidth(216);
+ airVolumeView.Width = Application.GetRealWidth(96);
+ airVolumeView.Height = Application.GetRealHeight(74);
+ FrameWhiteCentet1.AddChidren(airVolumeView);
+ EventHandler<MouseEventArgs> speed_EventHandler = (sender, e) =>
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("speed", "");
+ Control.Ins.SendWriteCommand(device, d);
+ };
+ airVolumeView.SetThouchEvent(speed_EventHandler);
+
+ Button btnPower = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(468),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ UnSelectedImagePath = "FunctionIcon/IrFan/PowerIcon.png",
+ SelectedImagePath = "FunctionIcon/IrFan/PowerIconOn.png"
+ };
+ FrameWhiteCentet1.AddChidren(btnPower);
+ btnPower.MouseDownEventHandler = (sender, e) =>
+ {
+ btnPower.IsSelected = true;
+ };
+ btnPower.MouseUpEventHandler = (sender, e) => {
+ new System.Threading.Thread(() => {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, "");
+ Control.Ins.SendWriteCommand(device, d);
+ System.Threading.Thread.Sleep(500);
+ Application.RunOnMainThread(() => {
+ btnPower.IsSelected = false;
+ });
+ }) { IsBackground = true }.Start();
+ };
+
+
+ }
+ #endregion
+
+ #region 鈻� 璁惧鐘舵�佸弽棣坃______________________
+
+ /// <summary>
+ /// 璁惧鐘舵�佸弽棣�
+ /// </summary>
+ /// <param name="i_LocalDevice"></param>
+ public override void DeviceStatuPush(Function i_LocalDevice)
{
}
+
+ #endregion
}
-}
+
+ public class IrFanControl : FrameLayout
+ {
+ private Button btnIcon;
+ private Button btnTitle;
+
+ public bool Lighting = false;
+
+
+ public IrFanControl(string unSelectedIconPath, string selectedIconPath, string title, string time)
+ {
+ btnIcon = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
+ UnSelectedImagePath = unSelectedIconPath,
+ SelectedImagePath = selectedIconPath,
+ };
+ this.AddChidren(btnIcon);
+
+ btnTitle = new Button()
+ {
+ Gravity = Gravity.Center,
+ Text = title,
+ Height = Application.GetRealHeight(42),
+ TextColor = CSS_Color.TextualColor,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ };
+ this.AddChidren(btnTitle);
+
+ }
+
+ public void SetViewStatus(bool state)
+ {
+ btnIcon.IsSelected = btnTitle.IsSelected = Lighting = state;
+ }
+
+ /// <summary>
+ /// 璁剧疆鐐瑰嚮浜嬩欢
+ /// </summary>
+ public void SetThouchEvent(EventHandler<MouseEventArgs> eventHandler)
+ {
+ btnIcon.MouseUpEventHandler = eventHandler;
+ btnTitle.MouseUpEventHandler = eventHandler;
+ btnIcon.MouseDownEventHandler = (sender, e) => {
+ btnIcon.IsSelected = true;
+ };
+ btnTitle.MouseDownEventHandler = (sender, e) => {
+ btnIcon.IsSelected = true;
+ };
+ btnIcon.MouseUpEventHandler += (sender, e) => {
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(500);
+ Application.RunOnMainThread(() =>
+ {
+ btnIcon.IsSelected = true;
+ });
+ })
+ { IsBackground = true }.Start();
+ };
+ btnTitle.MouseUpEventHandler += (sender, e) => {
+ new System.Threading.Thread(() => {
+ System.Threading.Thread.Sleep(500);
+ Application.RunOnMainThread(() =>
+ {
+ btnIcon.IsSelected = true;
+ });
+ })
+ { IsBackground = true }.Start();
+ };
+
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0