From 3e0ca49536fd881cd67677cda75d0dedcb2d8f81 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期一, 13 六月 2022 19:31:52 +0800
Subject: [PATCH] 88
---
HDL-ON_Android/HDL-ON_Android.csproj | 6 ++++++
HDL-ON_Android/Resources/Resource.designer.cs | 2 +-
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/LpTimeDialogCallBak.cs | 1 -
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs | 9 +++++++--
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs | 11 ++++++++++-
5 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 3b3f61d..af3221f 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -1456,6 +1456,12 @@
<Folder Include="Assets\Phone\FunctionIcon\CAC\" />
<Folder Include="Assets\Phone\FunctionIcon\Panel\" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\HDLLinphoneSDK_AndroidNew\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone.csproj">
+ <Project>{703D29ED-674F-44A8-8AAD-863035899D4B}</Project>
+ <Name>Shared.Droid.HDLLinphone</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index f4be883..5a58a59 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.4.160")]
public partial class Resource
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/LpTimeDialogCallBak.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/LpTimeDialogCallBak.cs
index b91bcbb..272cb66 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/LpTimeDialogCallBak.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/LpTimeDialogCallBak.cs
@@ -6,7 +6,6 @@
{
public class LpTimeDialogCallBak : Java.Lang.Object, LpTimeDialog.IClickListenerInterface
{
-
public string Time;
private Action<string> action;
public LpTimeDialogCallBak(Action<string> _action)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
index 9037df3..bd756c5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
@@ -11,8 +11,17 @@
private VerticalScrolViewLayout bodyScrolView;
private List<VisitorTempPassword> pwdList;
- public VisitorHistoryPage()
+ Action action1;
+
+ public override void RemoveFromParent()
{
+ action1?.Invoke();
+ base.RemoveFromParent();
+ }
+
+ public VisitorHistoryPage(Action action)
+ {
+ action1 = action;
bodyView = this;
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
index 26a6115..c982544 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using HDL_ON.UI.CSS;
using Shared;
-using Com.Hdl.Hdllinphonesdk.Dialog;
using HDL_ON.DAL.Server;
using System.Collections.Generic;
using Com.Hdl.Hdllinphonesdk.Utils;
@@ -27,6 +26,9 @@
bodyView = this;
}
+
+
+
public VisitorQRCodePage(VisitorTempPassword pwd)
{
bodyView = this;
@@ -42,7 +44,10 @@
Action click = () =>
{
- VisitorHistoryPage page = new VisitorHistoryPage();
+ Action action = () => {
+ LoadPage();
+ };
+ VisitorHistoryPage page = new VisitorHistoryPage(action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0