From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/DAL/Server/NewApiRes.cs | 492 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 348 insertions(+), 144 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index da473ed..8b7a67a 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -17,7 +17,7 @@
[System.Serializable]
public class NullObj
{
-
+
}
#region 鈻� 鍏ㄧ悆鍖哄煙鍒楄〃 ____________________________
@@ -75,7 +75,7 @@
/// 楠岃瘉鐮侊紝鐭俊鐧诲綍鏃跺�欑敤
/// </summary>
public string verifyCode;
-
+
}
@@ -316,6 +316,10 @@
/// 鐧诲綍鍚�
/// </summary>
public string loginName;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
}
@@ -332,6 +336,18 @@
}
+ /// <summary>
+ /// 鏇存柊涓汉澶村儚
+ /// </summary>
+ [System.Serializable]
+ public class UpdateMemberHeadIconRes
+ {
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
+
+ }
/// <summary>
/// 缁戝畾璁よ瘉(鎵嬫満/閭)
@@ -351,7 +367,7 @@
/// 楠岃瘉鍚�
/// </summary>
public string verifyCode;
-
+
}
@@ -379,6 +395,10 @@
/// 浣忓畢绫诲瀷
/// </summary>
public string homeType;
+ /// <summary>
+ /// 涓嶈嚜鍔ㄧ敓鎴愰粯璁や綇瀹�
+ /// </summary>
+ public bool autoGenerate = false;
}
@@ -483,27 +503,42 @@
#endregion
#region 鑾峰彇浣忓畢缃戝叧鍒楄〃
- [Serializable]
- public class HomeGatewayRes
- {
- public int totalPages;
- public int totalElements;
- public bool last;
- public bool first;
- public int numberOfElements;
- public int size;
- public int number;
- public bool empty;
- public List<HomeGatewayInfo> content = new List<HomeGatewayInfo>();
- }
+ //[Serializable]
+ //public class HomeGatewayRes
+ //{
+ // public int totalPages;
+ // public int totalElements;
+ // public bool last;
+ // public bool first;
+ // public int numberOfElements;
+ // public int size;
+ // public int number;
+ // public bool empty;
+ // public List<HomeGatewayInfo> content = new List<HomeGatewayInfo>();
+ //}
[Serializable]
public class HomeGatewayInfo
{
/// <summary>
- /// 缃戝叧
+ /// 缃戝叧ID
/// </summary>
- public string id;
+ public string gatewayId;
+ /// <summary>
+ /// 缃戝叧snID
+ /// </summary>
+ public string sn;
+ /// <summary>
+ ///
+ /// </summary>
+ public string aesKey;
+ /// <summary>
+ /// BUSUDPGATEWAY,
+ /// AGATEWAY,
+ /// ZIGBEEGATEWAY,
+ /// KNXGATEWAY
+ /// </summary>
+ public string gatewayType;
/// <summary>
/// 浣忓畢ID
/// </summary>
@@ -511,31 +546,7 @@
/// <summary>
///
/// </summary>
- public string untieMark;
- /// <summary>
- ///
- /// </summary>
- public string gwFirmwareVersion;
- /// <summary>
- ///
- /// </summary>
public string mac;
- /// <summary>
- ///
- /// </summary>
- public string projectName;
- /// <summary>
- ///
- /// </summary>
- public string userName;
- /// <summary>
- ///
- /// </summary>
- public string groupName;
- /// <summary>
- ///
- /// </summary>
- public string gatewayName;
/// <summary>
///
/// </summary>
@@ -543,15 +554,8 @@
/// <summary>
///
/// </summary>
- public string aesKey;
- /// <summary>
- ///
- /// </summary>
public string encryptionType;
- /// <summary>
- ///
- /// </summary>
- public string gatewayType;
+
/// <summary>
/// 瀛愮綉鍙�
/// </summary>
@@ -560,7 +564,34 @@
/// 璁惧鍙�
/// </summary>
public int deviceId;
+ /// <summary>
+ /// 缃戝叧鐘舵��
+ /// ON_LINE(0,"鍦ㄧ嚎"),
+ /// OFF_LINE(1,"涓嬬嚎"),;
+ /// </summary>
+ public bool gatewayStatus;
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string gwFirmwareVersion;
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string projectName;
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string userName;
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string groupName;
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string gatewayName;
}
@@ -830,9 +861,9 @@
/// 鍒犻櫎瀛愯处鍙�
/// </summary>
[System.Serializable]
- public class ChildDeleteObj: ChildBaseObj
+ public class ChildDeleteObj : ChildBaseObj
{
-
+
}
/// <summary>
@@ -901,7 +932,7 @@
/// 鏇存柊瀛愯处鍙峰娉ㄥ悕瀛�
/// </summary>
[System.Serializable]
- public class UpdateChildNickNameObj: ChildBaseObj
+ public class UpdateChildNickNameObj : ChildBaseObj
{
/// <summary>
/// nickName
@@ -935,8 +966,23 @@
/// 鏄惁鍏佽鍒涘缓鍦烘櫙
/// </summary>
public bool isAllowCreateScene;
-
+
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ [System.Serializable]
+ public class AccountObj
+ {
+ /// <summary>
+ /// 璐﹀彿
+ /// </summary>
+ public string account;
+
+ }
+
+
#endregion
#region 鏁版嵁鍒嗕韩
@@ -1038,7 +1084,7 @@
/// <summary>
/// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
- public string software = "ON_Plus";
+ public string software = SoftwareType.ON_Plus.ToString();
}
/// <summary>
@@ -1057,13 +1103,17 @@
///
/// </summary>
[System.Serializable]
- public class GetMessageListObj: PushIdObj
+ public class GetMessageListObj : PushIdObj
{
/// <summary>
/// 浣忓畢涓婚敭id
/// 1銆佷紶绌烘煡璇㈠叏閮紙闇�瑕佹牴鎹敤鎴峰煙鍚嶆煡璇級 2銆佷紶鎸囧畾浣忓畢ID鏌ヨ鎸囧畾璁板綍 锛堥渶瑕佹牴鎹綇瀹呭煙鍚嶆煡璇級
/// </summary>
public string homeId;
+ /// <summary>
+ /// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
+ /// </summary>
+ public string pushType;
}
/// <summary>
@@ -1077,39 +1127,8 @@
/// </summary>
public string msgId;
}
-
- ///// <summary>
- ///// 鎺ㄩ�佹秷鎭垪琛�
- ///// </summary>
- //[System.Serializable]
- //public class PushMesInfoRes
- //{
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushId;
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushTitle;
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushContent;
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushType;
- // /// <summary>
- // ///
- // /// </summary>
- // public bool isRead;
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushDatetime;
- //}
+
#endregion
@@ -1135,68 +1154,99 @@
#region APP鐗堟湰妫�娴�
/// <summary>
- /// ForceUpdateObj
+ /// AppVersionCheckObj
/// </summary>
[System.Serializable]
- public class ForceUpdateObj
+ public class AppVersionCheckObj
{
- /// <summary>
- /// 鎵嬫満绫诲瀷
- ///
- /// 0鏄痠OS
- /// 1鏄疉ndroid
- /// 2鏄疉ndroid 鏂扮殑鍖呭悕鐗堟湰
- /// </summary>
- public int DeviceType = 0;
/// <summary>
///
/// </summary>
- public string requestVersion = MainPage.VersionString;
+ public string version = MainPage.VersionString;
/// <summary>
/// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
- public string software = "ON_Plus";
+ public string appName = SoftwareType.ON_Plus.ToString();
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [System.Serializable]
+ public class AppVersionRes
+ {
/// <summary>
- /// 璇█
+ /// 搴旂敤甯傚満鍚嶇О
/// </summary>
- public string languageType;
+ public string appMarket;
+ /// <summary>
+ /// app鍚嶇О
+ /// </summary>
+ public string appName;
+ /// <summary>
+ /// ios涓嬭浇鍦板潃
+ /// </summary>
+ public string iosUrl;
+ /// <summary>
+ /// 瀹夊崜涓嬭浇鍦板潃
+ /// </summary>
+ public string androidUrl;
+ /// <summary>
+ /// 鏄惁鏄己鍒舵洿鏂�
+ /// </summary>
+ public bool isEnforce;
+ /// <summary>
+ /// 鍙戝竷绯荤粺锛孖OS銆丄ndroid
+ /// </summary>
+ public string releaseSystem;
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string remark;
+ /// <summary>
+ /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
+ /// </summary>
+ public string updateDescription;
+ /// <summary>
+ /// 鐗堟湰鍙�
+ /// </summary>
+ public string version;
+ }
+
+ /// <summary>
+ /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
+ /// </summary>
+ public class ReasonStrJson
+ {
+ /// <summary>
+ /// 涓枃
+ /// </summary>
+ public string Chinese;
+ /// <summary>
+ /// 鑻辨枃
+ /// </summary>
+ public string English;
+ /// <summary>
+ ///
+ /// </summary>
+ public string Czech;
}
/// <summary>
/// 妫�娴嬫洿鏂拌繑鍥炲瓧娈�
/// </summary>
- public class ForceUpdateInfo
+ public class UpdateDialogInfo
{
-
+ ///// <summary>
+ ///// 闇�瑕佸己鍒舵洿鏂�
+ ///// </summary>
+ //public bool IsNeedForceUpdate;
/// <summary>
- /// 闇�瑕佸己鍒舵洿鏂�
- /// </summary>
- public bool IsNeedForceUpdate;
-
- /// <summary>
- /// 寮哄埗鏇存柊鍘熷洜
+ /// 1.鎻愮ず鏇存柊鐨勫唴瀹�
+ /// 2.寮哄埗鏇存柊鍘熷洜
+ /// 3.鎻愮ず鐨勯�氱煡鍐呭
/// </summary>
public string ReasonStr;
- /// <summary>
- /// 寮哄埗鏇存柊鍘熷洜
- /// </summary>
- public string ReasonStr_En;
-
- /// <summary>
- /// 鏂扮増鏈琲OS App Store涓嬭浇鍦板潃
- /// </summary>
- public string IosUrl;
-
- /// <summary>
- /// 鏂扮増鏈珹ndroid搴旂敤甯傚満涓嬭浇鍦板潃
- /// </summary>
- public string AndroidUrl;
-
- /// <summary>
- /// 鏂扮増鏈珹ndroid 鑻辨枃搴旂敤甯傚満涓嬭浇鍦板潃 Google Play
- /// </summary>
- public string AndroidUrl_En;
-
/// <summary>
/// O 涓嶉渶瑕佹洿鏂�
/// 1 鎻愮ず鏇存柊
@@ -1204,46 +1254,200 @@
/// 3 鎻愮ず閫氱煡鍐呭
/// </summary>
public int UpdateType;
-
/// <summary>
/// 褰撳墠鏂扮増鏈彿
/// </summary>
public string NewVersion;
+ /// <summary>
+ /// 褰撳墠鏂扮増鏈彿
+ /// </summary>
+ public string NewVersionUrl;
+ }
+
+ ///// <summary>
+ ///// 妫�娴婣PP鐗堟湰 鍝嶅簲鍙傛暟
+ ///// 濡傛灉鏄痠OS杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
+ ///// 濡傛灉鏄疉ndroid杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
+ ///// </summary>
+ //public class APPVersion
+ //{
+ // /// <summary>
+ // /// 褰撳墠鏈�鏂扮殑鐗堟湰鍙�
+ // /// </summary>
+ // public string NewVersion;
+
+ // /// <summary>
+ // /// 褰撳墠鏈�鏂扮増鏈笅杞藉湴鍧�
+ // /// </summary>
+ // public string NewVersionUrl;
+ //}
+
+
+ #endregion
+
+ #region 鏁版嵁鍒嗕韩
+ ///// <summary>
+ ///// 娣诲姞鍒嗕韩
+ ///// </summary>
+ //[System.Serializable]
+ //public class ShareData
+ //{
+ // /// <summary>
+ // /// 浣忓畢ID
+ // /// </summary>
+ // public int homeId;
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public List<ShareDatasItem> shareDatas;
+ // /// <summary>
+ // /// 瀛愯处鍙稩D
+ // /// </summary>
+ // public List<string> childAccountIds;
+ //}
+
+ /// <summary>
+ /// 娣诲姞鍒嗕韩
+ /// </summary>
+ [System.Serializable]
+ public class AddShareObj
+ {
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ ///
+ /// </summary>
+ public List<ShareData> shareDatas;
+ /// <summary>
+ /// 瀛愯处鍙稩D
+ /// </summary>
+ public List<string> childAccountIds;
}
/// <summary>
- /// 妫�娴婣PP鐗堟湰
+ ///
/// </summary>
- public class APPVersion
+ public class ShareData
{
-
/// <summary>
- /// 鏂扮増鏈琲OS App Store涓嬭浇鍦板潃
+ /// 鍒嗕韩绫诲瀷琛╥d
/// </summary>
- public string IosUrl;
-
+ public string shareTypeId;
/// <summary>
- /// 鏂扮増鏈珹ndroid搴旂敤甯傚満涓嬭浇鍦板潃
+ /// 瀛愬笎鍙稩D
/// </summary>
- public string AndroidUrl;
-
+ public string childAccountId;
/// <summary>
- /// 褰撳墠iOS鏈�鏂扮増鏈彿
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
/// </summary>
- public string IosVersion;
+ public string shareType = "DEVICE";
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍒嗕韩
+ /// </summary>
+ [System.Serializable]
+ public class DeleteShareObj
+ {
/// <summary>
- /// 褰撳墠Android鏈�鏂扮増鏈彿
+ /// 浣忓畢ID
/// </summary>
- public string AndroidVersion;
+ public string homeId;
+ /// <summary>
+ ///
+ /// </summary>
+ public List<ShareData> shareDatas;
+ }
+ /// <summary>
+ /// 鑾峰彇鍒嗕韩
+ /// </summary>
+ [System.Serializable]
+ public class GetShareObj
+ {
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ /// 瀛愯处鍙稩D
+ /// </summary>
+ public string childAccountId;
+ /// <summary>
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// </summary>
+ public string shareType = "DEVICE";
+ }
+
+ #endregion
+
+
+ #region 鍥剧墖涓婁紶涓嬭浇
+ /// <summary>
+ /// 涓婁紶鍥剧墖
+ /// </summary>
+ [System.Serializable]
+ public class UploadImageObj
+ {
+ /// <summary>
+ /// 鍓嶇紑鏍囪瘑
+ /// </summary>
+ public string prefix;
+ /// <summary>
+ /// 鍏宠仈ID
+ /// </summary>
+ public string uid;
+ /// <summary>
+ /// 鏂囦欢鍚嶇О
+ /// </summary>
+ public string fileName;
+ /// <summary>
+ /// 鍥剧墖浜岃繘鍒舵祦
+ /// </summary>
+ public byte[] content;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍥剧墖璺緞
+ /// </summary>
+ [System.Serializable]
+ public class GetImageUrlObj
+ {
+ /// <summary>
+ /// 鍥剧墖涓嬭浇璺緞鏍囪瘑
+ /// </summary>
+ public string imageKey;
}
#endregion
+
#endregion
+ /// <summary>
+ /// 鏋佸厜鎺ㄩ�佹秷鎭�
+ /// </summary>
+ [System.Serializable]
+ public class JPushMessageInfo
+ {
+ /// <summary>
+ /// 鎺ㄩ�佹爣棰�
+ /// </summary>
+ public string Title;
+ /// <summary>
+ /// 鎺ㄩ�佸唴瀹�
+ /// </summary>
+ public string Content;
+ /// <summary>
+ /// 鎺ㄩ�侀檮鍔犳暟鎹�
+ /// </summary>
+ public string Extras;
+
+ }
//#region 鏃ф帴鍙�
///// <summary>
--
Gitblit v1.8.0