From 79fe8dab1bcb8e8d92d9058ca2540cd4e8f9ecf9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:05:32 +0800
Subject: [PATCH] 20201127 合并嘉乐代码
---
HDL_ON/DAL/Server/NewApiRes.cs | 123 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 52 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 6703451..8f5bf92 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -944,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;
}
@@ -1032,7 +1024,7 @@
/// </summary>
public string deviceName;
/// <summary>
- ///
+ /// Android銆両OS銆乄inPhone
/// </summary>
public string deviceType;
/// <summary>
@@ -1042,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 = SoftwareType.ON_Plus.ToString();
}
-
+ /// <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>
///// 鎺ㄩ�佹秷鎭垪琛�
@@ -1123,24 +1142,21 @@
{
/// <summary>
/// 鎵嬫満绫诲瀷
- ///
- /// 0鏄痠OS
- /// 1鏄疉ndroid
- /// 2鏄疉ndroid 鏂扮殑鍖呭悕鐗堟湰
+ /// Android銆両OS銆乄inPhone
/// </summary>
- public int DeviceType = 0;
+ public string DeviceType = PhoneDeviceType.Android.ToString();
/// <summary>
///
/// </summary>
public string RequestVersion = MainPage.VersionString;
/// <summary>
- ///
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
- public string RequestSource = MainPage.ClientType;
+ public string Software = SoftwareType.ON_Plus.ToString();
/// <summary>
/// 璇█
/// </summary>
- public string languageType;
+ public string LanguageType;
}
/// <summary>
@@ -1149,35 +1165,16 @@
public class ForceUpdateInfo
{
+ ///// <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 鎻愮ず鏇存柊
@@ -1185,14 +1182,36 @@
/// 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
#endregion
--
Gitblit v1.8.0