From e8d65cc090cee90ebe2d7087f95316d1fccdc74a Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期五, 26 八月 2022 16:44:01 +0800
Subject: [PATCH] 更新全视通dll
---
ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs | 145 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 109 insertions(+), 36 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
index 220a7d5..a994e30 100755
--- a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
@@ -120,18 +120,31 @@
//鍒濆鍖栨坊鍔犵洰鏍�
this.InitAddTargetControl();
- //鍒嗕韩鐨勫満鏅笉鑳戒繚瀛�
- if (this.editorScene == null || this.editorScene.IsSharedScene == false)
+ //瀹屾垚
+ var btnSave = new BottomClickButton();
+ btnSave.TextID = R.MyInternationalizationString.uFinish;
+ bodyFrameLayout.AddChidren(btnSave);
+ btnSave.ButtonClickEvent += (sender, e) =>
{
- //瀹屾垚
- var btnSave = new BottomClickButton();
- btnSave.TextID = R.MyInternationalizationString.uFinish;
- bodyFrameLayout.AddChidren(btnSave);
- btnSave.ButtonClickEvent += (sender, e) =>
- {
- //淇濆瓨鍦烘櫙鏁版嵁
- this.SaveSceneData();
- };
+ //淇濆瓨鍦烘櫙鏁版嵁
+ this.SaveSceneData();
+ };
+
+ //鍒嗕韩鐨勫満鏅笉鑳戒繚瀛�
+ if (this.editorScene != null && this.editorScene.IsSharedScene == true)
+ {
+ btnSave.CanClick = false;
+ }
+ else if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶈兘淇濆瓨
+ btnSave.CanClick = false;
+ }
+ //濡傛灉鏄湁妯℃澘,鏈夎澶囩殑鏃跺��,鍦ㄦ病鏈夊彂閫佹垚鍔熶箣鍓�
+ else if (Common.Config.Instance.Home.TemplateMode == 2
+ && Common.Config.Instance.Home.SendTemplateSuccess == false)
+ {
+ btnSave.CanClick = false;
}
}
@@ -159,8 +172,8 @@
//鍦烘櫙鍥剧墖
this.btnScenePic = new ImageView();
btnScenePic.Y = Application.GetRealHeight(46);
- btnScenePic.Width = Application.GetMinRealAverage(887);
- btnScenePic.Height = Application.GetMinRealAverage(444);
+ btnScenePic.Width = this.GetPictrueRealSize(887);
+ btnScenePic.Height = this.GetPictrueRealSize(444);
btnScenePic.Radius = (uint)Application.GetRealHeight(17);
btnScenePic.Gravity = Gravity.CenterHorizontal;
if (this.editorScene == null)
@@ -182,12 +195,18 @@
btnZhezhao.Height = btnScenePic.Height;
btnZhezhao.Y = btnScenePic.Y;
btnZhezhao.Gravity = Gravity.CenterHorizontal;
- btnZhezhao.Radius = btnScenePic.Radius;
+ btnZhezhao.Radius = (uint)Application.GetRealHeight(17);
+ btnZhezhao.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
framePicBack.AddChidren(btnZhezhao);
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
//鎴块棿鍥剧墖閫夋嫨
@@ -224,6 +243,7 @@
//鍦烘櫙鍚嶇О
var rowScene = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.SceneName), this.cloneScene.Name);
rowScene.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.PleaseInputSceneName);
+ rowScene.txtInput.MaxByte = 32;//闄愬埗鍙兘杈撳叆32涓瓧鑺�
rowScene.Y = btnTitle.Bottom + Application.GetRealHeight(23);
frameBack.AddChidren(rowScene);
rowScene.InitControl();
@@ -247,6 +267,11 @@
this.nowRoomId = selectId;
};
}
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ rowBelong.CanClick = false;
+ }
}
#endregion
@@ -258,7 +283,7 @@
/// </summary>
private void InitAddTargetControl()
{
- if (this.frameTargetTableControl == null)
+ if (this.frameTargetTableControl == null || this.frameTargetTableControl.Parent == null)
{
//娣诲姞鐩爣鐨勭殑瀹瑰櫒鎺т欢
this.frameTargetTableControl = new FrameListControl();
@@ -289,13 +314,27 @@
//鏄剧ず娣诲姞鐩爣鑿滃崟
this.ShowAddTargetMenu();
};
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ rowAddTarget.CanClick = false;
+ }
+ //濡傛灉鏄湁妯℃澘,鏈夎澶囩殑鏃跺��,鍦ㄦ病鏈夊彂閫佹垚鍔熶箣鍓�
+ if (Common.Config.Instance.Home.TemplateMode == 2
+ && Common.Config.Instance.Home.SendTemplateSuccess == false)
+ {
+ rowAddTarget.CanClick = false;
+ }
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//浠庣綉鍏宠幏鍙栧満鏅殑鎵ц鐩爣
- var result = await this.GetSceneTargetList();
- //娣诲姞銆愭墽琛岀洰鏍囪銆�
- this.AddTargetRow();
+ var result = this.GetSceneTargetList();
+ if (result == true)
+ {
+ //娣诲姞銆愭墽琛岀洰鏍囪銆�
+ this.AddTargetRow();
+ }
});
}
@@ -395,12 +434,15 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
//缂栬緫
var btnEditor = rowDevice.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
{
- //闅愯棌鍙虫粦鑿滃崟
- rowDevice.HideMenu();
if (device.Type == DeviceType.DimmableLight//璋冨厜鍣�
|| device.Type == DeviceType.ColorDimmableLight)//褰╃伅
{
@@ -520,6 +562,11 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
//鍒犻櫎
var btnDelete = rowScene.AddDeleteControl();
btnDelete.ButtonClickEvent += (sender, e) =>
@@ -586,12 +633,15 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
//缂栬緫
var btnEditor = rowDelay.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
{
- //闅愯棌鍙虫粦鑿滃崟
- rowDelay.HideMenu();
//寤舵椂鏃堕棿閫夋嫨
var form = new AdjustTargetAddDelayTimeForm();
form.AddForm(data.DelayTime);
@@ -629,20 +679,25 @@
}
}
+ #endregion
+
+ #region 鈻� 鑾峰彇鎵ц鐩爣_______________________
+
/// <summary>
/// 浠庣綉鍏宠幏鍙栧満鏅殑鎵ц鐩爣
/// </summary>
/// <returns></returns>
- private async System.Threading.Tasks.Task<bool> GetSceneTargetList()
+ private bool GetSceneTargetList()
{
if (this.editorScene == null || this.listAdjustTarget != null)
{
return true;
}
+
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//鑾峰彇鎵ц鐩爣鍒楄〃
- var listData = await HdlSceneLogic.Current.GetAdjustTargetList(this.editorScene);
+ var listData = HdlSceneLogic.Current.GetAdjustTargetList(this.editorScene);
if (listData == null)
{
this.CloseProgressBar(ShowReLoadMode.YES);
@@ -675,7 +730,7 @@
//閭ｄ釜鐗规畩鐨勬帶浠�
this.frameBottomTemp = new FrameLayout();
frameBottomTemp.Height = bodyFrameLayout.Height - btnTemp.Yaxis + Application.GetRealHeight(23);
- this.listBodyControl.AddChidrenFrame(frameBottomTemp);
+ this.listBodyControl.AddChidren(frameBottomTemp);
}
#endregion
@@ -788,10 +843,10 @@
/// <summary>
/// 淇濆瓨鏂板缓鐨勫満鏅�
/// </summary>
- private async void SaveSceneDataByNewMode()
+ private void SaveSceneDataByNewMode()
{
//娣诲姞鍦烘櫙
- this.editorScene = await HdlSceneLogic.Current.AddNewSceneToGateway(this.cloneScene.Name, this.listAdjustTarget);
+ this.editorScene = HdlSceneLogic.Current.AddNewSceneToGateway(this.cloneScene.Name, this.listAdjustTarget);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -821,6 +876,9 @@
this.editorScene.IconPath = this.cloneScene.IconPath;
this.editorScene.Save();
+ //鏂板缓鍦烘櫙,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshAllForm = true;
+
HdlThreadLogic.Current.RunMain(() =>
{
//璋冪敤鍥炶皟鍑芥暟
@@ -840,6 +898,8 @@
var result = await HdlSceneLogic.Current.EditorSceneNameFromGateway(this.editorScene, this.cloneScene.Name);
if (result == false)
{
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
return;
}
}
@@ -847,10 +907,10 @@
{
//淇敼鍦烘櫙
var result = await HdlSceneLogic.Current.EditorSceneFromGateway(this.editorScene, this.listAdjustTarget);
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
if (result == false)
{
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
return;
}
}
@@ -860,6 +920,15 @@
//鍙樻洿鎴块棿
HdlSceneLogic.Current.ChangedSceneRoom(this.editorScene, this.nowRoomId);
}
+ else
+ {
+ //绉婚櫎鍑烘埧闂�
+ var room = HdlRoomLogic.Current.GetRoomBySceneId(this.editorScene.Id);
+ if (room != null)
+ {
+ HdlSceneLogic.Current.DeleteSceneFromRoom(room, this.editorScene);
+ }
+ }
//鍥剧墖鏀瑰彉浜�
if (isScenePictrueChanged == true)
@@ -867,7 +936,7 @@
if (this.editorScene.IconPathType != 0)
{
//鍒犻櫎鑷畾涔夊浘鐗�
- Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, this.editorScene.IconPath));
+ HdlFileLogic.Current.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, this.editorScene.IconPath));
HdlAutoBackupLogic.DeleteFile(this.editorScene.IconPath);
}
if (this.cloneScene.IconPathType != 0)
@@ -887,6 +956,12 @@
this.editorScene.IconPathType = this.cloneScene.IconPathType;
this.editorScene.IconPath = this.cloneScene.IconPath;
this.editorScene.Save();
+
+ //缂栬緫鍦烘櫙,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshAllForm = true;
+
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
HdlThreadLogic.Current.RunMain(() =>
{
@@ -942,11 +1017,9 @@
//榛樿鍥惧簱
menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.LocalPicture), () =>
{
- var localPic = new Device.Room.AddRoomSelectPicByLocal();
- UserView.HomePage.Instance.AddChidren(localPic);
- UserView.HomePage.Instance.PageIndex += 1;
- localPic.Show();
- localPic.action = (imgPath) =>
+ var form = new SelectLocalSceneImageForm();
+ form.AddForm();
+ form.FinishSelectEvent = (imgPath) =>
{
if (string.IsNullOrEmpty(imgPath) == true)
{
--
Gitblit v1.8.0