From d5088d3bb198c0f53d4716022f010a02ac393977 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 25 八月 2022 15:06:01 +0800
Subject: [PATCH] 2022年08月25日15:04:41
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 2072723..ab6ff1e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -117,7 +117,7 @@
/// </summary>
public void SceneMethod()
{
- var sceneList = LogicMethod.CurrLogicMethod.GetSceneList();
+ var sceneList = LogicMethod.Current.GetSceneList();
List<string> nameList = new List<string>();
for (int i = 0; i < sceneList.Count; i++)
{
@@ -125,20 +125,20 @@
nameList.Add(scene.name);
}
PublicInterface publicInterface = new PublicInterface();
- publicInterface.FrameOrVv(this, nameList, new List<string> { }, StringId.addSceneLogic, (index) =>
+ publicInterface.FrameOrVv(this, nameList, new List<string> { }, Language.StringByID(StringId.addSceneLogic), (index) =>
{
var sceneSelecetd = sceneList[index];
Input input = new Input();
input.sid = sceneSelecetd.sid;
input.condition_type = "10";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.CurrLogicMethod.dictionary(dic, "key", "scene");
- LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.CurrLogicMethod.dictionary(dic, "value", "on");
+ LogicMethod.Current.dictionary(dic, "key", "scene");
+ LogicMethod.Current.dictionary(dic, "comparator", "=");
+ LogicMethod.Current.dictionary(dic, "data_type", "string");
+ LogicMethod.Current.dictionary(dic, "value", "on");
input.condition.Add(dic);
AddCondition(input);
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.Current.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
@@ -156,7 +156,7 @@
///閫氳繃璋冭瘯瀹濈粰鐨勭粡绾害<鏍囧噯GPS>
double latitude = Entity.DB_ResidenceData.Instance.CurrentRegion.latitude;//绾害
double longitude = Entity.DB_ResidenceData.Instance.CurrentRegion.longitude;//缁忓害
- LogicMethod.CurrLogicMethod.WGS84_to_GCJ02(Entity.DB_ResidenceData.Instance.CurrentRegion.longitude, Entity.DB_ResidenceData.Instance.CurrentRegion.latitude, out longitude, out latitude);
+ LogicMethod.Current.WGS84_to_GCJ02(Entity.DB_ResidenceData.Instance.CurrentRegion.longitude, Entity.DB_ResidenceData.Instance.CurrentRegion.latitude, out longitude, out latitude);
int r = 500;//榛樿鍗婂緞
if (edit)
{
@@ -257,15 +257,15 @@
{
//楂樺痉鍧愭爣杞琖GS84鍧愭爣(楂樺痉鍦板浘璁剧疆GPS)
double out_lng, out_lat;
- LogicMethod.CurrLogicMethod.GCJ02_to_WGS84(mLongitude, mLatitude, out out_lng, out out_lat);
+ LogicMethod.Current.GCJ02_to_WGS84(mLongitude, mLatitude, out out_lng, out out_lat);
Input input = new Input();
- input.sid = LogicMethod.CurrLogicMethod.NewSid();
+ input.sid = LogicMethod.Current.NewSid();
input.condition_type = "8";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.CurrLogicMethod.dictionary(dic, "key", "direction");
- LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.CurrLogicMethod.dictionary(dic, "value", valueStr);
+ LogicMethod.Current.dictionary(dic, "key", "direction");
+ LogicMethod.Current.dictionary(dic, "comparator", "=");
+ LogicMethod.Current.dictionary(dic, "data_type", "string");
+ LogicMethod.Current.dictionary(dic, "value", valueStr);
input.condition.Add(dic);
//绾害
input.geo_fence.latitude = out_lat.ToString();
@@ -274,7 +274,7 @@
//鍗婂緞<鍗曚綅绫�>
input.geo_fence.radius = mRadius.ToString();
AddCondition(input);
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.Current.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
--
Gitblit v1.8.0