maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

未关闭抽屉添加提示音，退出时未关闭抽屉菜单显示不对修改

This commit is contained in:
maqiao 2024-12-22 09:22:37 +08:00
parent 5793c1ffcf
commit c7a3ef80ad
3 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.config
View File

@ -3,7 +3,7 @@
<connectionStrings> <connectionStrings>
<!-- 数据库连接字符串 --> <!-- 数据库连接字符串 -->
<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />--> <!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
<add name="database" connectionString="server=127.0.0.1;port=3306;database=xx_xiangchang2;userid=root;password=root" /> <add name="database" connectionString="server=127.0.0.1;port=3306;database=xiangxiang_xianchang;userid=root;password=root" />
</connectionStrings> </connectionStrings>
<!--<runtime> <!--<runtime>
--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!-- --><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--

8
DM_Weight/Port/PortUtil.cs
View File

@ -416,7 +416,7 @@ namespace DM_Weight.Port
} }
} }
int i = 10;
public async void GetDrawerStatus() public async void GetDrawerStatus()
{ {
try try
@ -517,6 +517,12 @@ namespace DM_Weight.Port
logger.Info($"单支板数量变化【{string.Join(",", Quantitys)}】"); logger.Info($"单支板数量变化【{string.Join(",", Quantitys)}】");
} }
i--;
if (i == 0)
{
SpeakAsync("请关闭抽屉");
i = 10;
}
// 继续监听抽屉状态 // 继续监听抽屉状态
await Task.Delay(200); await Task.Delay(200);
GetDrawerStatus(); GetDrawerStatus();

16
DM_Weight/ViewModels/HomeWindowViewModel.cs
View File

@ -172,6 +172,7 @@ namespace DM_Weight.ViewModels
SetProperty(ref _selectedMenu, value); SetProperty(ref _selectedMenu, value);
} }
} }
PremissionDm? PreSelectedMenu;
#region 父菜单点击事件 #region 父菜单点击事件
#endregion #endregion
@ -182,6 +183,18 @@ namespace DM_Weight.ViewModels
} }
private void SelectionMethod() private void SelectionMethod()
{ {
if (SelectedMenu != null && SelectedMenu.PremissionName != "退出")
{
PreSelectedMenu = SelectedMenu;
}
if (_portUtil.Operate)
{
if (PreSelectedMenu != null)
{
SelectedMenu = PreSelectedMenu;
}
}
//SelectedMenu = viewName.SelectedItem as PremissionDm; //SelectedMenu = viewName.SelectedItem as PremissionDm;
//if (SelectedMenu.PremissionName == "退出") //if (SelectedMenu.PremissionName == "退出")
//{ //{
@ -198,7 +211,7 @@ namespace DM_Weight.ViewModels
// SelectedChildMenu = SelectedMenu.Children[0]; // SelectedChildMenu = SelectedMenu.Children[0];
//} //}
logger.Info("开始进入父菜单"); logger.Info("开始进入父菜单");
if (SelectedMenu != null && SelectedMenu.PremissionName == "退出") if (SelectedMenu != null && SelectedMenu.PremissionName == "退出" && !_portUtil.Operate)
{ {
logger.Info($"用户【{Operator?.Nickname}】退出登录"); logger.Info($"用户【{Operator?.Nickname}】退出登录");
Operator = null; Operator = null;
@ -520,6 +533,7 @@ namespace DM_Weight.ViewModels
//.ToTree(pd => pd.Children, pd => pd.ParentId, 0); //.ToTree(pd => pd.Children, pd => pd.ParentId, 0);
PremissionDmList = premissions; PremissionDmList = premissions;
SelectedMenu = premissions[0]; SelectedMenu = premissions[0];
PreSelectedMenu= premissions[0];
SelectedChildMenu = premissions[0].Children[0]; SelectedChildMenu = premissions[0].Children[0];
_regionManager.RequestNavigate("ContentRegion", premissions[0].Children[0].PremissionPath); _regionManager.RequestNavigate("ContentRegion", premissions[0].Children[0].PremissionPath);
FindDrawerCount(); FindDrawerCount();