From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
old mode 100755
new mode 100644
index cb59ba2..8dc456c
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
@@ -54,13 +54,13 @@
/// </summary>
public const int TopFrameLayout_Height = 184;
/// <summary>
- /// topview 鐘舵�佹爮楂樺害 60
+ /// topview 鐘舵�佹爮楂樺害 74
/// </summary>
- public const int TopStatuFrameLayout_Height = 60;
+ public const int TopStatuFrameLayout_Height = 74;
/// <summary>
- /// topview 鐘舵�佹爮楂樺害 124
+ /// topview 鐘舵�佹爮楂樺害 110
/// </summary>
- public const int Topview_Height = 124;
+ public const int Topview_Height = 110;
/// <summary>
/// 鏍囬澶у皬 17
@@ -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