From 68051add9f0c92a430711acbe75b4f225a6f4d33 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期一, 13 六月 2022 20:37:09 +0800
Subject: [PATCH] 1
---
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/screenpanel.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png | 0
HDL-ON_Android/Assets/Phone/Public/MsgIcon/HangUpIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/DataIcon.png | 0
HDL-ON_Android/Assets/Phone/Public/MsgIcon/AnswerIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpNormalBgIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_white.png | 0
HDL-ON_Android/Assets/Phone/Public/dialogBg2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/hvaccac.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpAlarmBgIcon.png | 0
HDL-ON_Android/Assets/Phone/Public/MsgIcon/CallIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs | 14 ++++++++++----
HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/JinMaoIcon.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs | 25 +++++++++++--------------
HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelEnviBg.png | 0
18 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/DataIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/DataIcon.png
new file mode 100644
index 0000000..9832d06
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/DataIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/JinMaoIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/JinMaoIcon.png
new file mode 100644
index 0000000..b5e26bf
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/JinMaoIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_blue.png
new file mode 100644
index 0000000..addcd70
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_white.png
new file mode 100644
index 0000000..c63e9e3
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png
new file mode 100644
index 0000000..7e5e4ac
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png
new file mode 100644
index 0000000..448b3c8
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/hvaccac.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/hvaccac.png
new file mode 100644
index 0000000..5b8b9fa
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/hvaccac.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/screenpanel.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/screenpanel.png
new file mode 100644
index 0000000..56ba0c5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/screenpanel.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png
new file mode 100644
index 0000000..cbb1b1c
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelEnviBg.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelEnviBg.png
new file mode 100644
index 0000000..d6482d3
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelEnviBg.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpAlarmBgIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpAlarmBgIcon.png
new file mode 100644
index 0000000..72ece8b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpAlarmBgIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpNormalBgIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpNormalBgIcon.png
new file mode 100644
index 0000000..a55c35e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpNormalBgIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/MsgIcon/AnswerIcon.png b/HDL-ON_Android/Assets/Phone/Public/MsgIcon/AnswerIcon.png
new file mode 100644
index 0000000..89096a9
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/Public/MsgIcon/AnswerIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/MsgIcon/CallIcon.png b/HDL-ON_Android/Assets/Phone/Public/MsgIcon/CallIcon.png
new file mode 100644
index 0000000..843101e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/Public/MsgIcon/CallIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/MsgIcon/HangUpIcon.png b/HDL-ON_Android/Assets/Phone/Public/MsgIcon/HangUpIcon.png
new file mode 100644
index 0000000..e516074
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/Public/MsgIcon/HangUpIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/dialogBg2.png b/HDL-ON_Android/Assets/Phone/Public/dialogBg2.png
new file mode 100644
index 0000000..2c28530
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/Public/dialogBg2.png
Binary files differ
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
index f8d1fdd..8fe3476 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
@@ -11,34 +11,33 @@
private VerticalScrolViewLayout bodyScrolView;
private List<VisitorTempPassword> pwdList;
- Action action1;
+ Action backAction;// 鍚庨��鎸夐敭锛屽埛鏂癠I
+ Action action;
public override void RemoveFromParent()
{
- action1?.Invoke();
+ backAction?.Invoke();
base.RemoveFromParent();
}
public VisitorHistoryPage(Action action)
{
- action1 = action;
+ backAction = action;
bodyView = this;
}
public void LoadPage()
{
+ action = () =>
+ {
+ LoadPage();
+ };
+
pwdList = getVisitorPasswordData();
#region 璁垮璁板綍鎸夐挳
- Action click = () =>
- {
- VisitorHistoryPage page = new VisitorHistoryPage(null);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView_SettingText(click, "");
+ new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView();
#endregion
bodyScrolView = new VerticalScrolViewLayout()
@@ -102,7 +101,7 @@
itemLayout.AddChidren(btn);//+= (sender, e)
btn.MouseUpEventHandler += (sender, e) =>
{
- VisitorQRCodePage page = new VisitorQRCodePage(temPwd);
+ VisitorQRCodePage page = new VisitorQRCodePage(action, temPwd);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -137,7 +136,5 @@
}
return dataList;
}
-
- private List<TempPasswordInfo> infoList;
}
}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
index a17f6c3..9a904da 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
@@ -22,18 +22,24 @@
private Button visitorVoucherBtn;
private VisitorTempPassword tempPassword;
+ Action backAction;// 鍚庨��鎸夐敭锛屽埛鏂癠I
+
public VisitorQRCodePage()
{
bodyView = this;
}
-
-
-
- public VisitorQRCodePage(VisitorTempPassword pwd)
+ public VisitorQRCodePage(Action action,VisitorTempPassword pwd)
{
bodyView = this;
this.tempPassword = pwd;
+ backAction = action;
+ }
+
+ public override void RemoveFromParent()
+ {
+ backAction?.Invoke();
+ base.RemoveFromParent();
}
public void LoadPage()
--
Gitblit v1.8.0