From 6559b16c9beea1f3cd89751b0afcfd0d5ac447e2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:19:46 +0800
Subject: [PATCH] iOS兼容
---
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs | 6 +++---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs | 18 +++++++++---------
SiriIntents/Server/HttpUtil.cs | 12 ++++++------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index d0b9cf1..ce601c8 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index e35b1c0..f7bbfc4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -169,7 +169,7 @@
};
dialog.AddChidren(contentView);
- Button btnTitle = new Button()
+ Button btnTitle2 = new Button()
{
Y = Application.GetRealHeight(16),
Height = Application.GetRealHeight(30),
@@ -179,13 +179,13 @@
IsBold = true,
TextID = StringId.FaceProtocolPrompt,
};
- contentView.AddChidren(btnTitle);
+ contentView.AddChidren(btnTitle2);
Button btnMsg = new Button()
{
Gravity = Gravity.CenterHorizontal,
Height = Application.GetRealHeight(35),
- Y = btnTitle.Bottom,
+ Y = btnTitle2.Bottom,
Width = Application.GetRealHeight(200),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
@@ -265,11 +265,11 @@
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
dialog.Show();
- btnCancel.MouseUpEventHandler += (sender, e) =>
+ btnCancel.MouseUpEventHandler += (sender2, e2) =>
{
dialog.Close();
};
- btnMsg1.MouseUpEventHandler += (sender, e) =>
+ btnMsg1.MouseUpEventHandler += (sender2, e2) =>
{
string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html";
if (Language.CurrentLanguage != "Chinese")
@@ -280,7 +280,7 @@
dialog.Close();
};
- btnConfirm.MouseUpEventHandler = (sender, e) => {
+ btnConfirm.MouseUpEventHandler = (sender2, e2) => {
dialog.Close();
OnAppConfig.Instance.FaceManagementTip = true;
OnAppConfig.Instance.SaveConfig();
@@ -324,7 +324,7 @@
}
else
{
- var btnTitle = new Button()
+ var btnTitle2 = new Button()
{
Y = Application.GetRealHeight(70),
X = Application.GetRealWidth(16),
@@ -334,11 +334,11 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.NewMemberAccount,
};
- bodyView.AddChidren(btnTitle);
+ bodyView.AddChidren(btnTitle2);
etMemberAccount = new EditText()
{
- Y = btnTitle.Bottom,
+ Y = btnTitle2.Bottom,
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(356),
Height = Application.GetRealHeight(40),
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
index 560dd13..c69920d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
@@ -184,11 +184,11 @@
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
dialog.Show();
- btnCancel.MouseUpEventHandler += (sender, e) =>
+ btnCancel.MouseUpEventHandler += (sender2, e2) =>
{
dialog.Close();
};
- btnMsg1.MouseUpEventHandler += (sender, e) =>
+ btnMsg1.MouseUpEventHandler += (sender2, e2) =>
{
string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html";
if (Language.CurrentLanguage != "Chinese")
@@ -199,7 +199,7 @@
dialog.Close();
};
- btnConfirm.MouseUpEventHandler = (sender, e) =>
+ btnConfirm.MouseUpEventHandler = (sender2, e2) =>
{
dialog.Close();
OnAppConfig.Instance.FaceManagementTip = true;
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 51d5267..8d4483c 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,13 +16,13 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
- //const string APP_KEY = "HDL-HOME-APP-TEST";
- //const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
- public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
- const string APP_KEY = "CPEVRLRT";
- const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
+ const string APP_KEY = "HDL-HOME-APP-TEST";
+ const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
+ //const string APP_KEY = "CPEVRLRT";
+ //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
/// <summary>
/// RegionMark
/// </summary>
--
Gitblit v1.8.0