From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
index 2addb77..8dc456c 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
@@ -76,11 +76,11 @@
/// </summary>
/// <param name="loginSendVerCodeObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> LoginSendVerCode(SendDataToServer.LoginSendVerCodeObj loginSendVerCodeObj)
+ public static Shared.Common.ResponseEntity.ResponsePack LoginSendVerCode(SendDataToServer.LoginSendVerCodeObj loginSendVerCodeObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginSendVerCodeObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginSendVerCodeObj)));
return requestRevertObj;
}
catch
@@ -94,11 +94,11 @@
/// </summary>
/// <param name="loginValidCodeOBJ"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> LoginByCode(SendDataToServer.LoginValidCodeOBJ loginValidCodeOBJ)
+ public static Shared.Common.ResponseEntity.ResponsePack LoginByCode(SendDataToServer.LoginValidCodeOBJ loginValidCodeOBJ)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginValidCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginValidCodeOBJ)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginValidCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginValidCodeOBJ)));
return requestRevertObj;
}
catch
@@ -112,11 +112,11 @@
/// </summary>
/// <param name="registerAccountObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> RegisterSendVerCode(SendDataToServer.RegisterSendVerCodeObj registerAccountObj)
+ public static Shared.Common.ResponseEntity.ResponsePack RegisterSendVerCode(SendDataToServer.RegisterSendVerCodeObj registerAccountObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/RegisterSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/RegisterSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
return requestRevertObj;
}
catch
@@ -130,11 +130,11 @@
/// </summary>
/// <param name="registerAccountObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> Register(SendDataToServer.RegisterAccountObj registerAccountObj)
+ public static Shared.Common.ResponseEntity.ResponsePack Register(SendDataToServer.RegisterAccountObj registerAccountObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidataCodeAndRegisterAccount", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidataCodeAndRegisterAccount", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
return requestRevertObj;
}
catch
@@ -148,11 +148,11 @@
/// </summary>
/// <param name="resetPasswordObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> ResetPassword(SendDataToServer.ResetPasswordObj resetPasswordObj)
+ public static Shared.Common.ResponseEntity.ResponsePack ResetPassword(SendDataToServer.ResetPasswordObj resetPasswordObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ResetPassword", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(resetPasswordObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ResetPassword", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(resetPasswordObj)));
return requestRevertObj;
}
catch
@@ -166,11 +166,11 @@
/// </summary>
/// <param name="validatorCodeObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> ValidatorCode(SendDataToServer.ValidatorCodeObj validatorCodeObj)
+ public static Shared.Common.ResponseEntity.ResponsePack ValidatorCode(SendDataToServer.ValidatorCodeObj validatorCodeObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidatorCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(validatorCodeObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidatorCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(validatorCodeObj)));
return requestRevertObj;
}
catch
--
Gitblit v1.8.0