Skip to content

Commit 423de07

Browse files
committed
update: 默认用x64版本
1 parent fac2095 commit 423de07

4 files changed

Lines changed: 18 additions & 5 deletions

File tree

WapProj/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Identity
1010
Name="800948F61A16.llcom"
1111
Publisher="CN=33E7C5B3-A6A5-4489-B89F-4038AA5CC34B"
12-
Version="1.1.10.0" />
12+
Version="1.1.11.0" />
1313

1414
<Properties>
1515
<DisplayName>llcom</DisplayName>

llcom/Pages/SerialMonitorPage.xaml.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
9292
catch
9393
{
9494
MonitorButton.IsEnabled = false;
95-
MessageBox.Show("插件加载失败,目前该功能还不兼容x64版本的LLCOM");
95+
MessageBox.Show("插件加载失败,目前该功能还不兼容x64版本的LLCOM。\r\n" +
96+
"如需使用该功能,请下载32位x86快照版本。");
9697
}
9798
}
9899
}

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.1.1.0")]
55-
[assembly: AssemblyFileVersion("1.1.1.0")]
54+
[assembly: AssemblyVersion("1.1.1.1")]
55+
[assembly: AssemblyFileVersion("1.1.1.1")]
5656
[assembly: NeutralResourcesLanguage("zh-CN")]
5757

llcom/Tools/Global.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,19 @@ public static bool IsMSIX()
117117
/// </summary>
118118
public static void LoadSetting()
119119
{
120-
if (!IsMSIX())
120+
if (IsMSIX())
121+
{
122+
if(Directory.Exists(ProfilePath))
123+
{
124+
//已经开过一次了,那就继续用之前的路径
125+
}
126+
else
127+
{
128+
//appdata路径不可靠,用文档路径替代
129+
ProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\llcom\\";
130+
}
131+
}
132+
else
121133
{
122134
ProfilePath = AppPath;//普通exe时,直接用软件路径
123135
}

0 commit comments

Comments
 (0)