From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
index 3b90c1d..88eae1f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -82,6 +82,11 @@
/// <param name="useLocalConnect">鏄惁寮哄埗浣跨敤鏈湴杩炴帴鍙戦��</param>
public bool RefreshSceneUIList(bool useLocalConnect)
{
+ if (Config.Instance.Home.TemplateMode == 2 && Config.Instance.Home.SendTemplateSuccess == false)
+ {
+ //濡傛灉鏄湁妯℃澘鏈夎澶囨ā寮�,浣嗘槸杩樻病鏈夊鍏ユ垚鍔熺殑鎯呭喌涓�,涓嶅厑璁稿埛鏂板満鏅垪琛�
+ return true;
+ }
//鑾峰彇缃戝叧瀛樺湪鐨勫満鏅�
var sceneList = this.RefreshSceneListFromGateway(useLocalConnect);
if (sceneList == null)
@@ -247,9 +252,12 @@
//濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
if (Config.Instance.Home.IsVirtually == false)
{
+ var mainWay = ZbGateway.MainGateWay;
+ if (mainWay == null) { return null; }
+
//鑾峰彇鏂板缓涓�涓満鏅殑鍛戒护瀛楃
var strCommand = this.GetAddNewSceneCommand(sceneName);
- var result = HdlGatewayLogic.Current.SendJobjectDataToGateway(ZbGateway.MainGateWay, "Scene/GetNewId", strCommand, "Scene/GetNewId_Respon");
+ var result = HdlGatewayLogic.Current.SendJobjectDataToGateway(mainWay.GwId, "Scene/GetNewId", strCommand, "Scene/GetNewId_Respon");
if (result.ErrorMsg != null)
{
this.ShowTipMsg(result.ErrorMsg);
@@ -326,12 +334,14 @@
return listAdjustTarget;
}
var listSuccess = new List<Scene.DeviceListData>();
+ var mainWay = ZbGateway.MainGateWay;
+ if (mainWay == null) { return listSuccess; }
//鑾峰彇娣诲姞鎵ц鐩爣鍒板満鏅殑鍛戒护
var listCommand = this.GetAddTargetToSceneCommand(sceneId, listAdjustTarget);
for (int i = 0; i < listCommand.Count; i++)
{
- var result = HdlGatewayLogic.Current.SendJobjectDataToGateway(ZbGateway.MainGateWay, "Scene/AddMember", listCommand[i], "Scene/AddMember_Respon");
+ var result = HdlGatewayLogic.Current.SendJobjectDataToGateway(mainWay.GwId, "Scene/AddMember", listCommand[i], "Scene/AddMember_Respon");
if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
{
//鍑虹幇閿欒
@@ -957,11 +967,22 @@
listAdjustTarget.AddRange(i_scene.AdjustTargetList);
return listAdjustTarget;
}
+ //濡傛灉鏄湁妯℃澘,鏈夎澶囩殑鏃跺��,鍦ㄦ病鏈夊彂閫佹垚鍔熶箣鍓�,涓嶅厑璁稿埛鏂版墽琛岀洰鏍囧璞�
+ if (Common.Config.Instance.Home.TemplateMode == 2
+ && Common.Config.Instance.Home.SendTemplateSuccess == false)
+ {
+ var listAdjustTarget = new List<Scene.DeviceListData>();
+ listAdjustTarget.AddRange(i_scene.AdjustTargetList);
+ return listAdjustTarget;
+ }
+ var mainWay = ZbGateway.MainGateWay;
+ if (mainWay == null) { return null; }
+
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 806 } };
var data = new Newtonsoft.Json.Linq.JObject { { "ScenesId", i_scene.Id } };
jObject.Add("Data", data);
//鍙戦�佸懡浠�
- var result = HdlGatewayLogic.Current.SendJobjectDataToGateway(ZbGateway.MainGateWay, "Scene/GetDeviceList", jObject.ToString(), "Scene/GetDeviceList_Respon");
+ var result = HdlGatewayLogic.Current.SendJobjectDataToGateway(mainWay.GwId, "Scene/GetDeviceList", jObject.ToString(), "Scene/GetDeviceList_Respon");
if (result.ErrorMsg != null)
{
--
Gitblit v1.8.0