From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs
index d56b3e2..91f7e88 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs
@@ -55,11 +55,11 @@
{
/// <summary>
/// Error鍙傛暟鍚箟
- ///<para>1锛氱綉鍏虫棤娉曡В鏋愬懡浠ゆ暟鎹��</para>
+ ///<para>1锛氱綉鍏虫棤娉曡В鏋愬懡浠ゆ暟鎹��</para>
///<para>2锛氬崗璋冨櫒姝ｅ湪鍗囩骇鎴栧浠�/鎭㈠鏁版嵁
- ///<para>3锛氭搷浣滆澶�/缁�/鍦烘櫙涓嶅瓨鍦�</para>
- ///<para>4锛氬叾浠栭敊璇�</para>
- ///<para>5锛氭暟鎹紶杈撻敊璇紙鍦ㄦ煇娆″鎴风鍚戠綉鍏冲彂閫佹暟鎹殑杩囩▼涓紝缃戝叧鍦ㄥ悎鐞嗘椂闂磋寖鍥村唴鎺ユ敹瀹㈡埛绔暟鎹笉瀹屾暣瀵艰嚧璇ラ敊璇彂鐢熴�傚瀹㈡埛绔悜缃戝叧涓�娆″彂閫�100涓瓧鑺傜殑鏁版嵁锛屼絾缃戝叧绛夊緟鎺ユ敹浜嗕竴绉掑彧鎺ユ敹浜�80涓瓧鑺傘�傚彂鐢熻閿欒锛岀綉鍏冲皢涓诲姩鍏抽棴瀹㈡埛绔繛鎺ワ級</para>
+ ///<para>3锛氭搷浣滆澶�/缁�/鍦烘櫙涓嶅瓨鍦�</para>
+ ///<para>4锛氬叾浠栭敊璇�</para>
+ ///<para>5锛氭暟鎹紶杈撻敊璇紙鍦ㄦ煇娆″鎴风鍚戠綉鍏冲彂閫佹暟鎹殑杩囩▼涓紝缃戝叧鍦ㄥ悎鐞嗘椂闂磋寖鍥村唴鎺ユ敹瀹㈡埛绔暟鎹笉瀹屾暣瀵艰嚧璇ラ敊璇彂鐢熴�傚瀹㈡埛绔悜缃戝叧涓�娆″彂閫�100涓瓧鑺傜殑鏁版嵁锛屼絾缃戝叧绛夊緟鎺ユ敹浜嗕竴绉掑彧鎺ユ敹浜�80涓瓧鑺傘�傚彂鐢熻閿欒锛岀綉鍏冲皢涓诲姩鍏抽棴瀹㈡埛绔繛鎺ワ級</para>
/// </summary>
public int Error;
}
@@ -142,17 +142,17 @@
/// <para>sceneName:鍙栬鍦烘櫙鐨勫悕瀛�</para>
/// </summary>
public static async System.Threading.Tasks.Task<GetSceneIdAllData> GetSceneNewIdAsync(string sceneName)
- {
+ {
return await System.Threading.Tasks.Task.Run(async () =>
{
GetSceneIdAllData d = null;
var mainGateway = ZbGateway.MainGateWay;
if (mainGateway == null)
{
- d = new GetSceneIdAllData {errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
+ d = new GetSceneIdAllData {errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
return d;
}
-
+
Action<string, string> action = (topic, message) =>
{
var gatewayID = topic.Split('/')[0];
@@ -222,7 +222,7 @@
if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
d = new GetSceneIdAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
-
+
}
mainGateway.Actions -= action;
System.Console.WriteLine("Scene/GetNewId_Actions 閫�鍑�" + System.DateTime.Now.ToString());
@@ -282,7 +282,7 @@
///鑾峰彇涓�涓満鏅殑鎵�鏈変俊鎭� .
///</summary>
public static async System.Threading.Tasks.Task<GetSceneAllData> GetSceneAllInfoAsync()
- {
+ {
return await System.Threading.Tasks.Task.Run(async () => {
GetSceneAllData d = null;
var mainGateway = ZbGateway.MainGateWay;
@@ -310,7 +310,7 @@
{
d = new GetSceneAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error)};
}
- }
+ }
if (topic == gatewayID + "/" + "Scene/GetAllInfo_Respon")
{
@@ -396,7 +396,7 @@
/// 鑾峰彇鎵�鏈夊満鏅殑鎵�鏈変俊鎭�
/// </summary>
[System.Serializable]
- public class GetSceneAllInfo:CommonDevice
+ public class GetSceneAllInfo:CommonDevice
{
/// <summary>
///鍦烘櫙鎬绘暟
@@ -486,7 +486,7 @@
-
+
}
/// <summary>
@@ -497,17 +497,17 @@
{
/// <summary>
/// 浠诲姟绫诲瀷銆�
- ///<para>1锛氬紑鍏� 锛堣澶囧叿鏈夊紑鍏冲姛鑳芥椂鍙敤锛�</para>
- ///<para>3锛氫寒搴﹁皟鏁达紙璁惧鍏锋湁浜害璋冭妭鍔熻兘鏃跺彲鐢級</para>
- ///<para>4锛氶鑹茶皟鏁� 锛堣澶囧叿鏈夐鑹茶皟鑺傚姛鑳芥椂鍙敤锛�</para>
- ///<para>5锛氭亽娓╁櫒锛堣澶囧叿鏈夋亽娓╁櫒鍔熻兘鏃跺彲鐢級</para>
- ///<para>6: 绐楀笜璁惧锛堣澶囧叿鏈夌獥甯樺姛鑳芥椂鍙敤锛�</para>
- ///<para>7锛氳澶噄dentify璇嗗埆銆�</para>
- ///<para>8锛氬紑鍏虫姤璀︽ā寮� </para>
+ ///<para>1锛氬紑鍏� 锛堣澶囧叿鏈夊紑鍏冲姛鑳芥椂鍙敤锛�</para>
+ ///<para>3锛氫寒搴﹁皟鏁达紙璁惧鍏锋湁浜害璋冭妭鍔熻兘鏃跺彲鐢級</para>
+ ///<para>4锛氶鑹茶皟鏁� 锛堣澶囧叿鏈夐鑹茶皟鑺傚姛鑳芥椂鍙敤锛�</para>
+ ///<para>5锛氭亽娓╁櫒锛堣澶囧叿鏈夋亽娓╁櫒鍔熻兘鏃跺彲鐢級</para>
+ ///<para>6: 绐楀笜璁惧锛堣澶囧叿鏈夌獥甯樺姛鑳芥椂鍙敤锛�</para>
+ ///<para>7锛氳澶噄dentify璇嗗埆銆�</para>
+ ///<para>8锛氬紑鍏虫姤璀︽ā寮� </para>
///<para>9锛歴quawk command</para>
///</summary>
public int TaskType;
- /// <summary>
+ /// <summary>
/// Data1鍙栧��
/// <para>寮�鍏� :Data1锛堟暟鍊硷級: 0鍏�/1寮�</para>
///<para>浜害璋冩暣 Data1锛堟暟鍊硷級锛氫寒搴﹀��</para>
@@ -520,16 +520,16 @@
/// </summary>
public int Data1;
/// <summary>
- /// Data2鍙栧��
+ /// Data2鍙栧��
/// <para>寮�鍏� Data2锛堟暟鍊硷級: 0</para>
/// <para>浜害璋冩暣 Data2锛堟暟鍊硷級: 0</para>
/// <para>棰滆壊璋冩暣 Data2锛堟暟鍊硷級锛氶ケ鍜屽害 </para>
- ///<para> 鎭掓俯鍣―ata2鏁板�煎涓嬶細
+ ///<para> 鎭掓俯鍣―ata2鏁板�煎涓嬶細
/// 銆愬綋Data1=0|1|2鏃讹紝Data2涓鸿鍙樺寲鐨勫害鏁帮紝鍗曚綅锛�0.1鈩� 銆傘��
///銆愯嫢Data1=3锛孌ata2涓鸿璁惧畾鐨勭┖璋冩ā寮忥紙0-9锛夛紝0锛歰ff锛�1锛歛uto锛�3锛歝ool锛� 4锛歨eat 锛�5锛歟mergency heating, 6锛歱recooling锛�7锛歠an only 锛�8锛歞ry锛�9锛歴leep銆傘��
///銆愯嫢Data1=4|5锛孌ata2涓哄姞鐑垨鍒跺喎搴︽暟锛屽崟浣�0.01鎽勬皬搴︺�傘��
///銆愯嫢Data1=6锛孌ata2涓鸿璁惧畾鐨勯鎵囨ā寮忥紙0-6锛夛紝0锛歰ff锛�1锛歭ow锛�2锛歮edium锛�3锛歨igh锛�4锛歰n锛�5锛歛uto锛�6锛歴mart銆� </para>
- ///<para>绐楀笜璁惧锛孌ata2鏁板�煎涓�
+ ///<para>绐楀笜璁惧锛孌ata2鏁板�煎涓�
///銆愬綋Data1=4鎴�7锛孌ata2涓鸿皟鏁寸殑楂樺害鎴栧�炬枩瑙掑害 鍊炬枩瑙掑害鍗曚綅涓�0.1掳銆戙��
///銆愬綋Data1=5 鎴� 8锛孌ata2涓虹櫨鍒嗘瘮锛�0-100琛ㄧず0%-100%銆�</para>
///<para>璁惧identify璇嗗埆銆侱ata2锛堟暟鍊硷級: 0 </para>
@@ -746,7 +746,7 @@
/// 鍦烘櫙鍒楄〃涓殑鍏蜂綋淇℃伅
/// </summary>
[System.Serializable]
- public class ScenesListInfo:CommonDevice
+ public class ScenesListInfo:CommonDevice
{
/// <summary>
/// 鍦烘櫙ID
@@ -772,7 +772,7 @@
///鑾峰彇褰撳墠鍦烘櫙涓殑璁惧鍒楄〃淇℃伅
/// </summary>
public static async System.Threading.Tasks.Task<GetSceneDeviceListAllInfo> GetSceneDeviceListAsync(int scenesId)
- {
+ {
return await System.Threading.Tasks.Task.Run(async () =>
{
GetSceneDeviceListAllInfo d = null;
@@ -806,7 +806,7 @@
{
var sceneTemp = new Scene() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
sceneTemp.sceneGetDeviceListObj = Newtonsoft.Json.JsonConvert.DeserializeObject<GetSceneDeviceListInfo>(jobject["Data"].ToString());
-
+
if (sceneTemp.sceneGetDeviceListObj == null)
{
d = new GetSceneDeviceListAllInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
@@ -822,7 +822,7 @@
{
sDev.DeviceList = sceneTemp.sceneGetDeviceListObj.DeviceList;
}
-
+
d = new GetSceneDeviceListAllInfo { getSceneDeviceListInfo = sceneTemp.sceneGetDeviceListObj };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
@@ -839,13 +839,13 @@
mainGateway.Send(("Scene/GetDeviceList"),System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
}
catch { }
-
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
-
+
await System.Threading.Tasks.Task.Delay(10);
-
+
if (d != null)
{
break;
@@ -901,7 +901,7 @@
///鍦烘櫙ID
/// </summary>
public int ScenesId;
-
+
/// <summary>
///鍦烘櫙鏄惁澶勪簬寮�鍚姸鎬�
///0锛氬満鏅病鏈夊紑鍚�
@@ -926,12 +926,12 @@
/// <summary>
/// 娣诲姞鐩爣鍒扮綉鍏冲埌鍦烘櫙涓��
/// <para>杩斿洖缁撴灉Result 1 鍔犲叆鎴愬姛</para>
- /// <para>杩斿洖缁撴灉Result 0 鍔犲叆澶辫触</para>
+ /// <para>杩斿洖缁撴灉Result 0 鍔犲叆澶辫触</para>
/// </summary>
/// <returns>The scene member.</returns>
/// <param name="scenesId">Scenes identifier.</param>
public static async System.Threading.Tasks.Task<AddSceneMemberResponseAllData> AddSceneMemberAsync(AddSceneMemberData sceneMemberData)
- {
+ {
return await System.Threading.Tasks.Task.Run(async () =>
{
AddSceneMemberResponseAllData d = null;
@@ -1083,7 +1083,7 @@
}
/// <summary>
- /// 鑾峰彇鍦烘櫙涓坊鍔犵殑鎴愬憳
+ /// 鑾峰彇鍦烘櫙涓坊鍔犵殑鎴愬憳
/// </summary>
public AddSceneMemberResponseData addSceneMemberData;
/// <summary>
@@ -1126,7 +1126,7 @@
public string DeviceAddr;
/// <summary>
- /// 璁惧绔彛鍙�
+ /// 璁惧绔彛鍙�
/// </summary>
public int Epoint;
@@ -1184,7 +1184,7 @@
/// </summary>
public string DeviceAddr;
/// <summary>
- /// 璁惧绔彛鍙�
+ /// 璁惧绔彛鍙�
/// <para>Type=0鏃跺瓨鍦�</para>
/// </summary>
public int Epoint;
@@ -1196,16 +1196,16 @@
}
#endregion
- #region 浠庣綉鍏崇殑鍦烘櫙涓Щ闄よ澶�
+ #region 浠庣綉鍏崇殑鍦烘櫙涓Щ闄よ澶�
/// <summary>
/// 浠庣綉鍏崇殑鍦烘櫙涓Щ闄よ澶�.
/// <para>杩斿洖缁撴灉Result/RemoveResult 1锛氱Щ闄ゅけ璐ワ紝鎴愬憳涓嶅瓨鍦ㄥ満鏅腑</para>
- /// <para>杩斿洖缁撴灉Result/RemoveResult 0锛氱Щ闄ゆ垚鍔熻触</para>
+ /// <para>杩斿洖缁撴灉Result/RemoveResult 0锛氱Щ闄ゆ垚鍔熻触</para>
/// </summary>
/// <returns>The scene member.</returns>
/// <param name="scenesId">Scenes identifier.</param>
public static async System.Threading.Tasks.Task<RemoveSceneMemberResponseAllData> RemoveSceneMemberAsync(SceneRemoveMemberData sceneRemoveMemberData)
- {
+ {
return await System.Threading.Tasks.Task.Run(async () =>
{
RemoveSceneMemberResponseAllData d = null;
@@ -1303,7 +1303,7 @@
}
}
catch{}
-
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -1473,14 +1473,14 @@
/// </summary>
public int ElseScenesId;
}
- #endregion
+ #endregion
#region 淇敼鍦烘櫙鍚嶇О
///<summary >
/// 淇敼鍦烘櫙鍚嶇О.
/// </summary>
public static async System.Threading.Tasks.Task<SceneRenameResponseAllData> RenameSceneAsync(int scenesId, string scenesName)
- {
+ {
return await System.Threading.Tasks.Task.Run(async () =>
{
SceneRenameResponseAllData d = null;
@@ -1536,7 +1536,7 @@
mainGateway.Send(("Scene/Rename"),System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
}
catch {}
-
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -1620,7 +1620,7 @@
///<para>杩斿洖缁撴灉 2 娌℃湁璇ュ満鏅�</para>
/// </summary>
public static async System.Threading.Tasks.Task<RemoveSceneAllData> DeleteSceneAsync(int scenesId)
- {
+ {
return await System.Threading.Tasks.Task.Run(async () =>
{
RemoveSceneAllData d =null;
@@ -1686,7 +1686,7 @@
mainGateway.Send(("Scene/Remove"),jObject.ToString());
}
catch {}
-
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -1762,7 +1762,7 @@
/// <para>DelayTime:寤舵椂鎵ц鏃堕棿锛屽崟浣嶇</para>
/// </summary>
public static async System.Threading.Tasks.Task<SceneOpenAllData> ControlSceneAsync(int ScenesId,int delayTime)
- {
+ {
return await System.Threading.Tasks.Task.Run(async () =>
{
SceneOpenAllData d = null;
@@ -1817,7 +1817,7 @@
mainGateway.Send(("Scene/Open"),System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
}
catch {}
-
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime )
{
@@ -1895,7 +1895,7 @@
}
#endregion
- #region 鏌ョ湅姝ｅ湪寤舵椂鐨勫満鏅�
+ #region 鏌ョ湅姝ｅ湪寤舵椂鐨勫満鏅�
/// <summary>
/// 鏌ョ湅姝ｅ湪寤舵椂鐨勫満鏅�.
/// </summary>
@@ -1970,7 +1970,7 @@
return d;
});
}
-
+
/// <summary>
/// 鏌ョ湅姝ｅ湪寤舵椂鐨勫満鏅俊鎭俊鎭弽棣�,缃戝叧鍙嶉淇℃伅
/// </summary>
@@ -2005,9 +2005,9 @@
/// </summary>
[System.Serializable]
public class CatDelaySceneResponseData
- {
+ {
/// <summary>
- /// 姝ｅ湪寤舵椂鎵ц鐨勫満鏅�
+ /// 姝ｅ湪寤舵椂鎵ц鐨勫満鏅�
/// </summary>
public List<DelayScenesListResponseInfo> DelayScenesList = new List<DelayScenesListResponseInfo>();
}
@@ -2032,7 +2032,7 @@
/// </summary>
public int RemainTime;
}
- #endregion
+ #endregion
///<summary >
/// 鍦烘櫙琚牬鍧忓弽棣�
@@ -2216,4 +2216,4 @@
// gateway.Send(("Scene/Open"), Common.SecuritySet.Encryption((jobject.ToString())));
//}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0