From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
index 62a53db..8cf158b 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;
}
}
@@ -189,6 +202,11 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
//鎴块棿鍥剧墖閫夋嫨
@@ -249,6 +267,11 @@
this.nowRoomId = selectId;
};
}
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ rowBelong.CanClick = false;
+ }
}
#endregion
@@ -291,6 +314,17 @@
//鏄剧ず娣诲姞鐩爣鑿滃崟
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(() =>
{
@@ -400,6 +434,11 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
//缂栬緫
var btnEditor = rowDevice.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
@@ -523,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) =>
@@ -589,6 +633,11 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
//缂栬緫
var btnEditor = rowDelay.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
--
Gitblit v1.8.0