From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/DAL/Server/NewApiRes.cs | 83 ++++++++++++++---------------------------
1 files changed, 28 insertions(+), 55 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index da473ed..8f5bf92 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -1038,7 +1038,7 @@
/// <summary>
/// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
- public string software = "ON_Plus";
+ public string software = SoftwareType.ON_Plus.ToString();
}
/// <summary>
@@ -1142,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;
+ public string RequestVersion = MainPage.VersionString;
/// <summary>
/// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
- public string software = "ON_Plus";
+ public string Software = SoftwareType.ON_Plus.ToString();
/// <summary>
/// 璇█
/// </summary>
- public string languageType;
+ public string LanguageType;
}
/// <summary>
@@ -1168,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 鎻愮ず鏇存柊
@@ -1204,41 +1182,36 @@
/// 3 鎻愮ず閫氱煡鍐呭
/// </summary>
public int UpdateType;
-
/// <summary>
/// 褰撳墠鏂扮増鏈彿
/// </summary>
public string NewVersion;
+ /// <summary>
+ /// 褰撳墠鏂扮増鏈彿
+ /// </summary>
+ public string NewVersionUrl;
}
/// <summary>
- /// 妫�娴婣PP鐗堟湰
+ /// 妫�娴婣PP鐗堟湰 鍝嶅簲鍙傛暟
+ /// 濡傛灉鏄痠OS杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
+ /// 濡傛灉鏄疉ndroid杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
/// </summary>
public class APPVersion
{
+ /// <summary>
+ /// 褰撳墠鏈�鏂扮殑鐗堟湰鍙�
+ /// </summary>
+ public string NewVersion;
/// <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;
-
+ public string NewVersionUrl;
}
+
+
#endregion
#endregion
--
Gitblit v1.8.0