From 10b78a1626106f18a6b2f68bd2b8cafd2a99683c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 12 八月 2020 11:31:59 +0800
Subject: [PATCH] 2020-08-12 4.喜爱页面，增加房间场景添加支持。 5.Alexa,添加设备页面增加修改备注功能，点击OK后，增加设备备注名字不匹配然后自动更新操作。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs | 124 +++++++++++++++++++++-------------------
1 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
index 4b5e0a5..1fa0179 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
@@ -59,11 +59,13 @@
if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Voltage" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Voltage") {
btn.Text = energy.ToString () + " W";
}
- } else if (updataType == 11) {
- if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Electric" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Electric") {
- btn.Text = ((double)(Convert.ToDouble (energy) / 10)).ToString () + " kw.h";
- }
}
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //else if (updataType == 11) {
+ // if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Electric" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Electric") {
+ // btn.Text = ((double)(Convert.ToDouble (energy) / 10)).ToString () + " kw.h";
+ // }
+ //}
}
}
}
@@ -214,7 +216,7 @@
}
});
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
//Application.RunOnMainThread (() => {
// MainPage.Loading.Hide ();
@@ -230,7 +232,7 @@
{
foreach (var thread in UserMiddle.updateSensorhreadList) {
thread.Abort ();
- Console.WriteLine ("abortThread");
+ Utlis.WriteLine ("abortThread");
}
UserMiddle.updateSensorhreadList.Clear ();
EnergtLightList.Clear ();
@@ -478,7 +480,7 @@
System.IO.FileInfo fileInfo = new System.IO.FileInfo (IO.FileUtils.RootPath + fileName);
if (fileInfo.Exists) {
fileInfo.MoveTo (oldRegionRootPath + fileName);
- Console.WriteLine ("move file : " + fileName);
+ Utlis.WriteLine ("move file : " + fileName);
}
index++;
Application.RunOnMainThread (() => {
@@ -508,7 +510,7 @@
new Alert ("", Language.StringByID (R.MyInternationalizationString.CheckInternet),
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -921,8 +923,8 @@
Button btnMode = new Button () {
X = Application.GetRealWidth (20),
Y = Application.GetRealHeight (40),
- Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (100),
+ Width = Application.GetMinRealAverage (100),
+ Height = Application.GetMinRealAverage (100),
Tag = "Mode"
};
acRowView.AddChidren (btnMode);
@@ -932,8 +934,8 @@
Button btnWind = new Button () {
X = btnMode.Right + Application.GetRealWidth (0),
Y = Application.GetRealHeight (40),
- Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (100),
+ Width = Application.GetMinRealAverage (100),
+ Height = Application.GetMinRealAverage (100),
Tag = "Wind"
};
acRowView.AddChidren (btnWind);
@@ -1366,7 +1368,7 @@
};
proessView.AddChidren (btnMaxBrightness);
horizontalSeekBar.ProgressChanged += (sender2, e4) => {
- Console.WriteLine (DateTime.Now.ToString ());
+ Utlis.WriteLine (DateTime.Now.ToString ());
btnMaxBrightness.Text = horizontalSeekBar.Progress + "%";
System.Threading.Tasks.Task.Run (() => {
if ((System.DateTime.Now - (DateTime)(horizontalSeekBar.Tag)).TotalMilliseconds < 100) {
@@ -1821,9 +1823,10 @@
}
};
#endregion
- } else if (devcieCommon.Type == DeviceType.LightSwitch ||
- devcieCommon.Type == DeviceType.LightEnergySocket ||
- devcieCommon.Type == DeviceType.LightEnergySwitch || devcieCommon.Type == DeviceType.LightSwitchSocket) {
+ } else if (devcieCommon.Type == DeviceType.LightSwitch
+ || devcieCommon.Type == DeviceType.LightEnergySocket
+ || devcieCommon.Type == DeviceType.LightEnergySwitch
+ || devcieCommon.Type == DeviceType.LightSwitchSocket) {
#region 缁х數鍣�
LightSwitch switchLight = devcieCommon as LightSwitch;
tempSwitch.IsSelected = switchLight.CurrentBrightness == 100 ? true : false;
@@ -1850,19 +1853,19 @@
};
DeviceRowView.AddChidren (btnEnergy);
EnergtLightList.Add (devcieCommon);
-
- Button btnElectric = new Button () {
- Width = Application.GetRealWidth (200),
- Height = Application.GetRealHeight (35),
- X = Application.GetRealWidth (320),
- Y = tempSwitch.Bottom,
- TextColor = SkinStyle.Current.TextColor1,
- TextAlignment = TextAlignment.CenterRight,
- SelectedTextColor = SkinStyle.Current.TextColor1,
- Tag = devcieCommon.Type.ToString () + "_Electric",
- Text = "0 kw.h"
- };
- DeviceRowView.AddChidren (btnElectric);
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //Button btnElectric = new Button () {
+ // Width = Application.GetRealWidth (200),
+ // Height = Application.GetRealHeight (35),
+ // X = Application.GetRealWidth (320),
+ // Y = tempSwitch.Bottom,
+ // TextColor = SkinStyle.Current.TextColor1,
+ // TextAlignment = TextAlignment.CenterRight,
+ // SelectedTextColor = SkinStyle.Current.TextColor1,
+ // Tag = devcieCommon.Type.ToString () + "_Electric",
+ // Text = "0 kw.h"
+ //};
+ //DeviceRowView.AddChidren (btnElectric);
}
tempSwitch.MouseUpEventHandler += (sender3, e3) => {
//tempSwitch.IsSelected = !tempSwitch.IsSelected;
@@ -1880,7 +1883,8 @@
if (devcieCommon.Type == DeviceType.LightEnergySocket || devcieCommon.Type == DeviceType.LightEnergySwitch) {
new System.Threading.Thread (() => {
Control.ControlBytesSend (Command.ReadAnalogValue, switchLight.SubnetID, switchLight.DeviceID, new byte [] { 10, switchLight.LoopID }, SendCount.Zero);
- Control.ControlBytesSend (Command.ReadAnalogValue, switchLight.SubnetID, switchLight.DeviceID, new byte [] { 11, switchLight.LoopID }, SendCount.Zero);
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //Control.ControlBytesSend (Command.ReadAnalogValue, switchLight.SubnetID, switchLight.DeviceID, new byte [] { 11, switchLight.LoopID }, SendCount.Zero);
}) { IsBackground = true }.Start ();
}
};
@@ -1990,7 +1994,7 @@
try {
InfraredMode infraredTV = devcieCommon as InfraredMode;// Newtonsoft.Json.JsonConvert.DeserializeObject<InfraredMode> (CommonPage.MyEncodingUTF8.GetString (IO.FileUtils.ReadFile (deviceFilePath)));
if (infraredTV != null)
- Console.WriteLine (infraredTV.InfraredType);
+ Utlis.WriteLine (infraredTV.InfraredType);
if (infraredTV.InfraredType == InfraredType.TV) {
btnIcon.UnSelectedImagePath = "Item/InfraredTV.png";
btnIcon.SelectedImagePath = "Item/InfraredTV.png";
@@ -2011,7 +2015,7 @@
};
}
} catch (Exception ex) {
- Console.WriteLine (ex.ToString ());
+ Utlis.WriteLine (ex.ToString ());
continue;
}
#endregion
@@ -2049,14 +2053,14 @@
};
DeviceRowView.AddChidren (tempSwitch);
if (udDevice.ActionType == 0) {
- tempSwitch.Text = udDevice.ON_Text;
- //tempSwitch.TextID = R.MyInternationalizationString.ON;
+ //tempSwitch.Text = udDevice.ON_Text;
+ tempSwitch.TextID = R.MyInternationalizationString.ON;
} else if (udDevice.ActionType == 1) {
- tempSwitch.Text = udDevice.OFF_Text;
- //tempSwitch.TextID = R.MyInternationalizationString.OFF;
+ //tempSwitch.Text = udDevice.OFF_Text;
+ tempSwitch.TextID = R.MyInternationalizationString.OFF;
} else if (udDevice.ActionType == 2) {
- tempSwitch.Text = udDevice.OFF_Text;
- //tempSwitch.TextID = R.MyInternationalizationString.OFF;
+ //tempSwitch.Text = udDevice.OFF_Text;
+ tempSwitch.TextID = R.MyInternationalizationString.OFF;
Button tempON = new Button () {
Width = Application.GetRealWidth (110),
@@ -2082,25 +2086,26 @@
DeviceRowView.BorderColor = SkinStyle.Current.SelectedColor;
tempON.BorderColor = SkinStyle.Current.SelectedColor;
};
- tempSwitch.MouseUpEventHandler += (sender3, e3) => {
- if (udDevice.UniversalType == 0xE01C) {
- if (udDevice.ActionType == 0) {
- //2020-02-10 寰呬慨鏀�
- Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 255 }, SendCount.Zero);
- } else if (udDevice.ActionType == 1) {
- Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 0 }, SendCount.Zero);
- } else if (udDevice.ActionType == 2) {
- Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 0 }, SendCount.Zero);
- }
- }
- DeviceRowView.BorderColor = SkinStyle.Current.Transparent;
- tempSwitch.BorderColor = SkinStyle.Current.BorderColor;
- };
- tempSwitch.MouseDownEventHandler += (sende3r, e3) => {
- DeviceRowView.BorderColor = SkinStyle.Current.SelectedColor;
- tempSwitch.BorderColor = SkinStyle.Current.SelectedColor;
- };
}
+ tempSwitch.MouseUpEventHandler += (sender3, e3) => {
+ if (udDevice.UniversalType == 0xE01C) {
+ if (udDevice.ActionType == 0) {
+ //2020-02-10 寰呬慨鏀�
+ Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 255 }, SendCount.Zero);
+ } else if (udDevice.ActionType == 1) {
+ Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 0 }, SendCount.Zero);
+ } else if (udDevice.ActionType == 2) {
+ Control.ControlBytesSend (Command.SetCommonSwitch, udDevice.SubnetID, udDevice.DeviceID, new byte [] { udDevice.SendBytes [0], 0 }, SendCount.Zero);
+ }
+ }
+ DeviceRowView.BorderColor = SkinStyle.Current.Transparent;
+ tempSwitch.BorderColor = SkinStyle.Current.BorderColor;
+ };
+ tempSwitch.MouseDownEventHandler += (sende3r, e3) => {
+ DeviceRowView.BorderColor = SkinStyle.Current.SelectedColor;
+ tempSwitch.BorderColor = SkinStyle.Current.SelectedColor;
+ };
+
#endregion
} else if (devcieCommon.Type.ToString ().Contains ("Sensor")) {
#region 浼犳劅鍣�
@@ -2293,7 +2298,7 @@
}
}
} catch (Exception ex) {
- Console.WriteLine ("exddd :" + ex.ToString ());
+ Utlis.WriteLine ("exddd :" + ex.ToString ());
} finally {
//2020-02-14 澧炲姞璇荤姸鎬佹搷浣�
UserMiddle.ReadAllDeviceStatus (false, true);
@@ -2306,10 +2311,11 @@
var c = EnergtLightList [i];
Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 10, c.LoopID }, SendCount.Zero);
- Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
#if DEBUG
Application.RunOnMainThread (() => {
- Console.WriteLine ($"璇诲彇 { c.Name } 鐢佃兘");
+ Utlis.WriteLine ($"璇诲彇 { c.Name } 鐢佃兘");
});
#endif
System.Threading.Thread.Sleep (500);
--
Gitblit v1.8.0