From 587c36e27131f2d028fcabc13b296a8de7470034 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 08 一月 2020 08:59:19 +0800
Subject: [PATCH] 2019.1.8
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 98 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index e06b16b..5fc61e9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -54,23 +54,31 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ //鎴块棿鍥剧墖
+ var framePic = new FrameLayout();
+ framePic.Y = Application.GetRealHeight(60);
+ framePic.Width = Application.GetMinRealAverage(887);
+ framePic.Height = Application.GetMinRealAverage(444);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Radius = (uint)Application.GetRealHeight(17);
+ framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
+ bodyFrameLayout.AddChidren(framePic);
var btnPic = new ImageView();
- btnPic.Y = Application.GetRealHeight(60);
- btnPic.Width = Application.GetMinRealAverage(887);
- btnPic.Height = Application.GetMinRealAverage(444);
- btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.Radius = 8;
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.ImagePath = "RoomIcon/0.JPG";
- bodyFrameLayout.AddChidren(btnPic);
- btnPic.MouseUpEventHandler += (sender, e) =>
+ framePic.AddChidren(btnPic);
+ //鍦ㄤ笂闈㈡斁涓�灞傞槾褰�
+ var btnPicBack = new FrameLayout();
+ btnPicBack.Radius = (uint)Application.GetRealHeight(17);
+ btnPicBack.BackgroundColor = 0x26000000;
+ framePic.AddChidren(btnPicBack);
+ btnPicBack.MouseUpEventHandler += (sender, e) =>
{
//鎴块棿鍥剧墖閫夋嫨
this.RoomPictrueSelect(btnPic);
};
//娣诲姞闃村奖鐗规晥
- var btnTemp = new ButtonBase();
- btnTemp.AddBottomShadow(btnPic, true);
- btnTemp = null;
+ framePic.SetViewShadow(true);
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
@@ -170,7 +178,7 @@
string picName = $"RoomIcon_{DateTime.Now.ToString("yyyyMMddHHmmss")}.png";
string picFullName = System.IO.Path.Combine(Common.Config.Instance.FullPath, picName);
Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
- newRoom.BackgroundImage = picFullName;
+ newRoom.BackgroundImage = picName;
//澶囦唤
Phone.UserCenter.HdlAutoBackupLogic.AddOrEditorFile(picName);
}
@@ -279,7 +287,7 @@
btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);
HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (Action<ZigBee.Device.CommonDevice>)((report) =>
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, ((report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (newRoom.TemperatrueDevice != mainKeys || btnTemper == null)
@@ -293,26 +301,29 @@
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
{
- if (data.AttriButeData == 0)
+ HdlThreadLogic.Current.RunMain(() =>
{
- //0鈩�
- btnTemper.Text = "0.0鈩�";
- }
- else if (data.AttriButeData > 32767)
- {
- //璐熸暟(鐗规畩澶勭悊)
- string strValue = (data.AttriButeData - 65536).ToString();
- //灏忔暟鐐归渶瑕佷竴浣�
- strValue = strValue.Substring(0, strValue.Length - 1);
- btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
- }
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�
- string strValue = data.AttriButeData.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
- }
+ if (data.AttriButeData == 0)
+ {
+ //0鈩�
+ btnTemper.Text = "0.0鈩�";
+ }
+ else if (data.AttriButeData > 32767)
+ {
+ //璐熸暟(鐗规畩澶勭悊)
+ string strValue = (data.AttriButeData - 65536).ToString();
+ //灏忔暟鐐归渶瑕佷竴浣�
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
+ }
+ });
}
}
}));
@@ -385,18 +396,21 @@
{
if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
{
- if (data.AttriButeData == 0)
+ HdlThreadLogic.Current.RunMain(() =>
{
- //0
- btnHumi.Text = "0.0%";
- }
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
- string strValue = data.AttriButeData.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
- }
+ if (data.AttriButeData == 0)
+ {
+ //0
+ btnHumi.Text = "0.0%";
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
+ string strValue = data.AttriButeData.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
+ }
+ });
}
}
});
--
Gitblit v1.8.0