Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
政
政企识别终端
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
终端组
政企识别终端
Commits
3a63a7b5
Commit
3a63a7b5
authored
Dec 04, 2020
by
姜春辉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加北洋通道无卡离开/进入提示
parent
a1d7a62d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
89 additions
and
47 deletions
+89
-47
CardHandler.cs
...ification.Enterprise.Logic/CallbackHandler/CardHandler.cs
+14
-0
App.config
src/GS.Terminal.Identification.EnterpriseHost/App.config
+1
-1
MainPageViewModel.cs
src/IdentificationViewModels/MainPage/MainPageViewModel.cs
+23
-1
MainPage.xaml
src/IdentificationViews/MainPage.xaml
+51
-45
No files found.
src/GS.Terminal.Identification.Enterprise.Logic/CallbackHandler/CardHandler.cs
View file @
3a63a7b5
...
...
@@ -55,6 +55,20 @@ namespace GS.Terminal.Identification.Enterprise.Logic
#endif
if
(
string
.
IsNullOrEmpty
(
cardNum
))
return
;
//通道机 无卡闯入 0000000000000000
if
(
cardNum
==
"0000000000000000"
)
{
ViewModel
.
ShowError
=
true
;
ViewModel
.
ErrorText
=
$"无卡
{(
cardMsg
.
OperaDeviceData
.
Tag
==
"I"
?
"进入"
:
"离开"
)}
"
;
return
;
}
else
{
ViewModel
.
ShowError
=
false
;
ViewModel
.
ErrorText
=
""
;
}
try
{
ViewModel
.
IsStandby
=
false
;
...
...
src/GS.Terminal.Identification.EnterpriseHost/App.config
View file @
3a63a7b5
...
...
@@ -8,7 +8,7 @@
<
add
key
=
"UpdateUrl"
value
=
"http://192.168.1.210/Soft/update"
/>
<
add
key
=
"ServerIP"
value
=
"192.168.1.210"
/>
<
add
key
=
"tCode"
value
=
"D1"
/>
<
add
key
=
"WebPath"
value
=
"http://192.168.1.
210
/"
/>
<
add
key
=
"WebPath"
value
=
"http://192.168.1.
150:666
/"
/>
<
add
key
=
"ClientSettingsProvider.ServiceUri"
value
=
""
/>
</
appSettings
>
<
system
.
web
>
...
...
src/IdentificationViewModels/MainPage/MainPageViewModel.cs
View file @
3a63a7b5
...
...
@@ -19,6 +19,8 @@ namespace IdentificationViewModels
{
ActiveHuman
=
new
Human
{
IsCard
=
false
,
IsVisitor
=
false
};
IsStandby
=
true
;
ShowError
=
false
;
ErrorText
=
""
;
}
#
endregion
...
...
@@ -29,6 +31,9 @@ namespace IdentificationViewModels
private
string
_Footer
;
private
int
_AutoResetTime
;
private
bool
_IsStandby
=
true
;
private
string
_VersionString
=
"-"
;
private
bool
_ShowError
;
private
string
_ErrorText
;
#
endregion
#
region
属性
...
...
@@ -96,7 +101,7 @@ namespace IdentificationViewModels
set
{
_tCode
=
value
;
RaisePropertyChanged
(
"tCode"
);
}
}
private
string
_VersionString
=
"-"
;
public
string
VersionString
{
...
...
@@ -104,6 +109,23 @@ namespace IdentificationViewModels
set
{
_VersionString
=
value
;
RaisePropertyChanged
(
"VersionString"
);
}
}
public
bool
ShowError
{
get
{
return
_ShowError
;
}
set
{
_ShowError
=
value
;
RaisePropertyChanged
(
"ShowError"
);
}
}
public
string
ErrorText
{
get
{
return
_ErrorText
;
}
set
{
_ErrorText
=
value
;
RaisePropertyChanged
(
"ErrorText"
);
}
}
#
endregion
}
...
...
src/IdentificationViews/MainPage.xaml
View file @
3a63a7b5
...
...
@@ -112,6 +112,12 @@
</StackPanel>
</Grid>
</Border>
<Border Visibility="{Binding ShowError, Converter={StaticResource BooleanToVisibilityConverter}}"
Grid.Row="1" Width="881" Margin="84,0,84,31"
CornerRadius="25" BorderThickness="2"
Background="#FF0000" BorderBrush="#4Cffffff">
<TextBlock Text="{Binding ErrorText}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="64" Foreground="white"/>
</Border>
</Grid>
</Border>
<!--Main 下-->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment