From 8677d9602ffa36554b2f0923f978bd3c054a905d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 16:15:34 +0800
Subject: [PATCH] 2020-12-21 1.功能介绍接口对接
---
HDL_ON/DAL/Server/HttpUtil.cs | 1
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs | 23 ++++++-----
.vs/HDL_APP_Project/xs/UserPrefs.xml | 37 ++++++++++--------
3 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 11211cd..00174f6 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,30 +1,33 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/Constant.cs">
<Files>
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs" Line="150" Column="14" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs" Line="63" Column="36" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="191" Column="14" />
- <File FileName="HDL_ON/Common/R.cs" Line="224" Column="47" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs" Line="281" Column="43" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs" Line="286" Column="62" />
- <File FileName="HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs" Line="105" Column="54" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="26" Column="22" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs" Line="181" Column="23" />
+ <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1135" Column="51" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2094" Column="9" />
+ <File FileName="HDL_ON/Common/Constant.cs" Line="192" Column="16" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
+ <Node name="Common" expanded="True">
+ <Node name="Constant.cs" selected="True" />
+ </Node>
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
<Node name="UI0-Public" expanded="True" />
+ <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="4-PersonalCenter" expanded="True">
- <Node name="UnlockSetting" expanded="True">
- <Node name="AppUnlockSettingsPage.cs" selected="True" />
- </Node>
+ <Node name="AboutOn" expanded="True" />
+ <Node name="UnlockSetting" expanded="True" />
</Node>
</Node>
</Node>
@@ -43,8 +46,8 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="552" column="1" />
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 50e7713..d6422ae 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -39,6 +39,7 @@
#region **********缃戠粶璇锋眰灏佽**********
/// <summary>
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
+ /// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
//public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
index c82d7af..77b4435 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
@@ -86,7 +86,7 @@
{
var rowView = new FrameLayout()
{
- Height = Application.GetRealHeight(54),
+ Height = Application.GetRealWidth(54),
};
VerticalScrolViewMiddle.AddChidren(rowView);
@@ -94,9 +94,9 @@
var btnTilte = new Button()
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(8),
+ Y = Application.GetRealWidth(8),
Width = Application.GetRealWidth(320),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealWidth(20),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
@@ -108,9 +108,9 @@
var btnSubtitle = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnTilte.Bottom + Application.GetRealHeight(4),
+ Y = btnTilte.Bottom + Application.GetRealWidth(4),
Width = Application.GetRealWidth(320),
- Height = Application.GetRealHeight(14),
+ Height = Application.GetRealWidth(14),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
@@ -123,8 +123,8 @@
{
X = Application.GetRealWidth(343),
Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "Public/Right.png",
};
@@ -176,9 +176,12 @@
{
try
{
- var requestJson = HttpUtil.GetSignRequestJson(new AppNameObj()
- {
- });
+
+ Dictionary<string, object> AppName = new Dictionary<string, object>();
+ //ON_Plus 2
+ AppName.Add("appName", 2);
+
+ var requestJson = HttpUtil.GetSignRequestJson(AppName);
var result = HttpUtil.RequestHttpsPost(NewAPI.API_POST_FunctionIntroductionList, requestJson);
if (result.Code == StateCode.SUCCESS)
--
Gitblit v1.8.0