From c43ab36fb22818016f470fe5757bdb161eb47a13 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 11:54:12 +0800
Subject: [PATCH] 2020-12-21 1.投诉页面UI优化。2.检测更新UI优化。3.二维码页面问题修复。
---
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs | 39 ++++++++-----------
HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs | 2
.vs/HDL_APP_Project/xs/UserPrefs.xml | 29 ++++----------
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs | 12 ++++-
5 files changed, 36 insertions(+), 48 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 4c79728..69cc761 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,37 +1,26 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs">
- <Files>
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="402" Column="4" />
- <File FileName="HDL_ON/Common/OnAppConfig.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/Common/R.cs" Line="14" Column="41" />
- <File FileName="HDL_ON/UI/BindingResidence/WellcomToHomeForm.cs" Line="12" Column="35" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" Line="124" Column="22" />
- <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" Line="133" Column="36" />
- </Files>
+ <MonoDevelop.Ide.Workbench>
<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="DAL" expanded="True">
- <Node name="Server" expanded="True" />
- </Node>
<Node name="UI" expanded="True">
- <Node name="BindingResidence" expanded="True" />
- <Node name="UI1-Login" expanded="True" />
+ <Node name="UI0-Public" expanded="True">
+ <Node name="Widget" expanded="True">
+ <Node name="UpdateTipDialog.cs" selected="True" />
+ </Node>
+ </Node>
<Node name="UI2" expanded="True">
<Node name="4-PersonalCenter" expanded="True">
- <Node name="MyQRCodePage.cs" selected="True" />
+ <Node name="AboutOn" expanded="True" />
+ <Node name="AccountBindInfo" expanded="True" />
</Node>
</Node>
</Node>
</Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
- <Node name="Resources" expanded="True" />
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 63c0aa8..4c66798 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.0.0924";
+ public static string VersionString = "1.0.0124";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs b/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
old mode 100755
new mode 100644
index 21d8ff3..5689c26
--- a/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
@@ -79,7 +79,7 @@
TextButton btnMes = new TextButton()
{
- Gravity = Gravity.CenterHorizontal,
+ //Gravity = Gravity.CenterHorizontal,
Width = mesView.Width,
//Height = mesView.Height,
Height = Application.GetRealWidth(20),
@@ -93,8 +93,14 @@
mesView.AddChidren(btnMes);
//鍔ㄦ�佽绠楅珮搴�
var needHeight = btnMes.GetMoreLineNeedHeight();
+ if(needHeight < mesView.Height)
+ {
+ needHeight = mesView.Height;
+ }
btnMes.IsMoreLines = true;
btnMes.Height = needHeight;
+ //mesView.AddChidren(btnMes);
+
Button btnLine = new Button()
{
@@ -125,7 +131,7 @@
X = contentView.Width - Width144,
Y = btnLine.Y,
Width = Width144,
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
@@ -155,7 +161,7 @@
{
Y = btnLine.Y,
Width = contentView.Width,
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
old mode 100755
new mode 100644
index 3ea9a33..c675c8e
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
@@ -13,33 +13,26 @@
FrameLayout bodyView;
/// <summary>
- /// 褰撳墠
+ ///
/// </summary>
- VerticalScrolViewLayout bodyScrolView;
-
public ComplaintsPage()
{
bodyView = this;
BackgroundColor = CSS_Color.MainBackgroundColor;
}
+ /// <summary>
+ ///
+ /// </summary>
public void LoadPage()
{
new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints)).LoadTopView();
-
- int bodyY = Application.GetRealHeight(64);
- bodyScrolView = new VerticalScrolViewLayout()
- {
- Y = bodyY,
- Height = bodyView.Height - bodyY,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
#region 鎶曡瘔鑱旂郴
FrameLayout phoneRow = new FrameLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(50),
+ Height = Application.GetRealWidth(50),
};
bodyView.AddChidren(phoneRow);
@@ -69,10 +62,10 @@
/// </summary>
var btnImage = new Button()
{
- X = Application.GetRealWidth(339),
+ 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",
};
phoneRow.AddChidren(btnImage);
@@ -92,7 +85,7 @@
FrameLayout emailRow = new FrameLayout()
{
Y = phoneRow.Bottom,
- Height = Application.GetRealHeight(54),
+ Height = Application.GetRealWidth(54),
};
bodyView.AddChidren(emailRow);
@@ -110,8 +103,8 @@
Button btnEmailText = new Button()
{
X = btnEmailTitle.Right,
- Y = Application.GetRealHeight(8),
- Height = Application.GetRealHeight(20),
+ Y = Application.GetRealWidth(8),
+ Height = Application.GetRealWidth(20),
Width = Application.GetRealWidth(266),
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize,
@@ -123,8 +116,8 @@
Button btnEmailTipText = new Button()
{
X = btnEmailTitle.Right,
- Y = btnEmailText.Bottom + Application.GetRealHeight(4),
- Height = Application.GetRealHeight(20),
+ Y = btnEmailText.Bottom + Application.GetRealWidth(4),
+ Height = Application.GetRealWidth(20),
Width = Application.GetRealWidth(266),
TextAlignment = TextAlignment.TopLeft,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
@@ -137,10 +130,10 @@
/// </summary>
var btnImage2 = new Button()
{
- X = Application.GetRealWidth(339),
+ 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",
};
emailRow.AddChidren(btnImage2);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
index b9cdfb0..d133c7a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
@@ -20,7 +20,7 @@
/// <summary>
///
/// </summary>
- /// <param name="isStartCheckResidenceThread">鏄惁寮�鍚綇瀹呯洃鍚嚎绋�</param>
+ /// <param name="isStartCheckResidenceThread">鏄惁寮�鍚綇瀹呯洃鍚嚎绋嬶紝娌℃湁浣忓畢鐨勬椂鍊欏埆浜烘壂鐮佹坊鍔犱綘涓烘垚鍛樼殑鏃跺�欒皟鐢�</param>
public void LoadPage(bool isStartCheckResidenceThread = false)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
--
Gitblit v1.8.0