From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 91 +++++++++------------------------------------
1 files changed, 18 insertions(+), 73 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 3634974..cf138ae 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -67,15 +67,11 @@
//鍔犱竴涓櫧鑹茶儗鏅�
var frameBack1 = new FrameLayout();
- frameBack1.Height = Application.GetRealHeight(450);
+ frameBack1.Height = Application.GetRealHeight(750);
frameBack1.Y = Application.GetRealHeight(196);
frameBack1.BackgroundColor = UserCenterColor.Current.White;
frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
listBackControl.frameTable.AddChidren(frameBack1);
-
- //鍒濆鍖栦俊鎭甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
var btnShadow = new PicViewControl(853, 593);
@@ -109,7 +105,7 @@
btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
listBackControl.frameTable.AddChidren(btnZhezhao);
//鍒嗕韩鐨勬埧闂翠笉鑳界紪杈�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
@@ -118,8 +114,9 @@
};
}
- //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
- frameBack1.Y = btnPic.Y + btnPic.Height / 2;
+ //鍒濆鍖栦俊鎭甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
@@ -140,6 +137,7 @@
{
txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), this.cloneRoom.Name, this.listview.rowSpace / 2);
txtRoomName.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName);
+ txtRoomName.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(txtRoomName);
txtRoomName.InitControl();
//搴曠嚎
@@ -166,7 +164,7 @@
//搴曠嚎
btnBelone.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
- if (this.editorRoom.IsSharedRoom == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鍙崇澶�
btnBelone.AddRightArrow();
@@ -188,7 +186,8 @@
//搴曠嚎
rowTemperature.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀� 鎴栬�呭綋鍓嶄綇瀹呬笉鏄櫄鎷熺殑
- if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
rowTemperature.ButtonClickEvent += (sender, e) =>
{
@@ -196,7 +195,8 @@
this.ShowTemperatrueDevice(btnTemper);
};
}
- if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false)
+ if (string.IsNullOrEmpty(cloneRoom.TemperatrueDevice) == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鑾峰彇娓╁害
this.GetTemperatrueValue(btnTemper, cloneRoom.TemperatrueDevice);
@@ -212,7 +212,8 @@
//搴曠嚎
rowHumidity.AddBottomLine();
//鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀� 鎴栬�呭綋鍓嶄綇瀹呬笉鏄櫄鎷熺殑
- if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false)
+ if (this.editorRoom.IsSharedRoom == false && Common.Config.Instance.Home.IsVirtually == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
rowHumidity.ButtonClickEvent += (sender, e) =>
{
@@ -220,7 +221,8 @@
this.ShowHumidityDevice(btnHumi);
};
}
- if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false)
+ if (string.IsNullOrEmpty(cloneRoom.HumidityDevice) == false
+ && Common.Config.Instance.Home.IsShowTemplate == false)
{
//鑾峰彇婀垮害
this.GetHumidityValue(btnHumi, cloneRoom.HumidityDevice);
@@ -231,7 +233,7 @@
tableContr = null;
//鍒嗕韩鐨勬埧闂翠笉鑳戒繚瀛�
- if (this.editorRoom.IsSharedRoom == true)
+ if (this.editorRoom.IsSharedRoom == true|| Common.Config.Instance.Home.IsShowTemplate == true)
{
return;
}
@@ -450,8 +452,7 @@
&& data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
{
//澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
- decimal temperatrue = 0;
- this.AdjustTemperatrueValue(data.AttributeData, ref temperatrue);
+ decimal temperatrue = Common.LocalDevice.Current.AdjustTemperatrueValue(data.AttributeData);
device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.SetField, null, device, new object[] { temperatrue });
device.ReSave();
@@ -469,37 +470,6 @@
}
}
});
- }
-
- /// <summary>
- /// 澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
- /// </summary>
- /// <param name="value">缃戝叧杩斿洖鐨勫睘鎬у��</param>
- /// <param name="temperatrue">杞崲鎴愮殑娓╁害鍊�</param>
- private void AdjustTemperatrueValue(int value, ref decimal temperatrue)
- {
- if (value == 0)
- {
- //0鈩�
- temperatrue = 0;
- }
- else if (value > 32767)
- {
- //璐熸暟(鐗规畩澶勭悊)
- string strValue = (value - 65536).ToString();
- //灏忔暟鐐归渶瑕佷竴浣�
- strValue = strValue.Substring(0, strValue.Length - 1);
- //璁板綍娓╁害
- temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
- }
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�
- string strValue = value.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- //璁板綍娓╁害
- temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
- }
}
#endregion
@@ -617,8 +587,7 @@
&& data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
{
//澶勭悊缃戝叧杩斿洖鐨勬箍搴﹀��
- decimal humidity = 0;
- this.AdjustHumidityValue(data.AttributeData, ref humidity);
+ decimal humidity = Common.LocalDevice.Current.AdjustHumidityValue(data.AttributeData);
device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.SetField, null, device, new object[] { humidity });
device.ReSave();
@@ -636,30 +605,6 @@
}
}
});
- }
-
- /// <summary>
- /// 澶勭悊缃戝叧杩斿洖鐨勬箍搴﹀��
- /// </summary>
- /// <param name="value">缃戝叧杩斿洖鐨勫睘鎬у��</param>
- /// <param name="temperatrue">杞崲鎴愮殑婀垮害鍊�</param>
- /// <param name="valueText">杞崲鎴愮殑婀垮害鍊肩殑缈昏瘧鏂囨湰</param>
- private void AdjustHumidityValue(int value, ref decimal humidity)
- {
- if (value == 0)
- {
- //0%
- humidity = 0;
- }
- //涓嶄細鍑虹幇璐熸暟
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�
- string strValue = value.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- //璁板綍娓╁害
- humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
- }
}
#endregion
--
Gitblit v1.8.0