From cb20b108eca5dca69866ad741f35c612fc648a3a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 10:24:36 +0800
Subject: [PATCH] 代码合并
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 7b58122..ced74cc 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -33,15 +33,9 @@
{
get
{
- return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.id;
}
}
-
- /// <summary>
- /// 涔愭subAccessToken
- /// </summary>
- public static string LcSubAccessToken = "";
-
/// <summary>
/// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
/// </summary>
@@ -49,7 +43,7 @@
{
get
{
- return Entity.DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
}
}
/// <summary>
@@ -177,13 +171,13 @@
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Ir_CodeStudy);
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
- Method method = new Method();
- Method.buttondata = "";
+ PirMethod method = new PirMethod();
+ PirMethod.buttondata = "";
cloud = method.MqttDate("鎸夐敭", control.sid, 25);
}
else
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.ErrorShow(responsePackNew, "");
}
}
--
Gitblit v1.8.0