From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 14:10:22 +0800
Subject: [PATCH] 上传一个很特别的新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs | 234 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 169 insertions(+), 65 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
index 4745c8f..fb3e925 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 褰撳墠閫夋嫨鐨勮澶�
/// </summary>
@@ -36,6 +36,18 @@
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
/// </summary>
private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨殑闇囧姩鏁版嵁
+ /// </summary>
+ private HdlDevicePanelLogic.PanelVibrationInfo vibrationInfo = null;
+ /// <summary>
+ /// 鏄惁宸茬粡璇诲彇浜嗛渿鍔ㄦ暟鎹�
+ /// </summary>
+ private bool hadReadVibrationInfo = false;
+ /// <summary>
+ /// 淇℃伅缂栬緫鎺т欢
+ /// </summary>
+ private InformationEditorControl tableContr = null;
#endregion
@@ -67,22 +79,22 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍒濆鍖栨甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);
+ this.tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
//鍒濆鍖栬澶囧洖璺浘鏍�
- this.InitDeviceEpointIcon();
-
- //鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
- tableContr = null;
+ this.InitDeviceEpointIcon(listBackControl);
//淇濆瓨
var btnFinish = new BottomClickButton();
btnFinish.TextID = R.MyInternationalizationString.uSave;
bodyFrameLayout.AddChidren(btnFinish);
- btnFinish.ButtonClickEvent += async (sender, e) =>
+ btnFinish.ButtonClickEvent += (sender, e) =>
{
//璁板綍璧峰綋鍓嶆鍦ㄦ搷浣滅殑鍥炶矾鍚嶅瓧
dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
@@ -101,7 +113,7 @@
if (oldName != newName)
{
//璁惧鍚嶇О淇敼
- var result = await Common.LocalDevice.Current.ReName(device, newName);
+ var result = Common.LocalDevice.Current.ReName(device, newName);
if (result == false)
{
//鍏抽棴
@@ -135,7 +147,7 @@
listview.AddChidren(btnDeviceName);
btnDeviceName.InitControl();
btnDeviceName.AddBottomLine();
- btnDeviceName.txtInput.FinishInputEvent += async () =>
+ btnDeviceName.txtInput.FinishInputEvent += () =>
{
string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
if (btnDeviceName.Text.Trim() == string.Empty)
@@ -146,7 +158,7 @@
if (oldName != btnDeviceName.Text.Trim())
{
//璁惧鍚嶇О淇敼
- var result = await Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
+ var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
if (result == false)
{
return;
@@ -166,13 +178,18 @@
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
//鍙樻洿鎴块棿
- Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);
+ HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);
};
//娣诲姞缁戝畾鐩爣琛�
this.AddBindRow();
//娣诲姞鑳屽厜鐏
this.AddBackLightRow();
+ //娣诲姞闇囧姩鍙嶉琛�
+ this.AddVibrationFeedbackRow();
+
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl();
}
#endregion
@@ -213,7 +230,7 @@
//{
// menuCount = 2;
//}
- var frame = new TopRightMenuControl(menuCount);
+ var frame = new TopRightMenuControl(menuCount, 1);
if (canTest == true)
{
//瀹氫綅
@@ -293,12 +310,99 @@
#endregion
+ #region 鈻� 闇囧姩鍙嶉___________________________
+
+ /// <summary>
+ /// 娣诲姞闇囧姩鍙嶉琛�
+ /// </summary>
+ private void AddVibrationFeedbackRow()
+ {
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(nowSelectDevice.DeviceAddr, false);
+ var myType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ //鍙湁绠�绾﹂潰鏉挎墠浼氭湁杩欎釜鑿滃崟
+ if (myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleTwo
+ || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleThree
+ || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleFour
+ || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FourButtonScene
+ || myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_TwoButtonCurtain)
+ {
+ //闇囧姩鍙嶉
+ var rowContr = new FrameRowControl(listview.rowSpace / 2);
+ rowContr.UseClickStatu = false;
+ listview.AddChidren(rowContr);
+ rowContr.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uVibrationFeedback), 600);
+ //搴曠嚎
+ rowContr.AddBottomLine();
+ //鍙崇澶�
+ var btnSwitch = rowContr.AddMostRightSwitchIcon();
+ if (vibrationInfo != null)
+ {
+ btnSwitch.IsSelected = vibrationInfo.A闇囧姩浣胯兘;
+ }
+
+ btnSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ if (vibrationInfo == null)
+ {
+ //鑾峰彇鏁版嵁澶辫触鏃�,缁欎粬鐜�,浣嗘槸娌℃晥鏋�
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ return;
+ }
+ //鐐瑰嚮涓�娆′箣鍚�,涓嶈兘鍐嶆鐐瑰嚮
+ btnSwitch.CanClick = false;
+ bool statu = !btnSwitch.IsSelected;
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ vibrationInfo.A闇囧姩浣胯兘 = statu;
+ //璁剧疆绠�绾﹂潰鏉块渿鍔ㄥ姛鑳界殑淇℃伅
+ var result = HdlDevicePanelLogic.Current.SetPanelVibrationData(nowSelectDevice, vibrationInfo);
+ if (result == true)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnSwitch.IsSelected = statu;
+ });
+ }
+ else
+ {
+ //澶辫触鏃�,鏁版嵁杩樺師
+ vibrationInfo.A闇囧姩浣胯兘 = !vibrationInfo.A闇囧姩浣胯兘;
+ }
+ //鍏佽涓嬩竴娆＄偣鍑�
+ btnSwitch.CanClick = true;
+ });
+ };
+ if (hadReadVibrationInfo == true)
+ {
+ //涓嶅啀璇诲彇
+ return;
+ }
+ this.hadReadVibrationInfo = true;
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇绠�绾﹂潰鏉块渿鍔ㄥ姛鑳界殑淇℃伅(null琛ㄧず鍑洪敊)
+ vibrationInfo = HdlDevicePanelLogic.Current.GetPanelVibrationData(nowSelectDevice);
+ if (vibrationInfo != null)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnSwitch.IsSelected = vibrationInfo.A闇囧姩浣胯兘;
+ });
+ }
+ });
+ }
+ }
+
+ #endregion
+
#region 鈻� 鍒濆鍖栬澶囧洖璺浘鏍嘷________________
/// <summary>
/// 鍒濆鍖栬澶囧洖璺浘鏍�
/// </summary>
- private void InitDeviceEpointIcon()
+ private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
{
bool hadDevice = false;
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
@@ -334,12 +438,12 @@
var frameBorder = new FrameLayout();
frameBorder.Y = Application.GetRealHeight(150);
frameBorder.Gravity = Gravity.CenterHorizontal;
- frameBorder.Width = Application.GetMinRealAverage(426);
- frameBorder.Height = Application.GetMinRealAverage(426);
- bodyFrameLayout.AddChidren(frameBorder);
+ frameBorder.Width = this.GetPictrueRealSize(426);
+ frameBorder.Height = this.GetPictrueRealSize(426);
+ listBackControl.frameTable.AddChidren(frameBorder);
var btnPic = new PicViewControl(frameBorder.Width, frameBorder.Height, false);
- btnPic.UnSelectedImagePath = "Device/PanelTable.png";
+ btnPic.UnSelectedImagePath = "DeviceItem/PanelTable.png";
frameBorder.AddChidren(btnPic);
if (listOffSwitch.Count == 4)
@@ -366,18 +470,18 @@
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="isFirst">鏄惁鏄涓�涓�</param>
/// <returns></returns>
- private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device)
+ private void InitDeviceIcon(FrameLayoutStatuControl frame, CommonDevice device)
{
//涓嶄娇鐢ㄧ偣鍑荤壒鏁�
frame.UseClickStatu = false;
- var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
+ var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);
btnIcon.Name = "btn" + device.DeviceEpoint;
btnIcon.Gravity = Gravity.Center;
- btnIcon.Radius = 6;
+ btnIcon.RadiusEx = 16;
btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
- frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+ frame.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
//鐐瑰嚮浜嬩欢
frame.ButtonClickEvent += (sender, e) =>
{
@@ -404,20 +508,20 @@
private void InitTwoButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
{
//鎸夐敭1
- var frame1 = new FrameLayoutControl();
- frame1.Height = Application.GetMinRealAverage(110);
- frame1.Width = Application.GetMinRealAverage(110);
- frame1.Y = Application.GetMinRealAverage(63);
+ var frame1 = new FrameLayoutStatuControl();
+ frame1.Height = this.GetPictrueRealSize(110);
+ frame1.Width = this.GetPictrueRealSize(110);
+ frame1.Y = this.GetPictrueRealSize(63);
frame1.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
- var frame2 = new FrameLayoutControl();
- frame2.Height = Application.GetMinRealAverage(110);
- frame2.Width = Application.GetMinRealAverage(110);
- frame2.Y = Application.GetMinRealAverage(245);
+ var frame2 = new FrameLayoutStatuControl();
+ frame2.Height = this.GetPictrueRealSize(110);
+ frame2.Width = this.GetPictrueRealSize(110);
+ frame2.Y = this.GetPictrueRealSize(245);
frame2.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
@@ -436,31 +540,31 @@
private void InitThreeButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
{
//鎸夐敭1
- var frame1 = new FrameLayoutControl();
- frame1.Height = Application.GetMinRealAverage(110);
- frame1.Width = Application.GetMinRealAverage(110);
- frame1.Y = Application.GetMinRealAverage(63);
+ var frame1 = new FrameLayoutStatuControl();
+ frame1.Height = this.GetPictrueRealSize(110);
+ frame1.Width = this.GetPictrueRealSize(110);
+ frame1.Y = this.GetPictrueRealSize(63);
frame1.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
- var frame2 = new FrameLayoutControl();
- frame2.Height = Application.GetMinRealAverage(110);
- frame2.Width = Application.GetMinRealAverage(110);
- frame2.X = Application.GetMinRealAverage(63);
- frame2.Y = Application.GetMinRealAverage(245);
+ var frame2 = new FrameLayoutStatuControl();
+ frame2.Height = this.GetPictrueRealSize(110);
+ frame2.Width = this.GetPictrueRealSize(110);
+ frame2.X = this.GetPictrueRealSize(63);
+ frame2.Y = this.GetPictrueRealSize(245);
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame2, listDevice[1]);
//鎸夐敭3
- var frame3 = new FrameLayoutControl();
- frame3.Height = Application.GetMinRealAverage(110);
- frame3.Width = Application.GetMinRealAverage(110);
- frame3.X = Application.GetMinRealAverage(245);
- frame3.Y = Application.GetMinRealAverage(245);
+ var frame3 = new FrameLayoutStatuControl();
+ frame3.Height = this.GetPictrueRealSize(110);
+ frame3.Width = this.GetPictrueRealSize(110);
+ frame3.X = this.GetPictrueRealSize(245);
+ frame3.Y = this.GetPictrueRealSize(245);
frameBack.AddChidren(frame3);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame3, listDevice[2]);
@@ -478,41 +582,41 @@
private void InitFourButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
{
//鎸夐敭1
- var frame1 = new FrameLayoutControl();
- frame1.Height = Application.GetMinRealAverage(110);
- frame1.Width = Application.GetMinRealAverage(110);
- frame1.X = Application.GetMinRealAverage(63);
- frame1.Y = Application.GetMinRealAverage(63);
+ var frame1 = new FrameLayoutStatuControl();
+ frame1.Height = this.GetPictrueRealSize(110);
+ frame1.Width = this.GetPictrueRealSize(110);
+ frame1.X = this.GetPictrueRealSize(63);
+ frame1.Y = this.GetPictrueRealSize(63);
frameBack.AddChidren(frame1);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame1, listDevice[0]);
//鎸夐敭2
- var frame2 = new FrameLayoutControl();
- frame2.Height = Application.GetMinRealAverage(110);
- frame2.Width = Application.GetMinRealAverage(110);
- frame2.X = Application.GetMinRealAverage(245);
- frame2.Y = Application.GetMinRealAverage(63);
+ var frame2 = new FrameLayoutStatuControl();
+ frame2.Height = this.GetPictrueRealSize(110);
+ frame2.Width = this.GetPictrueRealSize(110);
+ frame2.X = this.GetPictrueRealSize(245);
+ frame2.Y = this.GetPictrueRealSize(63);
frameBack.AddChidren(frame2);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame2, listDevice[1]);
//鎸夐敭3
- var frame3 = new FrameLayoutControl();
- frame3.Height = Application.GetMinRealAverage(110);
- frame3.Width = Application.GetMinRealAverage(110);
- frame3.X = Application.GetMinRealAverage(63);
- frame3.Y = Application.GetMinRealAverage(245);
+ var frame3 = new FrameLayoutStatuControl();
+ frame3.Height = this.GetPictrueRealSize(110);
+ frame3.Width = this.GetPictrueRealSize(110);
+ frame3.X = this.GetPictrueRealSize(63);
+ frame3.Y = this.GetPictrueRealSize(245);
frameBack.AddChidren(frame3);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame3, listDevice[2]);
//鎸夐敭4
- var frame4 = new FrameLayoutControl();
- frame4.Height = Application.GetMinRealAverage(110);
- frame4.Width = Application.GetMinRealAverage(110);
- frame4.X = Application.GetMinRealAverage(245);
- frame4.Y = Application.GetMinRealAverage(245);
+ var frame4 = new FrameLayoutStatuControl();
+ frame4.Height = this.GetPictrueRealSize(110);
+ frame4.Width = this.GetPictrueRealSize(110);
+ frame4.X = this.GetPictrueRealSize(245);
+ frame4.Y = this.GetPictrueRealSize(245);
frameBack.AddChidren(frame4);
//鍒濆鍖栬澶囧浘鏍�
this.InitDeviceIcon(frame4, listDevice[3]);
--
Gitblit v1.8.0