From 16604a593202f2f87adf71abd57d036fe7da3b52 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 10:39:42 +0800
Subject: [PATCH] 同步了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 137 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 112 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 7d95668..40b3042 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -12,6 +12,10 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
+ /// 瀹屾垚娣诲姞鎴块棿鐨勪簨浠�
+ /// </summary>
+ public Action FinishEditorEvent = null;
+ /// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
private VerticalListControl listview = null;
@@ -50,22 +54,30 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- var btnPic = new PicViewControl(887, 444);
+ var btnPic = new ImageView();
btnPic.Y = Application.GetRealHeight(60);
+ btnPic.Width = Application.GetMinRealAverage(887);
+ btnPic.Height = Application.GetMinRealAverage(444);
btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.UnSelectedImagePath = "Room/r0.png";
+ btnPic.Radius = 17;
+ btnPic.ImagePath = "Room/r0.png";
bodyFrameLayout.AddChidren(btnPic);
+ btnPic.MouseUpEventHandler += (sender, e) =>
+ {
+ //鎴块棿鍥剧墖閫夋嫨
+ this.RoomPictrueSelect(btnPic);
+ };
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
- newRoom.BackgroundImage = btnPic.UnSelectedImagePath;
+ newRoom.BackgroundImage = btnPic.ImagePath;
//鍒濆鍖栨甯�
var tableContr = new InformationEditorControl();
this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 562, 1175);
//娣诲姞鍏ㄩ儴鑿滃崟
- this.AddAllMenuRow(tableContr);
+ this.AddAllMenuRow(tableContr, btnPic);
}
#endregion
@@ -75,7 +87,7 @@
/// <summary>
/// 娣诲姞鍏ㄩ儴鑿滃崟
/// </summary>
- private void AddAllMenuRow(InformationEditorControl tableContr)
+ private void AddAllMenuRow(InformationEditorControl tableContr, ImageView btnPic)
{
//銆愭埧闂村悕绉般��
var txtRoomName = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uRoomName), string.Empty, this.listview.rowSpace / 2);
@@ -85,19 +97,23 @@
//搴曠嚎
txtRoomName.AddBottomLine();
- //銆愭墍灞炴ゼ灞傘��
- var btnBelone = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uBelongeFloor), Common.Config.Instance.Home.FloorDics[this.floorKeys], this.listview.rowSpace / 2);
- listview.AddChidren(btnBelone);
- btnBelone.InitControl();
- //鍙崇澶�
- btnBelone.AddRightArrow();
- //搴曠嚎
- btnBelone.AddBottomLine();
- btnBelone.ButtonClickEvent += (sender, e) =>
+ //璇PP涓烘湁妤煎眰鐨勬ā寮忔墠寮�鍚繖涓彍鍗�
+ if (floorKeys != string.Empty)
{
- //妤煎眰閫夋嫨
- this.ShowSelectFloor(btnBelone);
- };
+ //銆愭墍灞炴ゼ灞傘��
+ var btnBelone = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uBelongeFloor), Common.Config.Instance.Home.FloorDics[this.floorKeys], this.listview.rowSpace / 2);
+ listview.AddChidren(btnBelone);
+ btnBelone.InitControl();
+ //鍙崇澶�
+ btnBelone.AddRightArrow();
+ //搴曠嚎
+ btnBelone.AddBottomLine();
+ btnBelone.ButtonClickEvent += (sender, e) =>
+ {
+ //妤煎眰閫夋嫨
+ this.ShowSelectFloor(btnBelone);
+ };
+ }
//銆愭俯搴︺��
var rowTemperature = new FrameRowControl(this.listview.rowSpace / 2);
@@ -144,6 +160,16 @@
{
return;
}
+ if (newRoom.BackgroundImageType == 1 || newRoom.BackgroundImageType == 2)
+ {
+ //鐢熸垚鍥剧墖
+ string picName = $"Room_{DateTime.Now.ToString("yyyyMMddHHmmss")}";
+ string picFullName = System.IO.Path.Combine(Common.Config.Instance.FullPath, picName);
+ Shared.IO.FileUtils.WriteFileByBytes(picFullName, btnPic.ImageBytes);
+ newRoom.BackgroundImage = picFullName;
+ //澶囦唤
+ Phone.UserCenter.HdlAutoBackupLogic.AddOrEditorFile(picName);
+ }
var result = newRoom.AddRoom(newRoom);
if (result == false)
{
@@ -152,6 +178,8 @@
}
else
{
+ this.FinishEditorEvent?.Invoke();
+
this.CloseForm();
}
};
@@ -372,6 +400,69 @@
#endregion
+ #region 鈻� 鎴块棿鍥剧墖閫夋嫨_______________________
+
+ /// <summary>
+ /// 鎴块棿鍥剧墖閫夋嫨
+ /// </summary>
+ /// <param name="imageContr"></param>
+ private void RoomPictrueSelect(ImageView imageContr)
+ {
+ var menuContr = new BottomMenuSelectForm();
+ menuContr.AddForm(3);
+ //榛樿鍥惧簱
+ 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) =>
+ {
+ if (string.IsNullOrEmpty(imgPath) == true)
+ {
+ return;
+ }
+ this.newRoom.BackgroundImageType = 0;
+ this.newRoom.BackgroundImage = imgPath;
+ imageContr.ImagePath = imgPath;
+ };
+ });
+ //鎷嶇収
+ menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.Photograph), () =>
+ {
+ //閫氳繃鐩告満鎷嶇収瑁佸壀
+ CropImage.TakePicture((imagePath) =>
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
+ this.newRoom.BackgroundImageType = 1;
+ imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ System.IO.File.Delete(imagePath);
+ }, "HdlPic", 2, 1);
+ });
+ //鎴戠殑鐩稿唽
+ menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.MyAblums), () =>
+ {
+ //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
+ CropImage.SelectPicture((imagePath) =>
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
+ this.newRoom.BackgroundImageType = 2;
+ imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ System.IO.File.Delete(imagePath);
+
+ }, "HdlPic", 2, 1);
+ });
+ }
+
+ #endregion
+
#region 鈻� 鐣岄潰鍏抽棴___________________________
/// <summary>
@@ -379,6 +470,8 @@
/// </summary>
public override void CloseForm()
{
+ this.FinishEditorEvent = null;
+
HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");
HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");
@@ -405,7 +498,7 @@
{
if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
{
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));
return false;
}
}
@@ -414,15 +507,9 @@
var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);
if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)
{
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));
return false;
}
- }
-
- if (newRoom.BackgroundImageType == 1 || newRoom.BackgroundImageType == 2)
- {
- this.newRoom.MoveBackGroundIamageFileToDirectory(newRoom.BackgroundImage, newRoom.BackgroundImage);
- this.newRoom.BackgroundImage = $"{Common.Config.Instance.Guid}/{Common.Config.Instance.HomeId}/{newRoom.BackgroundImage}";
}
newRoom.FloorId = this.floorKeys;
--
Gitblit v1.8.0