From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Common/SendDataToServer.cs | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 108 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SendDataToServer.cs b/ZigbeeApp/Shared/Common/SendDataToServer.cs
old mode 100755
new mode 100644
index a47e25b..98c9fff
--- a/ZigbeeApp/Shared/Common/SendDataToServer.cs
+++ b/ZigbeeApp/Shared/Common/SendDataToServer.cs
@@ -185,6 +185,10 @@
public class LoginObj
{
/// <summary>
+ /// RequestVersion
+ /// </summary>
+ public string RequestVersion = CommonPage.RequestVersion;
+ /// <summary>
/// 鐢ㄦ埛璐︽埛
/// </summary>
public string Account;
@@ -193,15 +197,10 @@
/// </summary>
public string Password;
/// <summary>
- /// 鐧诲綍鏉ユ簮,涓昏鏄负浜嗗尯鍒嗘娆＄櫥褰曟槸鏉ユ簮OnApp杩樻槸Zigbee App
- /// 榛樿鍊�: null
+ /// 鐧诲綍鏉ユ簮,0:Zigbee
/// </summary>
- public string Source;
- /// <summary>
- /// Company 鍏徃缂栧彿(0:HDL鐭俊楠岃瘉鐮� 1:鐭俊鎺у埗 2:閰掑簵鎺у埗 3:蹇樿瀵嗙爜 100:瀹夋嵎鍢� 101:鎯冲ぉ 102:瀹夌櫨绾� 103:棣栧煄鐝戠幒)
- /// 榛樿鍊�: 0
- /// </summary>
- public int Company;
+ public string RequestSource = "0";
+
}
#endregion
@@ -226,6 +225,10 @@
///绗笁鏂圭敤鎴峰敮涓�鏍囪瘑
/// </summary>
public string OpenID;
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string UserName;
}
/// <summary>
@@ -572,7 +575,104 @@
/// 璇峰～鍏ヨ澶囩殑绫诲瀷锛屽彧鑳戒负銆恑phone銆戝拰銆恆ndroid銆�
/// </summary>
public string DeviceType;
+ /// <summary>
+ /// 3锛欵voyo Home
+ /// </summary>
+ public int Software = 3;
}
#endregion
+
+ #region 瀹氭椂涓婁紶瀹炴椂GPS淇℃伅
+ /// <summary>
+ /// 瀹氭椂涓婁紶瀹炴椂GPS淇℃伅
+ /// </summary>
+ public class ReceiveAppLatAndLonObj
+ {
+ /// <summary>
+ /// 缁忓害
+ /// </summary>
+ public string Latitude;
+ /// <summary>
+ /// 绾害
+ /// </summary>
+ public string Longitude;
+ }
+ #endregion
+
+
+ /// <summary>
+ /// 鏋佸厜鎺ㄩ�佹秷鎭�
+ /// </summary>
+ [System.Serializable]
+ public class JPushMessageInfo
+ {
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HomeId;
+ /// <summary>
+ /// 鎺ㄩ�佹爣棰�
+ /// </summary>
+ public string Title;
+ /// <summary>
+ /// 鎺ㄩ�佸唴瀹�
+ /// </summary>
+ public string Content;
+ /// <summary>
+ /// 鎺ㄩ�侀檮鍔犳暟鎹�
+ /// </summary>
+ public string Extras;
+ /// <summary>
+ /// 淇℃伅绫诲瀷
+ /// </summary>
+ public string messageType = "";
+ /// <summary>
+ /// 鎵╁睍鏁版嵁鍐呭
+ /// </summary>
+ public string expantContent = "";
+ /// <summary>
+ /// spk鏍囧織锛屽�间负door.gate鏃惰〃绀鸿嚜鐮�
+ /// </summary>
+ public string spk = "";
+ /// <summary>
+ /// sip璐﹀彿
+ /// </summary>
+ public string sipAccount;
+
+ }
+
+ /// <summary>
+ /// 鏋佸厜鎺ㄩ�佹秷鎭�
+ /// </summary>
+ [System.Serializable]
+ public class JPushExpandData
+ {
+ /// <summary>
+ /// 闄勫姞鍐呭
+ /// </summary>
+ public string expandData;
+
+ }
+
+ /// <summary>
+ /// 鏋佸厜鎺ㄩ�佹秷鎭�
+ /// </summary>
+ [System.Serializable]
+ public class ExpandData
+ {
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ /// 闄勫姞鍐呭
+ /// </summary>
+ public string expantContent;
+ /// <summary>
+ /// 淇℃伅绫诲瀷
+ /// </summary>
+ public string messageType;
+ }
+
}
}
--
Gitblit v1.8.0