From a170a2ecef6d5c87883ed552dbbc81cfb0358d13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 16:43:53 +0800
Subject: [PATCH] Merge branch 'WJC' into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index a4aeaed..3097608 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -106,6 +106,14 @@
conditionArray.Add(conditionJOb);
}
inputTypeJOb.Add("condition",conditionArray);
+ if (dictionary.condition_type=="8") {
+ ///鍦扮悊鍥存爮
+ var geo_fencejob = new JObject();
+ geo_fencejob.Add("longitude", dictionary.geo_fence.longitude);
+ geo_fencejob.Add("latitude", dictionary.geo_fence.latitude);
+ geo_fencejob.Add("radius", dictionary.geo_fence.radius);
+ inputTypeJOb.Add("geo_fence", geo_fencejob);
+ }
inputArray.Add(inputTypeJOb);
}
@@ -217,6 +225,15 @@
conditionJOb.Add("data_type", dic["data_type"]);
conditionJOb.Add("value", dic["value"]);
conditionArray.Add(conditionJOb);
+ if (dictionary.condition_type == "8")
+ {
+ ///鍦扮悊鍥存爮
+ var geo_fencejob = new JObject();
+ geo_fencejob.Add("longitude", dictionary.geo_fence.longitude);
+ geo_fencejob.Add("latitude", dictionary.geo_fence.latitude);
+ geo_fencejob.Add("radius", dictionary.geo_fence.radius);
+ inputTypeJOb.Add("geo_fence", geo_fencejob);
+ }
}
inputTypeJOb.Add("condition", conditionArray);
inputArray.Add(inputTypeJOb);
@@ -333,6 +350,38 @@
}
return responsePackNew;
}
+
+
+ /// <summary>
+ /// 鑷姩鍖栧湴鐞嗗洿鏍忕姸鎬佷笂鎶�
+ /// </summary>
+ /// <param name="userLogicId">鑷姩鍖栦簯绔痠d<澶囨敞锛歭ogicSid涓巙serLogicId 涓嶈兘鍚屾椂涓虹┖></param>
+ /// <param name="logicSid">鑷姩鍖杝id<澶囨敞锛歭ogicSid涓巙serLogicId 涓嶈兘鍚屾椂涓虹┖></param>
+ /// <param name="direction">arrive:鍒拌揪(杩涘叆) leave锛氱寮�</param>
+ /// <returns></returns>
+ public static bool GeoFenceStateReport(string userLogicId, string logicSid, string direction)
+ {
+ var jObject = new JObject();
+ jObject.Add("homeId", LogicMethod.CurrLogicMethod.HomeId);
+ jObject.Add("userLogicId", userLogicId);
+ jObject.Add("sid", logicSid);
+ jObject.Add("direction", direction);
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_GeoFenceStateReport);
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ GeoFenceStateReport(userLogicId, logicSid, direction);
+ }
+ if (responsePackNew.Code == "0")
+ {
+ //鎴愬姛
+ return true;
+ }
+ //澶辫触
+ return false;
+ }
+
/// <summary>
///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
/// </summary>
--
Gitblit v1.8.0