Skip to content

Commit a2b3108

Browse files
chenxuuuchenxuuu
committed
支持自动恢复文件目录结构
1 parent 01100b9 commit a2b3108

File tree

10 files changed

+90
-13
lines changed

10 files changed

+90
-13
lines changed

‎changlog/autoUpdate.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<item>
3-
<version>1.0.1.6</version>
4-
<url>https://llcom.papapoi.com/update/1.0.1.6.zip</url>
5-
<changelog>https://llcom.papapoi.com/changelog/1.0.1.6.html</changelog>
3+
<version>1.0.1.7</version>
4+
<url>https://llcom.papapoi.com/update/1.0.1.7.zip</url>
5+
<changelog>https://llcom.papapoi.com/changelog/1.0.1.7.html</changelog>
66
<mandatory mode="1">true</mandatory>
77
</item>

‎changlog/index.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
> 欢迎加入交流群：`906307487`
1010

11+
## LLCOM 1.0.1.7
12+
13+
- LLCOM现已支持自动恢复文件结构！现在你可以直接分享单个exe文件给朋友们了，不用打包整个工具
14+
15+
---
16+
1117
## LLCOM 1.0.1.6
1218

1319
- 增加对收发数据显示长度的限制，防止因过长而卡死软件

‎llcom/DefaultFiles/logs/empty‎

Whitespace-only changes.

‎llcom/DefaultFiles/user_script_run/logs/empty‎

Whitespace-only changes.

‎llcom/DefaultFiles/user_script_run/requires/empty‎

Whitespace-only changes.

‎llcom/DefaultFiles/请解压后再使用！不要在压缩软件里点开！‎

Whitespace-only changes.

‎llcom/MainWindow.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Window x:Class="llcom.MainWindow"
1+
<Window x:Class="llcom.MainWindow"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -72,7 +72,7 @@
7272
<Button Name="clearLogButton" Content="清空日志" Grid.Column="4" Margin="2" Click="ClearLogButton_Click"/>
7373
<Button Name="MoreSettingButton" Content="更多设置" Grid.Column="4" Grid.Row="1" Margin="2" ToolTip="可设置串口校验位停止位等信息、设置发送前的自动处理脚本。" Click="MoreSettingButton_Click"/>
7474
<TextBox Name="toSendDataTextBox" Text="{Binding dataToSend}" Grid.Column="5" Grid.RowSpan="2" Grid.ColumnSpan="4" Height="50" VerticalContentAlignment="Top"
75-
TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Margin="2" FontFamily="Consolas"/>
75+
TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Margin="2,2,2,4" FontFamily="Consolas"/>
7676
<Button Name="sendDataButton" Content="发送" Grid.Column="9" Grid.RowSpan="2" Margin="2" ToolTip="按Ctrl+Enter同样也可以发送数据。" Command="{StaticResource SendUartData}"/>
7777
</Grid>
7878

@@ -225,7 +225,7 @@
225225
<Button Name="deleteSendListButton" Content="删除最后一项" Grid.Column="1" Margin="3" Click="DeleteSendListButton_Click"/>
226226
</Grid>
227227
<TextBlock Text="发送处理的lua脚本，同样对此处发送的数据生效。" TextWrapping="Wrap" FontWeight="Bold"/>
228-
<Button Name="importSSCOMButton" Content="一键导入SSCOM数据" Grid.Column="1" Margin="3" Click="ImportSSCOMButton_Click"/>
228+
<Button Name="importSSCOMButton" Content="一键导入SSCOM数据" Grid.Column="1" Margin="3,3,3,5" Click="ImportSSCOMButton_Click"/>
229229
</StackPanel>
230230
</ScrollViewer>
231231
</TabItem>

‎llcom/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
5252
//通过使用 "*"，如下所示:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.1.6")]
55-
[assembly: AssemblyFileVersion("1.0.1.6")]
54+
[assembly: AssemblyVersion("1.0.1.7")]
55+
[assembly: AssemblyFileVersion("1.0.1.7")]
5656
[assembly: NeutralResourcesLanguage("zh-CN")]
5757

‎llcom/Tools/Global.cs‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,42 @@ public static void Initial()
3030
{
3131
if (!Directory.Exists("core_script"))
3232
{
33-
System.Windows.MessageBox.Show("core_script文件夹丢失！请确保没有乱删文件！如无法恢复，请去官网重新下载该软件。");
34-
Environment.Exit(1);
33+
Directory.CreateDirectory("core_script");
3534
}
35+
CreateFile("DefaultFiles/core_script/head.lua", "core_script/head.lua",false);
36+
CreateFile("DefaultFiles/core_script/JSON.lua", "core_script/JSON.lua", false);
37+
CreateFile("DefaultFiles/core_script/log.lua", "core_script/log.lua", false);
38+
CreateFile("DefaultFiles/core_script/once.lua", "core_script/once.lua", false);
39+
CreateFile("DefaultFiles/core_script/strings.lua", "core_script/strings.lua", false);
40+
CreateFile("DefaultFiles/core_script/sys.lua", "core_script/sys.lua", false);
41+
3642
if (!Directory.Exists("logs"))
3743
Directory.CreateDirectory("logs");
3844
if (!Directory.Exists("user_script_run"))
45+
{
3946
Directory.CreateDirectory("user_script_run");
47+
CreateFile("DefaultFiles/user_script_run/AT控制TCP连接-快发模式.lua", "user_script_run/AT控制TCP连接-快发模式.lua");
48+
CreateFile("DefaultFiles/user_script_run/AT控制TCP连接-慢发模式.lua", "user_script_run/AT控制TCP连接-慢发模式.lua");
49+
CreateFile("DefaultFiles/user_script_run/example.lua", "user_script_run/example.lua");
50+
CreateFile("DefaultFiles/user_script_run/循环发送快捷发送区数据.lua", "user_script_run/循环发送快捷发送区数据.lua");
51+
}
52+
if (!Directory.Exists("user_script_run/requires"))
53+
Directory.CreateDirectory("user_script_run/requires");
54+
if (!Directory.Exists("user_script_run/logs"))
55+
Directory.CreateDirectory("user_script_run/logs");
56+
4057
if (!Directory.Exists("user_script_send_convert"))
58+
{
4159
Directory.CreateDirectory("user_script_send_convert");
42-
if (!Directory.Exists("user_script_run\\logs"))
43-
Directory.CreateDirectory("user_script_run\\logs");
60+
CreateFile("DefaultFiles/user_script_send_convert/16进制数据.lua", "user_script_send_convert/16进制数据.lua");
61+
CreateFile("DefaultFiles/user_script_send_convert/GPS NMEA.lua", "user_script_send_convert/GPS NMEA.lua");
62+
CreateFile("DefaultFiles/user_script_send_convert/加上换行回车.lua", "user_script_send_convert/加上换行回车.lua");
63+
CreateFile("DefaultFiles/user_script_send_convert/解析换行回车的转义字符.lua", "user_script_send_convert/解析换行回车的转义字符.lua");
64+
CreateFile("DefaultFiles/user_script_send_convert/默认.lua", "user_script_send_convert/默认.lua");
65+
}
4466

67+
CreateFile("DefaultFiles/LICENSE", "LICENSE",false);
68+
CreateFile("DefaultFiles/反馈网址.txt", "反馈网址.txt", false);
4569

4670
//导入之前的配置文件
4771
if (Properties.Settings.Default.UpgradeRequired)
@@ -211,5 +235,32 @@ public static string Byte2Hex(byte[] d, string s = "")
211235
}
212236
return r;
213237
}
238+
239+
/// <summary>
240+
/// 读取软件资源文件内容
241+
/// </summary>
242+
/// <param name="path">路径</param>
243+
/// <returns>内容字节数组</returns>
244+
public static byte[] GetAssetsFileContent(string path)
245+
{
246+
Uri uri = new Uri(path, UriKind.Relative);
247+
var source = System.Windows.Application.GetResourceStream(uri).Stream;
248+
byte[] f = new byte[source.Length];
249+
source.Read(f, 0, (int)source.Length);
250+
return f;
251+
}
252+
253+
/// <summary>
254+
/// 取出文件
255+
/// </summary>
256+
/// <param name="insidePath">软件内部的路径</param>
257+
/// <param name="outPath">需要释放到的路径</param>
258+
/// <param name="d">是否覆盖</param>
259+
public static void CreateFile(string insidePath, string outPath, bool d = true)
260+
{
261+
if(!File.Exists(outPath) || d)
262+
File.WriteAllBytes(outPath, GetAssetsFileContent(insidePath));
263+
}
264+
214265
}
215266
}

‎llcom/llcom.csproj‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,22 @@
182182
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
183183
</EmbeddedResource>
184184
<EmbeddedResource Include="Lua.xshd" />
185+
<Resource Include="DefaultFiles\core_script\head.lua" />
186+
<Resource Include="DefaultFiles\core_script\JSON.lua" />
187+
<Resource Include="DefaultFiles\core_script\log.lua" />
188+
<Resource Include="DefaultFiles\core_script\once.lua" />
189+
<Resource Include="DefaultFiles\core_script\strings.lua" />
190+
<Resource Include="DefaultFiles\core_script\sys.lua" />
191+
<Resource Include="DefaultFiles\LICENSE" />
192+
<Resource Include="DefaultFiles\user_script_run\AT控制TCP连接-快发模式.lua" />
193+
<Resource Include="DefaultFiles\user_script_run\AT控制TCP连接-慢发模式.lua" />
194+
<Resource Include="DefaultFiles\user_script_run\example.lua" />
195+
<Resource Include="DefaultFiles\user_script_run\循环发送快捷发送区数据.lua" />
196+
<Resource Include="DefaultFiles\user_script_send_convert\16进制数据.lua" />
197+
<Resource Include="DefaultFiles\user_script_send_convert\GPS NMEA.lua" />
198+
<Resource Include="DefaultFiles\user_script_send_convert\加上换行回车.lua" />
199+
<Resource Include="DefaultFiles\user_script_send_convert\解析换行回车的转义字符.lua" />
200+
<Resource Include="DefaultFiles\user_script_send_convert\默认.lua" />
185201
<None Include="packages.config" />
186202
<None Include="Properties\Settings.settings">
187203
<Generator>PublicSettingsSingleFileGenerator</Generator>
@@ -200,14 +216,18 @@
200216
<ItemGroup>
201217
<EmbeddedResource Include="costura32\xlua.dll" />
202218
</ItemGroup>
219+
<ItemGroup>
220+
<Resource Include="DefaultFiles\反馈网址.txt" />
221+
</ItemGroup>
203222
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
204223
<Target Name="AfterBuild">
205224
<ItemGroup>
206225
<MoveToLibFolder Include="$(OutputPath)*.dll ; $(OutputPath)*.pdb ; $(OutputPath)*.xml" />
207226
</ItemGroup>
208227
</Target>
209228
<PropertyGroup>
210-
<PostBuildEvent>xcopy /e /r /y "$(ProjectDir)DefaultFiles" "$(SolutionDir)llcom\$(OutDir)"</PostBuildEvent>
229+
<PostBuildEvent>
230+
</PostBuildEvent>
211231
</PropertyGroup>
212232
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
213233
<PropertyGroup>

0 commit comments

Comments
 (0)