From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 698abcd..40ee2ef 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -57,14 +57,13 @@
/// ((褰撳墠鏃堕棿)DateTime.Now - (璁板綍鏃堕棿)LastDateTimeLastDateTime).TotalSeconds=璇樊鏃堕棿(绉�)
/// </summary>
public DateTime LastDateTime;
- /// <summary>
- /// 璁板綍婊戝姩闊抽噺鏉℃椂闂�<鐢ㄦ潵澶勭悊闊抽噺璺冲姩>
- /// </summary>
- public static DateTime ProgressDateTime = DateTime.MinValue;
+
/// <summary>
/// 闊充箰鎾斁鍣↖D
/// </summary>
public string UniqueDeviceName = string.Empty;
+
+
public MusicInfo CurrentMusic = new MusicInfo();
@@ -115,7 +114,10 @@
public Slaves Slave = new Slaves();
-
+ /// <summary>
+ /// 璁板綍鏃堕棿
+ /// </summary>
+ public static DateTime ProgressDateTime = DateTime.Now;
/// <summary>
/// 鍒ゆ柇鏄惁鏄痡son鏁版嵁
--
Gitblit v1.8.0