From 3cebdfad56d78ba04a214fccd1b942a010aeba77 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期五, 26 三月 2021 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 4874520..2fee51d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.Stan;
@@ -408,9 +409,9 @@
TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnFanText);
- btnFanIcon.UnSelectedImagePath = acFunction.GetModeIconPath(m,false);
- btnFanIcon.SelectedImagePath = acFunction.GetModeIconPath(m);
- btnFanText.Text = acFunction.GetModeAttrText(m);
+ btnFanIcon.UnSelectedImagePath = acFunction.GetFanIconPath(m,false);
+ btnFanIcon.SelectedImagePath = acFunction.GetFanIconPath(m);
+ btnFanText.Text = acFunction.GetFanAttrText(m);
if (modeList.IndexOf(m) < modeList.Count - 1)
{
@@ -490,13 +491,14 @@
};
div.AddChidren(bodyView);
- var contentView = new FrameLayout()
+ var contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(16),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(296),
};
bodyView.AddChidren(contentView);
+
var row = new FrameLayout()
{
@@ -505,7 +507,14 @@
contentView.AddChidren(row);
int index = 0;
- foreach (var attr in device.attributes)
+ List<FunctionAttributes> attrList = new List<FunctionAttributes>();
+ attrList.AddRange(device.attributes);
+ attrList.Add(new FunctionAttributes() {
+ key = "+",
+ });
+
+
+ foreach (var attr in attrList)
{
if (attr.key == FunctionAttributeKey.Mode
|| attr.key == FunctionAttributeKey.OnOff
@@ -522,13 +531,57 @@
{
row = new FrameLayout()
{
- Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(56),
};
contentView.AddChidren(row);
}
+ if (attr.key == "+")
+ {
+ var addView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(88),
+ Height = Application.GetRealHeight(40),
+ Radius = (uint)Application.GetRealHeight(18),
+ BorderColor = CSS_Color.PromptingColor1,
+ BorderWidth = (uint)Application.GetRealWidth(2),
+ };
- var btn = new Button()
+
+ if (index % 3 == 1)
+ {
+ addView.Gravity = Gravity.Center;
+ }
+ else if (index % 3 == 2)
+ {
+ addView.X = Application.GetRealWidth(208);
+ }
+ row.AddChidren(addView);
+
+ var btnAdd = new Button()
+ {
+ Gravity = Gravity.Center,
+ UnSelectedImagePath = "Public/PlusSignIcon.png",
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ };
+ addView.AddChidren(btnAdd);
+
+ btnAdd.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ var addButton = new AcControlPage_AddIrButton();
+ MainPage.BasePageView.AddChidren(addButton);
+ addButton.Show(device);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+
+
+ }
+ else
+ {
+
+ var btn = new Button()
{
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth(88),
@@ -573,7 +626,7 @@
{ IsBackground = true }.Start();
};
-
+ }
index++;
}
@@ -666,6 +719,14 @@
device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
btnTemp.Text = e.ToString();
};
+ arcBar.MouseDownEventHandler = (sender, e) => {
+ Console.WriteLine("ddd");
+ MainPage.BasePageView.ScrollEnabled =false;
+ };
+ arcBar.MouseUpEventHandler = (sender, e) => {
+ Console.WriteLine("ddd2");
+ MainPage.BasePageView.ScrollEnabled = true;
+ };
}
/// <summary>
/// 鎺у埗妯″紡浜嬩欢
@@ -723,7 +784,7 @@
Application.RunOnMainThread(() =>
{
btnTemp.Text = device.GetAttrState(FunctionAttributeKey.SetTemp);
- btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.IndoorTemp))) + "掳C";
+ btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp))) + "掳C";
btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
arcBar.Progress = Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp)));
--
Gitblit v1.8.0