diff --git a/dialog/EditMember.xaml b/dialog/EditMember.xaml
index 1f3d77b..2f6ef75 100644
--- a/dialog/EditMember.xaml
+++ b/dialog/EditMember.xaml
@@ -28,7 +28,6 @@
-
diff --git a/dialog/RegDialog.xaml b/dialog/RegDialog.xaml
index 14b19de..6f06b49 100644
--- a/dialog/RegDialog.xaml
+++ b/dialog/RegDialog.xaml
@@ -46,15 +46,15 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-
+
-
+
-
-
+
+
diff --git a/dialog/RegDialog.xaml.cs b/dialog/RegDialog.xaml.cs
index b9c39ec..aa3a71e 100644
--- a/dialog/RegDialog.xaml.cs
+++ b/dialog/RegDialog.xaml.cs
@@ -25,65 +25,65 @@ namespace Zerolauncher.dialog
private async void FleshPic(object _, RoutedEventArgs e)
{
- var main_ip = UpDateData.game_url;
- HttpResponseMessage? response = null;
- try
- {
- response = await client.GetAsync($"http://{main_ip}/module/captcha.php");
- if (response != null)
- {
- foreach (var item in response.Headers)
- Console.WriteLine($"{item.Key}");
- }
- //var bin = response.Content.ReadAsStream();
- //verify = ocr.RunInference(new Bitmap(bin));
- //using (var fileStream = File.Create("tmp.png"))
- //{
- // bin.Seek(0, SeekOrigin.Begin);//设置复制开始的地方
- // bin.CopyTo(fileStream);
- //}
- using (var stream = response.Content.ReadAsStream())
- {
- BitmapImage bitmap = new BitmapImage();
- bitmap.BeginInit();
- bitmap.CacheOption = BitmapCacheOption.OnLoad;
- bitmap.StreamSource = stream;
- bitmap.EndInit();
- bitmap.Freeze(); // 为了线程安全
-
- CapPic.Source = bitmap; // 设置Image控件的Source
- }
- }
- catch (Exception ex)
- {
- Console.WriteLine($" 网络发生错误，类型：{ex.GetType().Name}，消息：{ex.Message}");
- }
+ // var main_ip = UpDateData.game_url;
+ // HttpResponseMessage? response = null;
+ // try
+ // {
+ // response = await client.GetAsync($"http://{main_ip}/module/captcha.php");
+ // if (response != null)
+ // {
+ // foreach (var item in response.Headers)
+ // Console.WriteLine($"{item.Key}");
+ // }
+ // //var bin = response.Content.ReadAsStream();
+ // //verify = ocr.RunInference(new Bitmap(bin));
+ // //using (var fileStream = File.Create("tmp.png"))
+ // //{
+ // // bin.Seek(0, SeekOrigin.Begin);//设置复制开始的地方
+ // // bin.CopyTo(fileStream);
+ // //}
+ // using (var stream = response.Content.ReadAsStream())
+ // {
+ // BitmapImage bitmap = new BitmapImage();
+ // bitmap.BeginInit();
+ // bitmap.CacheOption = BitmapCacheOption.OnLoad;
+ // bitmap.StreamSource = stream;
+ // bitmap.EndInit();
+ // bitmap.Freeze(); // 为了线程安全
+ //
+ // CapPic.Source = bitmap; // 设置Image控件的Source
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // Console.WriteLine($" 网络发生错误，类型：{ex.GetType().Name}，消息：{ex.Message}");
+ // }
}
private async void okButton_Click(object _, RoutedEventArgs e)
{
- var main_ip = UpDateData.game_url;
- var values = new Dictionary
- {
- { "rUsername", user },
- { "rPassword", password },
- { "rPasswords", password },
- { "rEmail", bottomMarginTextBox.Text },
- { "rCode", rightMarginTextBox.Text }
- };
- var content = new FormUrlEncodedContent(values);
- try
- {
- var response = await client.PostAsync($"http://{main_ip}/form/register.php", content);
- var src = await response.Content.ReadAsStringAsync();
- var jsonObj = JObject.Parse(src);
- MessageBox.Show(jsonObj["content"].ToString(), jsonObj["title"].ToString());
- if(int.Parse(jsonObj["type"].ToString()) == 0) Close();
- }
- catch (Exception ex)
- {
- MessageBox.Show($"类型：{ex.GetType().Name}，消息：{ex.Message}", "发生错误喵");
- }
+ // var main_ip = UpDateData.game_url;
+ // var values = new Dictionary
+ // {
+ // { "rUsername", user },
+ // { "rPassword", password },
+ // { "rPasswords", password },
+ // { "rEmail", BottomMarginTextBox.Text },
+ // { "rCode", RightMarginTextBox.Text }
+ // };
+ // var content = new FormUrlEncodedContent(values);
+ // try
+ // {
+ // var response = await client.PostAsync($"http://{main_ip}/form/register.php", content);
+ // var src = await response.Content.ReadAsStringAsync();
+ // var jsonObj = JObject.Parse(src);
+ // MessageBox.Show(jsonObj["content"].ToString(), jsonObj["title"].ToString());
+ // if(int.Parse(jsonObj["type"].ToString()) == 0) Close();
+ // }
+ // catch (Exception ex)
+ // {
+ // MessageBox.Show($"类型：{ex.GetType().Name}，消息：{ex.Message}", "发生错误喵");
+ // }
}
private void cancelButton_Click(object sender, RoutedEventArgs e)
diff --git a/dialog/UseAccDataTextAdd.xaml b/dialog/UseAccDataTextAdd.xaml
index f5c8279..36b7a43 100644
--- a/dialog/UseAccDataTextAdd.xaml
+++ b/dialog/UseAccDataTextAdd.xaml
@@ -9,7 +9,7 @@
-
+
diff --git a/dialog/UseAccDataTextAdd.xaml.cs b/dialog/UseAccDataTextAdd.xaml.cs
index c6aff62..742a0b3 100644
--- a/dialog/UseAccDataTextAdd.xaml.cs
+++ b/dialog/UseAccDataTextAdd.xaml.cs
@@ -20,24 +20,26 @@ namespace Zerolauncher.dialog
private void Button_Click(object sender, RoutedEventArgs e)
{
//创建一个打开文件式的对话框
- OpenFileDialog ofd = new OpenFileDialog();
- //设置这个对话框的起始打开路径
- ofd.InitialDirectory = @"C:\";
- //设置打开的文件的类型，注意过滤器的语法
- ofd.Filter = "账号文本|*.txt|其他格式|*.";
+ var ofd = new OpenFileDialog
+ {
+ //设置这个对话框的起始打开路径
+ InitialDirectory = @"C:\",
+ //设置打开的文件的类型，注意过滤器的语法
+ Filter = "账号文本|*.txt|其他格式|*."
+ };
//调用ShowDialog()方法显示该对话框，该方法的返回值代表用户是否点击了确定按钮
if (ofd.ShowDialog() == true)
{
- string[] lines = File.ReadAllLines(ofd.FileName, Encoding.UTF8);
- for (int i = 0; i < lines.Length; i++)
+ var lines = File.ReadAllLines(ofd.FileName, Encoding.UTF8);
+ for (var i = 0; i < lines.Length; i++)
{
- var accTexts = lines[i].Split(input_split.Text);
+ var accTexts = lines[i].Split(InputSplit.Text);
if (accTexts.Length != 5)
{
MessageBox.Show($"文本在{i}行非法喵！\n{lines[i]}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
return;
}
- var acc = new Account { };
+ var acc = new AccountNew { };
if (!int.TryParse(accTexts[0], out acc.providerId))
{
MessageBox.Show($"输入的服务器代号错误喵！在{i}行\n错误：[{lines[i]}]无法转换成服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -48,14 +50,22 @@ namespace Zerolauncher.dialog
MessageBox.Show($"输入的服务器代号错误喵！在{i}行\n错误：[{acc.providerId}]不是有效的服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
return;
}
- acc.serverId = accTexts[1];
+ if (!int.TryParse(accTexts[1], out acc.serverId))
+ {
+ MessageBox.Show($"输入的服务器代号错误喵！在{i}行\n错误：[{lines[i]}]无法转换成服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ return;
+ }
+ if (0 < acc.providerId || acc.providerId > ServicesStaticInfo.ServerIds.Length)
+ {
+ MessageBox.Show($"输入的服务器代号错误喵！在{i}行\n错误：[{acc.providerId}]不是有效的服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+ return;
+ }
acc.userName = accTexts[2];
acc.userPWD = accTexts[3];
acc.nickName = accTexts[4];
- if (!AccountManager.AddAccounts(acc))
- {
- MessageBox.Show($"文本在{i}行出错喵！\n警告：[{acc.nickName}]昵称冲突，将跳过添加此账号", "Warring", MessageBoxButton.OK, MessageBoxImage.Error);
- }
+ if (AccountManager.AddAccounts(acc)) continue;
+ MessageBox.Show($"文本在{i}行出错喵！\n警告：[{acc.nickName}]昵称冲突，将跳过添加此账号", "Warring", MessageBoxButton.OK, MessageBoxImage.Error);
+ return;
}
MessageBox.Show("添加完成喵！", "提示");
AccountManager.saveEdit();