Skip to content

G
GS.Terminal.VisitorSelfService
Commit 427f6232 authored by 姜春辉's avatar 姜春辉
Browse files
Options

优化重复登记提示

parent b2228e25
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 65 deletions
Publish/Addons/GS.Terminal.VisitorSelfService.Logic/Config.xml
View file @ 427f6232
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.VisitorSelfService.Logic">
<Dictionaries>
<Dict Caption="基础配置" Name="defaultconfig">
<Key Caption="人脸识别阀值" Name="FaceMinValue" Value="0.85"/>
<Key Caption="人证比对阀值" Name="FaceCardMatch" Value="0"/>
<Key Caption="心跳端口" Name="HeartPort" Value="18083"/>
<Key Caption="远程认证地址" Name="FaceWebSocket" Value="ws://192.168.1.7:15055/face/sdk2?persontype=访客"/>
</Dict>
<Dict Caption="识别方式配置" Name="authenticationconfig">
<Key Caption="人脸识别" Name="EnableFace" Value="true"/>
<Key Caption="二代证识别" Name="EnableIdCard" Value="false"/>
<Key Caption="二维码识别" Name="EnableQRCode" Value="false"/>
<!--0是人脸识别 1是二代证识别 2是二维码识别-->
<Key Caption="默认识别方式" Name="DefaultAuthMode" Value="1"/>
</Dict>
</Dictionaries>
<Structures>
<Structure Caption="服务地址配置" Name="ServiceList">
<Declare>
<Property Caption="服务描述" Name="Description"/>
<Property Caption="名称(不可随意修改)" Name="Key"/>
<Property Caption="服务地址" Name="ServiceUri"/>
</Declare>
<Datas>
<Data Description="获取人员有效预约单" Key="VisitorAvailableAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/VisitorAvailableAppointment" />
<Data Description="提交预约单到访" Key="SubmitVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/SubmitVisitInfo" />
<Data Description="获取历史来访记录" Key="GetHistoryVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryVisitInfo/{idnum}" />
<Data Description="获取历史预约单" Key="GetHistoryAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryAppointment/{idnum}" />
</Datas>
</Structure>
</Structures>
<Dictionaries>
<Dict Caption="基础配置" Name="defaultconfig">
<Key Caption="人脸识别阀值" Name="FaceMinValue" Value="0.85"/>
<Key Caption="人证比对阀值" Name="FaceCardMatch" Value="0"/>
<Key Caption="心跳端口" Name="HeartPort" Value="18083"/>
<Key Caption="重复登记提示" Name="RepeatMessage" Value="你已经完成确认，欢迎进入海信大厦"/>
<Key Caption="远程认证地址" Name="FaceWebSocket" Value="ws://192.168.1.7:15055/face/sdk2?persontype=访客"/>
</Dict>
<Dict Caption="识别方式配置" Name="authenticationconfig">
<Key Caption="人脸识别" Name="EnableFace" Value="false"/>
<Key Caption="二代证识别" Name="EnableIdCard" Value="false"/>
<Key Caption="二维码识别" Name="EnableQRCode" Value="false"/>
<!--0是人脸识别 1是二代证识别 2是二维码识别-->
<Key Caption="默认识别方式" Name="DefaultAuthMode" Value="1"/>
</Dict>
</Dictionaries>
<Structures>
<Structure Caption="服务地址配置" Name="ServiceList">
<Declare>
<Property Caption="服务描述" Name="Description"/>
<Property Caption="名称(不可随意修改)" Name="Key"/>
<Property Caption="服务地址" Name="ServiceUri"/>
</Declare>
<Datas>
<Data Description="获取人员有效预约单" Key="VisitorAvailableAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/VisitorAvailableAppointment" />
<Data Description="提交预约单到访" Key="SubmitVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/SubmitVisitInfo" />
<Data Description="获取历史来访记录" Key="GetHistoryVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryVisitInfo/{idnum}" />
<Data Description="获取历史预约单" Key="GetHistoryAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryAppointment/{idnum}" />
</Datas>
</Structure>
</Structures>
</Settings>
\ No newline at end of file
Src/GS.Terminal.VisitorSelfService/Logic/GS.Terminal.VisitorSelfService.Logic/Config.xml
View file @ 427f6232
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.VisitorSelfService.Logic">
<Dictionaries>
<Dict Caption="基础配置" Name="defaultconfig">
<Key Caption="人脸识别阀值" Name="FaceMinValue" Value="0.85"/>
<Key Caption="人证比对阀值" Name="FaceCardMatch" Value="0"/>
<Key Caption="心跳端口" Name="HeartPort" Value="18083"/>
<Key Caption="远程认证地址" Name="FaceWebSocket" Value="ws://192.168.1.7:15055/face/sdk2?persontype=访客"/>
</Dict>
<Dict Caption="识别方式配置" Name="authenticationconfig">
<Key Caption="人脸识别" Name="EnableFace" Value="true"/>
<Key Caption="二代证识别" Name="EnableIdCard" Value="false"/>
<Key Caption="二维码识别" Name="EnableQRCode" Value="false"/>
<!--0是人脸识别 1是二代证识别 2是二维码识别-->
<Key Caption="默认识别方式" Name="DefaultAuthMode" Value="1"/>
</Dict>
</Dictionaries>
<Structures>
<Structure Caption="服务地址配置" Name="ServiceList">
<Declare>
<Property Caption="服务描述" Name="Description"/>
<Property Caption="名称(不可随意修改)" Name="Key"/>
<Property Caption="服务地址" Name="ServiceUri"/>
</Declare>
<Datas>
<Data Description="获取人员有效预约单" Key="VisitorAvailableAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/VisitorAvailableAppointment" />
<Data Description="提交预约单到访" Key="SubmitVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/SubmitVisitInfo" />
<Data Description="获取历史来访记录" Key="GetHistoryVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryVisitInfo/{idnum}" />
<Data Description="获取历史预约单" Key="GetHistoryAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryAppointment/{idnum}" />
</Datas>
</Structure>
</Structures>
<Dictionaries>
<Dict Caption="基础配置" Name="defaultconfig">
<Key Caption="人脸识别阀值" Name="FaceMinValue" Value="0.85"/>
<Key Caption="人证比对阀值" Name="FaceCardMatch" Value="0"/>
<Key Caption="心跳端口" Name="HeartPort" Value="18083"/>
<Key Caption="重复登记提示" Name="RepeatMessage" Value="你已经完成确认，欢迎进入海信大厦"/>
<Key Caption="远程认证地址" Name="FaceWebSocket" Value="ws://192.168.1.7:15055/face/sdk2?persontype=访客"/>
</Dict>
<Dict Caption="识别方式配置" Name="authenticationconfig">
<Key Caption="人脸识别" Name="EnableFace" Value="false"/>
<Key Caption="二代证识别" Name="EnableIdCard" Value="false"/>
<Key Caption="二维码识别" Name="EnableQRCode" Value="false"/>
<!--0是人脸识别 1是二代证识别 2是二维码识别-->
<Key Caption="默认识别方式" Name="DefaultAuthMode" Value="1"/>
</Dict>
</Dictionaries>
<Structures>
<Structure Caption="服务地址配置" Name="ServiceList">
<Declare>
<Property Caption="服务描述" Name="Description"/>
<Property Caption="名称(不可随意修改)" Name="Key"/>
<Property Caption="服务地址" Name="ServiceUri"/>
</Declare>
<Datas>
<Data Description="获取人员有效预约单" Key="VisitorAvailableAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/VisitorAvailableAppointment" />
<Data Description="提交预约单到访" Key="SubmitVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/SubmitVisitInfo" />
<Data Description="获取历史来访记录" Key="GetHistoryVisitInfo" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryVisitInfo/{idnum}" />
<Data Description="获取历史预约单" Key="GetHistoryAppointment" ServiceUri="/api/GS.WebApi.Terminal.Visitor/VisitorSelfService/GetHistoryAppointment/{idnum}" />
</Datas>
</Structure>
</Structures>
</Settings>
\ No newline at end of file
Src/GS.Terminal.VisitorSelfService/Logic/GS.Terminal.VisitorSelfService.Logic/Core/AppointmentDetailPageHandler.cs
View file @ 427f6232
......@@ -88,7 +88,13 @@ namespace GS.Terminal.VisitorSelfService.Logic.Core
}
if (!result.Status && !string.IsNullOrEmpty(result.Message))
{
MainShell.ShowPrompt(result.Message);
if (result.Message == "不能重复登记")
{
var msg = Program._Context.DictionaryValue("defaultconfig", "RepeatMessage");
if (string.IsNullOrEmpty(msg)) msg = "你已经完成确认，欢迎进入";
VM.Alert(msg);
}
else { MainShell.ShowPrompt(result.Message); }
return false;
}
MainShell.ShowPrompt("数据提交失败");
......
Src/GS.Terminal.VisitorSelfService/ViewModelView/ViewModels/Pages/AppointmentDetailPage/ViewModel.cs
View file @ 427f6232
......@@ -113,6 +113,36 @@ namespace ViewModels.Pages.AppointmentDetailPage
}
});
public void Alert(string msg)
{
AlertMessage = msg;
ShowAlert = true;
}
private bool _ShowAlert;
public bool ShowAlert
{
get { return _ShowAlert; }
set { _ShowAlert = value; RaisePropertyChanged("ShowAlert"); }
}
private string _AlertMessage;
public string AlertMessage
{
get { return _AlertMessage; }
set { _AlertMessage = value; RaisePropertyChanged("AlertMessage"); }
}
public RelayCommand CloseAlertCommand => new RelayCommand(() =>
{
ShowAlert = false;
AlertMessage = "";
});
public event Action OnExitClick;
public RelayCommand ExitCommand => new RelayCommand(() =>
{
......
Src/GS.Terminal.VisitorSelfService/ViewModelView/Views/Pages/AppointmentDetailPage/Index.xaml
View file @ 427f6232
......@@ -26,7 +26,7 @@
<Storyboard x:Key="SB_ConfirmOut">
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)" Storyboard.TargetName="confirm">
<EasingDoubleKeyFrame KeyTime="0" Value="0"/>
<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="475"/>
<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="520"/>
</DoubleAnimationUsingKeyFrames>
</Storyboard>
</ResourceDictionary>
......@@ -43,6 +43,22 @@
</Page.Triggers>
<Grid>
<Grid Margin="0,110,0,0">
<Grid.Style>
<Style TargetType="Grid">
<Style.Triggers>
<DataTrigger Binding="{Binding ShowAlert}" Value="True">
<Setter Property="Effect">
<Setter.Value>
<BlurEffect Radius="30"/>
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding ShowAlert}" Value="False">
<Setter Property="Effect" Value="{x:Null}"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Grid.Style>
<Grid.RowDefinitions>
<RowDefinition Height="480"/>
<RowDefinition Height="auto"/>
......@@ -112,7 +128,7 @@
<ContentControl Grid.Row="2" Template="{StaticResource AppointmentDetailPage_Line}" Grid.ColumnSpan="2"/>
<TextBlock Text="来访时间" Grid.Row="3" Style="{StaticResource AppointmentDetailPage_Title}"/>
<TextBlock Grid.Row="3" Style="{StaticResource AppointmentDetailPage_Value}"><Run Text="{Binding Appointment.startDate, StringFormat=\{0:yyyy-MM-dd HH:mm\}}"/><Run Text=" ~ "/><Run Text="{Binding Appointment.endDate, StringFormat=\{0:yyyy-MM-dd HH:mm\}}"/></TextBlock>
<TextBlock Grid.Row="3" Style="{StaticResource AppointmentDetailPage_Value}"><Run Text="{Binding Appointment.startDate, StringFormat=\{0:MM-dd HH:mm\}}"/><Run Text=" ~ "/><Run Text="{Binding Appointment.endDate, StringFormat=\{0:MM-dd HH:mm\}}"/></TextBlock>
<TextBlock Text="来访区域" Grid.Row="4" Style="{StaticResource AppointmentDetailPage_Title}"/>
<TextBlock Text="{Binding Appointment.areaName}" Grid.Row="4" Style="{StaticResource AppointmentDetailPage_Value}"/>
......@@ -132,6 +148,22 @@
<gs:ImageButtonFix Command="{Binding ExitCommand}" Width="1010" Height="190" Image="/Views;component/Resources/detail_cancel.png"/>
</StackPanel>
</Grid>
<Border Background="Transparent" Visibility="{Binding ShowAlert, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border Height="420" Background="White"
BorderThickness="6" CornerRadius="15" BorderBrush="#f1f1f1"
Margin="50,0,50,50" Padding="50">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="140"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding AlertMessage}" FontSize="48"
HorizontalAlignment="Center" VerticalAlignment="Center"
TextWrapping="Wrap"/>
<gs:ImageButton Command="{Binding CloseAlertCommand}" Grid.Row="1" Width="320" ImgPath="/Views;component/Resources/btn_ikonw.png"/>
</Grid>
</Border>
</Border>
<!--附加信息-->
<ContentControl d:IsHidden="True" Template="{StaticResource AppointmentDetailPage_ExtendInfo}" Visibility="{Binding ShowExtendInfo}"/>
<ContentControl Template="{StaticResource AppointmentDetailPage_Confirm}"
......@@ -142,7 +174,7 @@
<ScaleTransform/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform Y="475"/>
<TranslateTransform Y="520"/>
</TransformGroup>
</ContentControl.RenderTransform>
......
Src/GS.Terminal.VisitorSelfService/ViewModelView/Views/Views.csproj
View file @ 427f6232
......@@ -237,6 +237,8 @@
<ItemGroup>
<Resource Include="Resources\result_correct.png" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Resource Include="Resources\btn_ikonw.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment