From 2ec9898778d3beda89278e2a53ac0e68b3035d29 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 01 七月 2020 15:06:24 +0800
Subject: [PATCH] 2020-7-1-2
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 9b85a1e..4798b97 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -18,7 +18,7 @@
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalListControl listview = null;
+ private FrameListControl listview = null;
/// <summary>
/// 妤煎眰涓婚敭
/// </summary>
@@ -54,46 +54,54 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ var listBackControl = new VerticalFrameControl();
+ listBackControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBackControl);
+
//鍔犱竴涓櫧鑹茶儗鏅�
var frameBack1 = new FrameLayout();
frameBack1.Height = Application.GetRealHeight(450);
frameBack1.Y = Application.GetRealHeight(196);
frameBack1.BackgroundColor = UserCenterColor.Current.White;
frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- bodyFrameLayout.AddChidren(frameBack1);
+ listBackControl.frameTable.AddChidren(frameBack1);
//鍒濆鍖栦俊鎭甯�
var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 613, 1175);
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
- var btnShadow = new PicViewControl(994, 588);
+ var btnShadow = new PicViewControl(853, 593);
btnShadow.Y = Application.GetRealHeight(58);
btnShadow.Gravity = Gravity.CenterHorizontal;
btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
- bodyFrameLayout.AddChidren(btnShadow);
+ listBackControl.frameTable.AddChidren(btnShadow);
//鎴块棿鍥剧墖
var btnPic = new ImageView();
btnPic.Y = Application.GetRealHeight(60);
- btnPic.Width = Application.GetMinRealAverage(965);
- btnPic.Height = Application.GetMinRealAverage(544);
+ btnPic.Width = this.GetPictrueRealSize(824);
+ btnPic.Height = this.GetPictrueRealSize(549);
btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.ImagePath = "RoomIcon/0.JPG";
- bodyFrameLayout.AddChidren(btnPic);
+ btnPic.ImagePath = "RoomIcon/0.jpg";
+ listBackControl.frameTable.AddChidren(btnPic);
//鍥剧墖閬僵
var btnZhezhao = new FrameLayout();
btnZhezhao.Width = btnPic.Width;
btnZhezhao.Height = btnPic.Height;
btnZhezhao.Y = btnPic.Y;
btnZhezhao.Gravity = Gravity.CenterHorizontal;
- btnZhezhao.Radius = btnPic.Radius;
- bodyFrameLayout.AddChidren(btnZhezhao);
+ btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
+ btnZhezhao.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
+ listBackControl.frameTable.AddChidren(btnZhezhao);
btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
//鎴块棿鍥剧墖閫夋嫨
this.RoomPictrueSelect(btnPic);
};
+
+ //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
+ frameBack1.Y = btnPic.Y + btnPic.Height / 2;
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
@@ -171,7 +179,7 @@
};
//鍒濆鍖栨甯冨畬鎴�
- tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr.FinishInitControl();
tableContr = null;
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -205,6 +213,9 @@
{
newRoom.Temperatrue = 0;
}
+
+ //娣诲姞鎴块棿,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshForm = true;
HdlRoomLogic.Current.AddRoom(newRoom);
this.FinishEditorEvent?.Invoke();
@@ -374,6 +385,10 @@
{
listDevice.Add(device);
}
+ else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)
+ {
+ listDevice.Add(device);
+ }
}
var listSelect = new List<string>() { newRoom.HumidityDevice };
var form = new SelectDeviceForm();
@@ -429,7 +444,8 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- if (data.AttriButeData == 0)
+ decimal humidity = (decimal)device.GetType().InvokeMember("Humidity", System.Reflection.BindingFlags.GetField, null, device, null);
+ if (humidity == 0)
{
//0
btnHumi.Text = "0.0%";
@@ -437,11 +453,8 @@
}
else
{
- //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
- string strValue = data.AttriButeData.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
//璁板綍婀垮害
- this.newRoom.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ this.newRoom.Humidity = humidity;
btnHumi.Text = this.newRoom.Humidity.ToString() + "%";
}
});
@@ -449,7 +462,7 @@
}
});
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
- ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
+ device.GetType().InvokeMember("ReadTemperatureOrHumidity", System.Reflection.BindingFlags.InvokeMethod, null, device, null);
}
#endregion
@@ -467,11 +480,9 @@
//榛樿鍥惧簱
menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.LocalPicture), () =>
{
- var localPic = new Phone.Device.Room.AddRoomSelectPicByLocal();
- Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- localPic.Show();
- localPic.action = (imgPath) =>
+ var form = new SelectLocalRoomImageForm();
+ form.AddForm();
+ form.FinishSelectEvent = (imgPath) =>
{
if (string.IsNullOrEmpty(imgPath) == true)
{
--
Gitblit v1.8.0