dinhthuanbk88/DE70
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Tăng thời gian hiện Reset Counter

Browse Source 
- Sửa lại Task gửi dữ liệu
This commit is contained in:
Nguyen Dinh Thuan
2024-09-20 19:50:58 +07:00
parent 45704a16fe
commit 8cb760e4a4
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API/APIModels.cs
-1
View File
@@ -171,7 +171,6 @@ namespace SafeBagDE70.API
{ {
var json = JsonConvert.SerializeObject(deviceStatus); var json = JsonConvert.SerializeObject(deviceStatus);
var _deviceStatus = JsonConvert.DeserializeObject<DeviceStatus>(json); var _deviceStatus = JsonConvert.DeserializeObject<DeviceStatus>(json);
_deviceStatus.DeviceTime = DateTime.Now;
HttpClientHandler clientHandler = new HttpClientHandler(); HttpClientHandler clientHandler = new HttpClientHandler();
clientHandler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => { return true; }; clientHandler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => { return true; };
Admin/AdminConfigurationUC.xaml.cs
+2 -2
View File
@@ -43,7 +43,7 @@ namespace SafeBagDE70.Admin
((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen(); ((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen();
Task.Run(() => Task.Run(() =>
{ {
Thread.Sleep(5000); Thread.Sleep(30000);
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
lblCounterStatus.Text = ""; lblCounterStatus.Text = "";
@@ -83,7 +83,7 @@ namespace SafeBagDE70.Admin
((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen(); ((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen();
Task.Run(() => Task.Run(() =>
{ {
Thread.Sleep(2000); Thread.Sleep(10000);
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
lblCounterStatus.Text = ""; lblCounterStatus.Text = "";
Admin/UserManageUC.xaml
+2 -2
View File
@@ -8,8 +8,8 @@
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<Grid> <Grid>
<StackPanel> <StackPanel>
<Button Content="TẢI D/S GIAN HÀNG" Width="200" Margin="10" x:Name="btnGetUsers" Click="btnGetUsers_Click"/> <Button Content="TẢI D/S GIAN HÀNG" Width="300" Margin="10" x:Name="btnGetUsers" Click="btnGetUsers_Click"/>
<Button Content="ĐỒNG BỘ GIAO DỊCH LÊN SERVER" Width="200" Margin="10" x:Name="btnSyncTransaction" Click="btnSyncTransaction_Click"/> <Button Content="ĐỒNG BỘ GIAO DỊCH LÊN SERVER" Width="300" Margin="10" x:Name="btnSyncTransaction" Click="btnSyncTransaction_Click"/>
<Label x:Name="lblStatus"/> <Label x:Name="lblStatus"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
DepositSMUCv2.xaml.cs
+4 -1
View File
@@ -1064,7 +1064,10 @@ namespace SafeBagDE70
} }
else else
{ {
str = $"PHIÊN GIAO DỊCH KHÔNG HỢP LỆ (SỐ TIỀN GIAO DỊCH KHÔNG KHỚP), VUI LÒNG BÁO CÁO LẠI CHI NHÁNH\r\n MÃ GD: {AppData.GetTransactionCode}"; str = $"PHIÊN GIAO DỊCH KHÔNG HỢP LỆ (SỐ TIỀN GIAO DỊCH KHÔNG KHỚP), VUI LÒNG BÁO CÁO LẠI CHI NHÁNH" +
$"\r\n MÃ GD: {AppData.GetTransactionCode()} " +
$"\r\nMÁY: {Environment.MachineName}" +
$"\r\nMÃ NV: {AppData.CurrentCustomerAccount.CustomerId}";
Log.Information(str); Log.Information(str);
ShowError(str); ShowError(str);
} }