From 52e05a5fb6e07afbb14960fc3cbb8a8971e19eb2 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 25 十一月 2020 20:08:56 +0800
Subject: [PATCH] 2020-11-25 1.TOKEN过期刷新处理
---
HDL_ON/DAL/Server/NewApiRes.cs | 225 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 189 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 7c3ad7e..da473ed 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -405,6 +405,10 @@
/// 浣忓畢鍚嶇О
/// </summary>
public string homeName;
+ /// <summary>
+ /// 浣忓畢鍦板潃
+ /// </summary>
+ public string Address;
}
@@ -780,6 +784,21 @@
#region 娣诲姞銆佹煡璇€�佸垹闄ゅ瓙璐﹀彿
/// <summary>
+ /// ChildBaseObj
+ /// </summary>
+ [System.Serializable]
+ public class ChildBaseObj
+ {
+ /// <summary>
+ /// 瀛愯处鍙稩D childAccountId
+ /// </summary>
+ public string childAccountId;
+ /// <summary>
+ /// 浣忓畢
+ /// </summary>
+ public string homeId;
+ }
+ /// <summary>
/// 娣诲姞瀛愯处鍙�
/// </summary>
[System.Serializable]
@@ -811,16 +830,9 @@
/// 鍒犻櫎瀛愯处鍙�
/// </summary>
[System.Serializable]
- public class ChildDeleteObj
+ public class ChildDeleteObj: ChildBaseObj
{
- /// <summary>
- ///
- /// </summary>
- public string childAccountId;
- /// <summary>
- /// 浣忓畢
- /// </summary>
- public string homeId;
+
}
/// <summary>
@@ -885,21 +897,24 @@
}
+ /// <summary>
+ /// 鏇存柊瀛愯处鍙峰娉ㄥ悕瀛�
+ /// </summary>
+ [System.Serializable]
+ public class UpdateChildNickNameObj: ChildBaseObj
+ {
+ /// <summary>
+ /// nickName
+ /// </summary>
+ public string nickName;
+ }
/// <summary>
/// 鏇存柊杩滅▼鎺у埗
/// </summary>
[System.Serializable]
- public class UpdateRemoteObj
+ public class UpdateRemoteObj : ChildBaseObj
{
- /// <summary>
- /// 瀛愯处鍙稩D
- /// </summary>
- public string childAccountId;
- /// <summary>
- /// 浣忓畢
- /// </summary>
- public string homeId;
/// <summary>
/// 鏄惁鍏佽杩滅▼鎺у埗
/// </summary>
@@ -910,6 +925,18 @@
public string childAccountType;
}
+ /// <summary>
+ /// 淇敼鏄惁鍏佽鍒涘缓鍦烘櫙
+ /// </summary>
+ [System.Serializable]
+ public class UpdateChildAllowCreateSceneObj : ChildBaseObj
+ {
+ /// <summary>
+ /// 鏄惁鍏佽鍒涘缓鍦烘櫙
+ /// </summary>
+ public bool isAllowCreateScene;
+
+ }
#endregion
#region 鏁版嵁鍒嗕韩
@@ -917,16 +944,8 @@
/// 鏌ヨ鏌愪綇瀹呮煇瀛愯处鍙风殑鍒嗕韩鏂囦欢淇℃伅
/// </summary>
[System.Serializable]
- public class HomeShareFindAll
+ public class HomeShareFindAll : ChildBaseObj
{
- /// <summary>
- /// 浣忓畢ID
- /// </summary>
- public string homeId;
- /// <summary>
- /// 瀛愯处鍙穒d
- /// </summary>
- public string childAccountId;
}
@@ -1005,7 +1024,7 @@
/// </summary>
public string deviceName;
/// <summary>
- ///
+ /// Android銆両OS銆乄inPhone
/// </summary>
public string deviceType;
/// <summary>
@@ -1015,23 +1034,50 @@
/// <summary>
/// 鎺ㄩ�両D
/// </summary>
- public string pushid;
+ public string pushToken;
/// <summary>
- /// 1鏄疕DL_ON銆�2HDL_Zigbee
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
- //public string software = MainPage.RequestSource;
- public string software = "HDL_ON";
+ public string software = "ON_Plus";
}
-
+ /// <summary>
+ ///
+ /// </summary>
[System.Serializable]
- public class PushserivceIdObj
+ public class PushIdObj
{
/// <summary>
///
/// </summary>
- public string id;
+ public string pushId;
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ [System.Serializable]
+ public class GetMessageListObj: PushIdObj
+ {
+ /// <summary>
+ /// 浣忓畢涓婚敭id
+ /// 1銆佷紶绌烘煡璇㈠叏閮紙闇�瑕佹牴鎹敤鎴峰煙鍚嶆煡璇級 2銆佷紶鎸囧畾浣忓畢ID鏌ヨ鎸囧畾璁板綍 锛堥渶瑕佹牴鎹綇瀹呭煙鍚嶆煡璇級
+ /// </summary>
+ public string homeId;
+ }
+
+ /// <summary>
+ /// 娑堟伅璁板綍Id
+ /// </summary>
+ [System.Serializable]
+ public class PushMsgIdObj
+ {
+ /// <summary>
+ /// 娑堟伅璁板綍Id
+ /// </summary>
+ public string msgId;
+ }
+
///// <summary>
///// 鎺ㄩ�佹秷鎭垪琛�
@@ -1087,10 +1133,117 @@
public string Id;
}
+ #region APP鐗堟湰妫�娴�
+ /// <summary>
+ /// ForceUpdateObj
+ /// </summary>
+ [System.Serializable]
+ public class ForceUpdateObj
+ {
+ /// <summary>
+ /// 鎵嬫満绫诲瀷
+ ///
+ /// 0鏄痠OS
+ /// 1鏄疉ndroid
+ /// 2鏄疉ndroid 鏂扮殑鍖呭悕鐗堟湰
+ /// </summary>
+ public int DeviceType = 0;
+ /// <summary>
+ ///
+ /// </summary>
+ public string requestVersion = MainPage.VersionString;
+ /// <summary>
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ /// </summary>
+ public string software = "ON_Plus";
+ /// <summary>
+ /// 璇█
+ /// </summary>
+ public string languageType;
+ }
+
+ /// <summary>
+ /// 妫�娴嬫洿鏂拌繑鍥炲瓧娈�
+ /// </summary>
+ public class ForceUpdateInfo
+ {
+
+ /// <summary>
+ /// 闇�瑕佸己鍒舵洿鏂�
+ /// </summary>
+ public bool IsNeedForceUpdate;
+
+ /// <summary>
+ /// 寮哄埗鏇存柊鍘熷洜
+ /// </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 鎻愮ず鏇存柊
+ /// 2 寮哄埗鏇存柊
+ /// 3 鎻愮ず閫氱煡鍐呭
+ /// </summary>
+ public int UpdateType;
+
+ /// <summary>
+ /// 褰撳墠鏂扮増鏈彿
+ /// </summary>
+ public string NewVersion;
+
+ }
+
+ /// <summary>
+ /// 妫�娴婣PP鐗堟湰
+ /// </summary>
+ public class APPVersion
+ {
+
+ /// <summary>
+ /// 鏂扮増鏈琲OS App Store涓嬭浇鍦板潃
+ /// </summary>
+ public string IosUrl;
+
+ /// <summary>
+ /// 鏂扮増鏈珹ndroid搴旂敤甯傚満涓嬭浇鍦板潃
+ /// </summary>
+ public string AndroidUrl;
+
+ /// <summary>
+ /// 褰撳墠iOS鏈�鏂扮増鏈彿
+ /// </summary>
+ public string IosVersion;
+
+ /// <summary>
+ /// 褰撳墠Android鏈�鏂扮増鏈彿
+ /// </summary>
+ public string AndroidVersion;
+
+ }
+ #endregion
#endregion
-
+
//#region 鏃ф帴鍙�
///// <summary>
--
Gitblit v1.8.0