Skip to content

Commit 3cc32a5

Browse files
committed
New Window aded update 5
fixed any bugs
1 parent b6d5c14 commit 3cc32a5

File tree

687 files changed

+1103
-83993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

687 files changed

+1103
-83993
lines changed
Binary file not shown.

dotnet-app/Reader/.vs/Reader/v16/.suo

12 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

dotnet-app/Reader/Reader/Program.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,26 @@ static void Main(string[] args)
1616

1717
// \native\language\ru.json для дебага и
1818
// \resources\language\ru.json для билда
19-
var rootPath = AppDomain.CurrentDomain.BaseDirectory;
20-
//if(Directory.Exists(Path.Combine(rootPath, "resources")))
21-
//{
22-
// rootPath = Path.Combine(rootPath, "resources");
23-
// }
24-
//System.Windows.Forms.MessageBox.Show(rootPath);
19+
var rootPath = Environment.CurrentDirectory;
20+
if(Directory.Exists(Path.Combine(rootPath, "resources")))
21+
{
22+
rootPath = Path.Combine(rootPath, "resources");
23+
}
24+
2525
var culture = System.Globalization.CultureInfo.CurrentCulture;
26-
26+
2727
try
2828
{
2929
try
3030
{
31-
3231
//System.Windows.Forms.MessageBox.Show(Environment.CurrentDirectory);
33-
34-
FileStream file1 = new FileStream(rootPath + culture.ToString() + ".json", FileMode.Open); //создаем файловый поток "\\native\\language\\"
32+
FileStream file1 = new FileStream(rootPath + "\\native\\language\\" + culture.ToString() + ".json", FileMode.Open); //создаем файловый поток
3533
StreamReader reader = new StreamReader(file1); // создаем «потоковый читатель» и связываем его с файловым потоком
3634

3735
var text = System.Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(reader.ReadToEnd()));
3836
// System.Convert.ToBase64String(reader.ReadToEnd()); - ОШИБКА
3937
Console.Write(text); //считываем все данные с потока и выводим на экран
40-
4138
reader.Close(); //закрываем поток
42-
4339
}
4440
catch (System.IO.DirectoryNotFoundException) {
4541
System.Windows.Forms.MessageBox.Show("Err" + rootPath + "\\native\\language\\ru.json");
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
5+
</startup>
6+
</configuration>
15.5 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
295435ca3fb68388f99f925ccb6dcb861a1b4d31
1+
7667c8ddde9756fa168e3174d450d5f3c0189997

0 commit comments

Comments
 (0)