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/Alexa/AlexaSettingPage.cs | 133 +++++++++-----------------------------------
1 files changed, 28 insertions(+), 105 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
index d8d9f65..9ad80a4 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
@@ -283,6 +283,8 @@
deviceFilePath = deviceFilePath.Replace ("LightSwitchSocket", "LightSwitch");
} else if(deviceFilePath.Contains("ACInfrared")) {
deviceFilePath = deviceFilePath.Replace ("ACInfrared", "HVAC");
+ } else if (deviceFilePath.Contains ("CurtainModel")) {
+ deviceFilePath = deviceFilePath.Replace ("CurtainModel", "CurtainModule");
}
Common commonDevice = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (System.Text.Encoding.UTF8.GetString (commonBytes));
if (commonDevice.Type == DeviceType.OnePortBus || commonDevice.Type == DeviceType.OnePortWirelessFR || commonDevice.Type == DeviceType.OnePortMqttFR || commonDevice.Type == DeviceType.RCU
@@ -343,112 +345,25 @@
if (selectedDeviceType != "Scene") {
//2020-01-10 闅愯棌淇敼鎸夐挳
//return;
- //var btnEdit = new Button () {
- // X = btnEquipment.Right + Application.GetRealWidth (80),
- // Width = Application.GetRealWidth (75),
- // Height = Application.GetRealHeight (72),
- // Gravity = Gravity.CenterVertical,
- // UnSelectedImagePath = "CrabtreeAdd/Edit.png",
- // SelectedImagePath = "CrabtreeAdd/EditOn.png",
- //};
- //deviceRow.AddChidren (btnEdit);
- //btnEdit.MouseUpEventHandler += (sd, ds) => {
- // Dialog dialog = new Dialog ();
+ var btnEdit = new Button () {
+ X = btnEquipment.Right + Application.GetRealWidth (80),
+ Width = Application.GetMinRealAverage (75),
+ Height = Application.GetMinRealAverage (72),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "CrabtreeAdd/Edit.png",
+ SelectedImagePath = "CrabtreeAdd/EditOn.png",
+ };
+ deviceRow.AddChidren (btnEdit);
- // var dialogView = new FrameLayout () {
- // Gravity = Gravity.Center,
- // Width = Application.GetRealWidth (500),
- // Height = Application.GetRealHeight (300),
- // BackgroundColor = SkinStyle.Current.DialogColor,
- // Radius = 5,
- // BorderColor = SkinStyle.Current.Transparent,
- // BorderWidth = 1,
- // };
- // dialog.AddChidren (dialogView);
-
- // var etDeviceName = new EditText () {
- // Y = Application.GetRealHeight (80),
- // Gravity = Gravity.CenterHorizontal,
- // Width = Application.GetRealWidth (350),
- // Height = Application.GetRealHeight (70),
- // Text = commonDevice.Name,
- // TextAlignment = TextAlignment.Center,
- // TextColor = SkinStyle.Current.TextColor,
- // Radius = 1,
- // BorderWidth = 1,
- // BorderColor = SkinStyle.Current.BorderColor,
- // };
- // dialogView.AddChidren (etDeviceName);
-
- // etDeviceName.EditorEnterAction += (obj2) => {
- // Application.HideSoftInput ();
- // };
-
- // var dialogBottomView = new FrameLayout () {
- // Y = Application.GetRealHeight (213),
- // Height = Application.GetRealHeight (90),
- // BackgroundColor = SkinStyle.Current.Black50Transparent,
- // };
- // dialogView.AddChidren (dialogBottomView);
-
- // var btnClose = new Button () {
- // Width = Application.GetRealWidth (250),
- // TextAlignment = TextAlignment.Center,
- // TextID = R.MyInternationalizationString.cancel,
- // TextColor = SkinStyle.Current.TextColor,
- // BackgroundColor = SkinStyle.Current.ButtonColor,
- // };
- // dialogBottomView.AddChidren (btnClose);
- // btnClose.MouseUpEventHandler += (ddss, dddsss) => {
- // dialog.Close ();
- // };
-
- // var editor = new Button () {
- // X = btnClose.Right + 1,
- // Width = Application.GetRealWidth (250),
- // TextAlignment = TextAlignment.Center,
- // TextID = R.MyInternationalizationString.SAVE,
- // TextColor = SkinStyle.Current.TextColor,
- // BackgroundColor = SkinStyle.Current.ButtonColor,
- // };
- // dialogBottomView.AddChidren (editor);
-
- // editor.MouseUpEventHandler += (dff, ffd) => {
- // MainPage.Loading.Start ();
- // byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ());
- // System.Threading.Tasks.Task.Run (() => {
- // byte [] updateBytes = Control.ControlBytesSendHasReturn (Command.ReadDeviceLoopInfo, commonDevice.SubnetID, commonDevice.DeviceID, new byte [] { commonDevice.BigClass, commonDevice.MinClass, commonDevice.LoopID });
- // if (updateBytes == null) {
- // Application.RunOnMainThread (() => {
- // new Alert ("", Language.StringByID (R.MyInternationalizationString.TipEquipmentNotOnline), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- // MainPage.Loading.Hide ();
- // dialog.Close ();
- // });
- // return;
- // }
- // byte [] uBytes = new byte [20];
- // Array.Copy (remakeBytes, 0, uBytes, 0, remakeBytes.Length < 20 ? remakeBytes.Length : 20);
- // Array.Copy (uBytes, 0, updateBytes, 3, 20 < uBytes.Length ? 20 : uBytes.Length);
- // var reBytes = Control.ControlBytesSendHasReturn (Command.SetDeviceLoopInfo, commonDevice.SubnetID, commonDevice.DeviceID, updateBytes);
- // if (reBytes != null) {
- // Application.RunOnMainThread (() => {
- // btnEquipment.Text = commonDevice.Name = etDeviceName.Text.Trim ();
- // IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
- // MainPage.Loading.Hide ();
- // dialog.Close ();
- // });
- // } else {
- // Application.RunOnMainThread (() => {
- // new Alert ("", Language.StringByID (R.MyInternationalizationString.FailureToModify), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- // MainPage.Loading.Hide ();
- // dialog.Close ();
- // });
- // }
- // });
- // };
-
- // dialog.Show ();
- //};
+ btnEdit.MouseUpEventHandler += (sd, ds) => {
+ Action successAction = () => {
+ GenericDialog.Current.RefreshRemark (commonDevice);
+ if (!roomDeviceFilePathList.Contains (filePath)) {
+ roomDeviceFilePathList.Add (filePath);
+ }
+ };
+ GenericDialog.Current.ShowModifyRemarksDialog (commonDevice, commonBytes, btnEquipment, successAction);
+ };
}
var btnChoose = new Button () {
@@ -483,6 +398,14 @@
showList.Remove (((Button)sendere).Tag.ToString ());
}
};
+
+ //2020-07-23 濡傛灉鍖归厤鍒欏垽鏂槸鍚︽坊鍔犵湡姝ｇ殑璺緞
+ if (btnChoose.IsSelected) {
+ if (!roomDeviceFilePathList.Contains (filePath)) {
+ roomDeviceFilePathList.Add (filePath);
+ }
+ }
+
});
} catch (Exception ex) {
Utlis.WriteLine (ex.Message);
--
Gitblit v1.8.0