|
@@ -39,6 +39,7 @@ namespace DeviceCenter
|
|
|
private System.Windows.Forms.NotifyIcon notifyIcon = null;
|
|
private System.Windows.Forms.NotifyIcon notifyIcon = null;
|
|
|
private System.Windows.Forms.ContextMenu contextMenuExit;
|
|
private System.Windows.Forms.ContextMenu contextMenuExit;
|
|
|
private System.Windows.Forms.MenuItem menuItem1;
|
|
private System.Windows.Forms.MenuItem menuItem1;
|
|
|
|
|
+ private System.Windows.Forms.MenuItem menuItem2;
|
|
|
private System.ComponentModel.IContainer components;
|
|
private System.ComponentModel.IContainer components;
|
|
|
|
|
|
|
|
public MainWindow()
|
|
public MainWindow()
|
|
@@ -49,18 +50,24 @@ namespace DeviceCenter
|
|
|
notifyIcon.Click += new EventHandler(notifyIcon_Click);
|
|
notifyIcon.Click += new EventHandler(notifyIcon_Click);
|
|
|
notifyIcon.Icon = new Icon("assets\\icon.ico");
|
|
notifyIcon.Icon = new Icon("assets\\icon.ico");
|
|
|
|
|
|
|
|
- this.components = new System.ComponentModel.Container();
|
|
|
|
|
- this.contextMenuExit = new System.Windows.Forms.ContextMenu();
|
|
|
|
|
- this.menuItem1 = new System.Windows.Forms.MenuItem();
|
|
|
|
|
|
|
+ components = new System.ComponentModel.Container();
|
|
|
|
|
+ contextMenuExit = new System.Windows.Forms.ContextMenu();
|
|
|
|
|
+ menuItem1 = new System.Windows.Forms.MenuItem();
|
|
|
|
|
+ menuItem2 = new System.Windows.Forms.MenuItem();
|
|
|
|
|
|
|
|
// Initialize contextMenuExit
|
|
// Initialize contextMenuExit
|
|
|
this.contextMenuExit.MenuItems.AddRange(
|
|
this.contextMenuExit.MenuItems.AddRange(
|
|
|
- new System.Windows.Forms.MenuItem[] { this.menuItem1 });
|
|
|
|
|
|
|
+ new System.Windows.Forms.MenuItem[] { this.menuItem1, menuItem2 });
|
|
|
|
|
|
|
|
// Initialize menuItem1
|
|
// Initialize menuItem1
|
|
|
this.menuItem1.Index = 0;
|
|
this.menuItem1.Index = 0;
|
|
|
this.menuItem1.Text = "退出";
|
|
this.menuItem1.Text = "退出";
|
|
|
this.menuItem1.Click += new EventHandler(this.menuItem1_Click);
|
|
this.menuItem1.Click += new EventHandler(this.menuItem1_Click);
|
|
|
|
|
+
|
|
|
|
|
+ menuItem2.Index = 1;
|
|
|
|
|
+ menuItem2.Text = "开机自启";
|
|
|
|
|
+ menuItem2.Click += new EventHandler(this.menuItem2_Click);
|
|
|
|
|
+ menuItem2.Checked = AppUtil.isAutoStart();
|
|
|
notifyIcon.ContextMenu = this.contextMenuExit;
|
|
notifyIcon.ContextMenu = this.contextMenuExit;
|
|
|
|
|
|
|
|
initSdk();
|
|
initSdk();
|
|
@@ -72,14 +79,14 @@ namespace DeviceCenter
|
|
|
//dispatcherTimer.Interval = new TimeSpan(0, 30, 0);
|
|
//dispatcherTimer.Interval = new TimeSpan(0, 30, 0);
|
|
|
//dispatcherTimer.Start();
|
|
//dispatcherTimer.Start();
|
|
|
|
|
|
|
|
- //System.Windows.Threading.DispatcherTimer timer = new System.Windows.Threading.DispatcherTimer();
|
|
|
|
|
- //timer.Tick += (s, e) =>
|
|
|
|
|
- //{
|
|
|
|
|
- // ((System.Windows.Threading.DispatcherTimer)s).Stop();
|
|
|
|
|
- // GetAllCard(null, null);
|
|
|
|
|
- //};
|
|
|
|
|
- //timer.Interval = new TimeSpan(0, 0, 5);
|
|
|
|
|
- //timer.Start();
|
|
|
|
|
|
|
+ System.Windows.Threading.DispatcherTimer timer = new System.Windows.Threading.DispatcherTimer();
|
|
|
|
|
+ timer.Tick += (s, e) =>
|
|
|
|
|
+ {
|
|
|
|
|
+ ((System.Windows.Threading.DispatcherTimer)s).Stop();
|
|
|
|
|
+ GetAllCard(null, null);
|
|
|
|
|
+ };
|
|
|
|
|
+ timer.Interval = new TimeSpan(0, 0, 5);
|
|
|
|
|
+ timer.Start();
|
|
|
|
|
|
|
|
|
|
|
|
|
ScheduleJob();
|
|
ScheduleJob();
|
|
@@ -147,6 +154,21 @@ namespace DeviceCenter
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private void menuItem2_Click(object Sender, EventArgs e)
|
|
|
|
|
+ {
|
|
|
|
|
+ if (AppUtil.isAutoStart())
|
|
|
|
|
+ {
|
|
|
|
|
+ AppUtil.disableAutoStart();
|
|
|
|
|
+ menuItem2.Checked = false;
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ AppUtil.enableAutoStart();
|
|
|
|
|
+ menuItem2.Checked = true;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private async void initSdk()
|
|
private async void initSdk()
|
|
|
{
|
|
{
|
|
|
await Task.Run(() =>
|
|
await Task.Run(() =>
|
|
@@ -356,7 +378,7 @@ namespace DeviceCenter
|
|
|
string leaderCard = 1 == struCardCfg.byLeaderCard ? "YES" : "NO";
|
|
string leaderCard = 1 == struCardCfg.byLeaderCard ? "YES" : "NO";
|
|
|
string name = Encoding.UTF8.GetString(struCardCfg.byName);
|
|
string name = Encoding.UTF8.GetString(struCardCfg.byName);
|
|
|
|
|
|
|
|
- //log.Info(string.Format("cardNo:{0} name:{1}", cardNo, name));
|
|
|
|
|
|
|
+ log.Info($"cardNo:{cardNo} name:{name} departmentNo:{struCardCfg.wDepartmentNo}");
|
|
|
|
|
|
|
|
//var request = new RestRequest("staffInfo/saveStaffInfo", DataFormat.Json);
|
|
//var request = new RestRequest("staffInfo/saveStaffInfo", DataFormat.Json);
|
|
|
//request.AddParameter("name", name);
|
|
//request.AddParameter("name", name);
|
|
@@ -557,6 +579,7 @@ namespace DeviceCenter
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void ProcessAcsEvent(ref CHCNetSDK.NET_DVR_ACS_EVENT_CFG struCFG, ref bool flag)
|
|
private void ProcessAcsEvent(ref CHCNetSDK.NET_DVR_ACS_EVENT_CFG struCFG, ref bool flag)
|