Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复因缺失Log文件夹导致随机测试闪退的问题。 #146

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 30 additions & 32 deletions Model/Mp3/PlayMp3.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public MUSIC()
private string Name = "";
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
private string durLength = "";
[MarshalAs(UnmanagedType.LPTStr, SizeConst = 128)]
private string TemStr = "";
//[MarshalAs(UnmanagedType.LPTStr, SizeConst = 128)]
//private string TemStr = "";
int ilong;
//定义播放状态枚举变量
public enum State
Expand Down Expand Up @@ -54,9 +54,7 @@ public string FileName
{
try
{
TemStr = "";
TemStr = TemStr.PadLeft(127, Convert.ToChar(" "));
Name = Name.PadLeft(260, Convert.ToChar(" "));
Name = Name.PadLeft(260, ' ');
mc.iName = value;
ilong = APIClass.GetShortPathName(mc.iName, Name, Name.Length);
Name = GetCurrPath(Name);
Expand All @@ -74,9 +72,9 @@ public string FileName
}

//Name = "open " + Convert.ToChar(34) + Name + Convert.ToChar(34) + " alias media";
ilong = APIClass.mciSendString("close all", TemStr, TemStr.Length, 0);
ilong = APIClass.mciSendString(Name, TemStr, TemStr.Length, 0);
ilong = APIClass.mciSendString("set media time format milliseconds", TemStr, TemStr.Length, 0);
ilong = APIClass.mciSendString("close all", IntPtr.Zero, 0, 0);
ilong = APIClass.mciSendString(Name, IntPtr.Zero, 0, 0);
ilong = APIClass.mciSendString("set media time format milliseconds", IntPtr.Zero, 0, 0);
mc.state = State.mStop;
}
catch
Expand All @@ -87,26 +85,21 @@ public string FileName
//播放
public void play()
{
TemStr = "";
TemStr = TemStr.PadLeft(127, Convert.ToChar(" "));
APIClass.mciSendString("play media", TemStr, TemStr.Length, 0);
//APIClass.mciSendString("play media", null, 0, 0);
//TemStr = new String('\0', 128);
//APIClass.mciSendString("play media", TemStr, TemStr.Length, 0);
APIClass.mciSendString("play media", IntPtr.Zero, 0, 0);
mc.state = State.mPlaying;
}
//停止
public void StopT()
{
TemStr = "";
TemStr = TemStr.PadLeft(128, Convert.ToChar(" "));
ilong = APIClass.mciSendString("close media", TemStr, 128, 0);
ilong = APIClass.mciSendString("close all", TemStr, 128, 0);
ilong = APIClass.mciSendString("close media", IntPtr.Zero, 0, 0);
ilong = APIClass.mciSendString("close all", IntPtr.Zero, 0, 0);
mc.state = State.mStop;
}
public void Puase()
{
TemStr = "";
TemStr = TemStr.PadLeft(128, Convert.ToChar(" "));
ilong = APIClass.mciSendString("pause media", TemStr, TemStr.Length, 0);
ilong = APIClass.mciSendString("pause media", IntPtr.Zero, 0, 0);
mc.state = State.mPuase;
}
private string GetCurrPath(string name)
Expand All @@ -121,8 +114,7 @@ public int Duration
{
get
{
durLength = "";
durLength = durLength.PadLeft(128, Convert.ToChar(" "));
durLength = new String('\0', 128);
APIClass.mciSendString("status media length", durLength, durLength.Length, 0);
durLength = durLength.Trim();
if (durLength == "") return 0;
Expand All @@ -134,8 +126,7 @@ public int CurrentPosition
{
get
{
durLength = "";
durLength = durLength.PadLeft(128, Convert.ToChar(" "));
durLength = new String('\0', 128);
APIClass.mciSendString("status media position", durLength, durLength.Length, 0);
mc.iPos = (int)(Convert.ToDouble(durLength) / 1000f);
return mc.iPos;
Expand Down Expand Up @@ -184,16 +175,23 @@ public class APIClass
{
[DllImport("kernel32.dll", CharSet = CharSet.Auto)]
public static extern int GetShortPathName(
string lpszLongPath,
string shortFile,
int cchBuffer
);
string lpszLongPath,
string shortFile,
int cchBuffer
);
[DllImport("winmm.dll", EntryPoint = "mciSendString", CharSet = CharSet.Auto)]
public static extern int mciSendString(
string lpstrCommand,
string lpstrReturnString,
int uReturnLength,
int hwndCallback
);
string lpstrCommand,
string lpstrReturnString,
int uReturnLength,
int hwndCallback
);
[DllImport("winmm.dll", EntryPoint = "mciSendString", CharSet = CharSet.Auto)]
public static extern int mciSendString(
string lpstrCommand,
IntPtr lpstrReturnString,
int uReturnLength,
int hwndCallback
);
}
}
15 changes: 5 additions & 10 deletions View/ToastFish.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ public partial class MainWindow : Window
//HotKey _hotKey0, _hotKey1, _hotKey2, _hotKey3, _hotKey4;
public MainWindow()
{
if (!Directory.Exists("Log"))
{
System.IO.Directory.CreateDirectory("Log");
}

Form_Load();
InitializeComponent();
DataContext = Vm;
Expand Down Expand Up @@ -344,11 +349,6 @@ private void NotifyIconDoubleClick(object sender, EventArgs e)

private void Begin_Click(object sender, EventArgs e)
{
if (!System.IO.Directory.Exists("Log")) {
System.IO.Directory.CreateDirectory("Log");
}
// System.IO.Directory.CreateDirectory("Log");

var state = thread.ThreadState;

WordType Words = new WordType();
Expand Down Expand Up @@ -446,11 +446,6 @@ private void ImportWords_Click(object sender, EventArgs e)
System.Windows.Forms.MessageBox.Show("导入文件出错!");
return;
}

if (!Directory.Exists("Log")){
System.IO.Directory.CreateDirectory("Log");
}


var state = thread.ThreadState;

Expand Down