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/Scene/UserAddSceneDevice.cs | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
index a89d8e3..4e53bb6 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
@@ -30,6 +30,7 @@
filesList = IO.FileUtils.ReadFiles ().FindAll ((obj) => { return obj.Split ('_').Length == 5; });
}
+
public void ShowScene (Action<string> action)
{
this.BackgroundColor = SkinStyle.Current.MainColor;
@@ -398,6 +399,7 @@
LightMixSwitch lightSwitch = Newtonsoft.Json.JsonConvert.DeserializeObject<LightMixSwitch> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (deviceFilePath)));
#region
title.Text = lightSwitch.Name;
+ //2020-01-13 鏄惁绂佹帀寤惰繜鍔熻兘锛屽緟纭
Button lblChangeName = new Button () {
X = Application.GetRealWidth (30),
Y = Application.GetRealHeight (100),
@@ -605,7 +607,7 @@
};
dialogBodyLayout.AddChidren (btnMaxBrightness);
horizontalSeekBar.ProgressChanged += (sender, e) => {
- //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) {
@@ -752,7 +754,7 @@
};
dialogBodyLayout.AddChidren (btnMaxBrightness);
horizontalSeekBar.ProgressChanged += (sender, e) => {
- //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) {
@@ -1097,18 +1099,24 @@
btnOpenCurtain.IsSelected = false;
btnStopCurtain.IsSelected = false;
curtainmodel.Status = (CurtainStatus)2;
+ Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID,
+ new byte [] { curtainmodel.LoopID, (byte)curtainmodel.Status });
};
btnOpenCurtain.MouseUpEventHandler += (sender3, e3) => {
btnCloseCurtain.IsSelected = false;
btnOpenCurtain.IsSelected = true;
btnStopCurtain.IsSelected = false;
curtainmodel.Status = (CurtainStatus)1;
+ Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID,
+ new byte [] { curtainmodel.LoopID, (byte)curtainmodel.Status });
};
btnStopCurtain.MouseUpEventHandler += (sender3, e3) => {
btnCloseCurtain.IsSelected = false;
btnOpenCurtain.IsSelected = false;
btnStopCurtain.IsSelected = true;
curtainmodel.Status = (CurtainStatus)0;
+ Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID,
+ new byte [] { curtainmodel.LoopID, (byte)curtainmodel.Status });
};
if (curtainmodel.Status == 0) {
btnStopCurtain.IsSelected = true;
@@ -1325,11 +1333,11 @@
Y = tempSeekBarFrame.Bottom + Application.GetRealHeight (40),
};
dialogBodyLayout.AddChidren (btnOpenCurtain);
- btnOpenCurtain.MouseUpEventHandler += (sender, e) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 100 });
- horizontalSeekBar.Progress = 100;
- btnMaxBrightness.Text = "100%";
- };
+ //btnOpenCurtain.MouseUpEventHandler += (sender, e) => {
+ // Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 100 });
+ // horizontalSeekBar.Progress = 100;
+ // btnMaxBrightness.Text = "100%";
+ //};
Button btnOpenLbl = new Button () {
Width = Application.GetRealWidth (124),
Height = Application.GetRealHeight (30),
@@ -1368,11 +1376,11 @@
SelectedImagePath = "Curtain/CurtainRollerDownOn.png",
};
dialogBodyLayout.AddChidren (btnCloseCurtain);
- btnCloseCurtain.MouseUpEventHandler += (sender, e) => {
- Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 0 });
- horizontalSeekBar.Progress = 0;
- btnMaxBrightness.Text = "0%";
- };
+ //btnCloseCurtain.MouseUpEventHandler += (sender, e) => {
+ // Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 0 });
+ // horizontalSeekBar.Progress = 0;
+ // btnMaxBrightness.Text = "0%";
+ //};
Button btnCloseLbl = new Button () {
Width = Application.GetRealWidth (124),
Height = Application.GetRealHeight (30),
@@ -1384,16 +1392,24 @@
};
dialogBodyLayout.AddChidren (btnCloseLbl);
btnCloseCurtain.MouseUpEventHandler += (sender3, e3) => {
+ Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 0 });
+ horizontalSeekBar.Progress = 0;
+ btnMaxBrightness.Text = "0%";
btnCloseCurtain.IsSelected = true;
btnOpenCurtain.IsSelected = false;
btnStopCurtain.IsSelected = false;
curtainroller.Status = (CurtainStatus)2;
+
};
btnOpenCurtain.MouseUpEventHandler += (sender3, e3) => {
+ Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 100 });
+ horizontalSeekBar.Progress = 100;
+ btnMaxBrightness.Text = "100%";
btnCloseCurtain.IsSelected = false;
btnOpenCurtain.IsSelected = true;
btnStopCurtain.IsSelected = false;
curtainroller.Status = (CurtainStatus)1;
+
};
btnStopCurtain.MouseUpEventHandler += (sender3, e3) => {
btnCloseCurtain.IsSelected = false;
@@ -2360,11 +2376,11 @@
};
var commonBytes = IO.FileUtils.ReadFile (deviceFilePath);
if (commonBytes.Length == 0) {
- Console.WriteLine ("length loss");
+ Utlis.WriteLine ("length loss");
continue;
}
if (commonBytes.Length == 1) {
- Console.WriteLine ("length loss 1");
+ Utlis.WriteLine ("length loss 1");
continue;
}
Common commonDevice = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (System.Text.Encoding.UTF8.GetString (commonBytes));
@@ -2389,7 +2405,7 @@
if (sceneFilePath == Scene.GlobalSceneFilePath) {
foreach (var filePath in scene.DeviceFilePathList) {
- System.Console.WriteLine (filePath);
+ Utlis.WriteLine (filePath);
if (filePath.EndsWith (deviceFilePath)) {
btnEquipment.IsSelected = true;
break;
--
Gitblit v1.8.0