diff --git a/.vs/IOTContainer/v17/.suo b/.vs/IOTContainer/v17/.suo index f1006965..4b52d02e 100644 Binary files a/.vs/IOTContainer/v17/.suo and b/.vs/IOTContainer/v17/.suo differ diff --git a/.vs/IOTContainer/v17/HierarchyCache.v1.txt b/.vs/IOTContainer/v17/HierarchyCache.v1.txt index 636c1a93..fde34937 100644 Binary files a/.vs/IOTContainer/v17/HierarchyCache.v1.txt and b/.vs/IOTContainer/v17/HierarchyCache.v1.txt differ diff --git a/ConUpdate/bin/Debug/ConUpdate.exe b/ConUpdate/bin/Debug/ConUpdate.exe index 6726b44d..3c91c0da 100644 Binary files a/ConUpdate/bin/Debug/ConUpdate.exe and b/ConUpdate/bin/Debug/ConUpdate.exe differ diff --git a/ConUpdate/bin/Debug/ConUpdate.pdb b/ConUpdate/bin/Debug/ConUpdate.pdb index ce83bcf2..09892f33 100644 Binary files a/ConUpdate/bin/Debug/ConUpdate.pdb and b/ConUpdate/bin/Debug/ConUpdate.pdb differ diff --git a/ConUpdate/obj/Debug/ConUpdate.csproj.AssemblyReference.cache b/ConUpdate/obj/Debug/ConUpdate.csproj.AssemblyReference.cache index 9276a1a6..acb38ea7 100644 Binary files a/ConUpdate/obj/Debug/ConUpdate.csproj.AssemblyReference.cache and b/ConUpdate/obj/Debug/ConUpdate.csproj.AssemblyReference.cache differ diff --git a/ConUpdate/obj/Debug/ConUpdate.exe b/ConUpdate/obj/Debug/ConUpdate.exe index 6726b44d..3c91c0da 100644 Binary files a/ConUpdate/obj/Debug/ConUpdate.exe and b/ConUpdate/obj/Debug/ConUpdate.exe differ diff --git a/ConUpdate/obj/Debug/ConUpdate.pdb b/ConUpdate/obj/Debug/ConUpdate.pdb index ce83bcf2..09892f33 100644 Binary files a/ConUpdate/obj/Debug/ConUpdate.pdb and b/ConUpdate/obj/Debug/ConUpdate.pdb differ diff --git a/IOTContainer/Common/HttpComm.cs b/IOTContainer/Common/HttpComm.cs index f64294ee..226ecbbe 100644 --- a/IOTContainer/Common/HttpComm.cs +++ b/IOTContainer/Common/HttpComm.cs @@ -941,8 +941,8 @@ namespace IOTContainer.Common { try { - if (string.IsNullOrEmpty(ComParameters.Parameters.downloadUrl)) - { + //if (string.IsNullOrEmpty(ComParameters.Parameters.downloadUrl)) + //{ string api = "/api/data/v1/web/getUploadUrl"; string httpUri = _httpUrl + api; var result = Get(httpUri); @@ -965,7 +965,7 @@ namespace IOTContainer.Common { Log.MyLog.WriteLogFile("获取文件服务器地址失败:" + result); } - } + //} } catch (Exception ex) { diff --git a/IOTContainer/View/EdgeWindow.xaml.cs b/IOTContainer/View/EdgeWindow.xaml.cs index 19f10916..8dce97d7 100644 --- a/IOTContainer/View/EdgeWindow.xaml.cs +++ b/IOTContainer/View/EdgeWindow.xaml.cs @@ -265,8 +265,8 @@ namespace IOTContainer.View webView.CoreWebView2.SetVirtualHostNameToFolderMapping("navigation", Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "www"), CoreWebView2HostResourceAccessKind.Allow); Thread.Sleep(3000); - //webView.CoreWebView2.Navigate("http://navigation/index.html"); - webView.Source = new Uri("http://192.168.1.114:5500/index.html"); + webView.CoreWebView2.Navigate("http://navigation/index.html"); + //webView.Source = new Uri("http://192.168.1.114:5500/index.html"); } } catch (Exception ex) diff --git a/IOTContainer/bin/Debug/ConUpdate.exe b/IOTContainer/bin/Debug/ConUpdate.exe index 6726b44d..3c91c0da 100644 Binary files a/IOTContainer/bin/Debug/ConUpdate.exe and b/IOTContainer/bin/Debug/ConUpdate.exe differ diff --git a/IOTContainer/bin/Debug/ConUpdate.pdb b/IOTContainer/bin/Debug/ConUpdate.pdb index ce83bcf2..09892f33 100644 Binary files a/IOTContainer/bin/Debug/ConUpdate.pdb and b/IOTContainer/bin/Debug/ConUpdate.pdb differ diff --git a/IOTContainer/bin/Debug/IOTContainer.exe b/IOTContainer/bin/Debug/IOTContainer.exe index f56b3806..9fdc13d8 100644 Binary files a/IOTContainer/bin/Debug/IOTContainer.exe and b/IOTContainer/bin/Debug/IOTContainer.exe differ diff --git a/IOTContainer/bin/Debug/IOTContainer.pdb b/IOTContainer/bin/Debug/IOTContainer.pdb index 211f86bf..1288169d 100644 Binary files a/IOTContainer/bin/Debug/IOTContainer.pdb and b/IOTContainer/bin/Debug/IOTContainer.pdb differ diff --git a/IOTContainer/bin/Debug/IOTContainer_sys_V2.1_Biaozhun_V1.0.9_B4.zip b/IOTContainer/bin/Debug/IOTContainer_sys_V2.1_Biaozhun_V1.0.9_B4.zip new file mode 100644 index 00000000..60c27e23 Binary files /dev/null and b/IOTContainer/bin/Debug/IOTContainer_sys_V2.1_Biaozhun_V1.0.9_B4.zip differ diff --git a/IOTContainer/bin/Debug/IOTContainer_sys_V2.1_Biaozhun_V1.0.9_B5.zip b/IOTContainer/bin/Debug/IOTContainer_sys_V2.1_Biaozhun_V1.0.9_B5.zip new file mode 100644 index 00000000..ee63ae22 Binary files /dev/null and b/IOTContainer/bin/Debug/IOTContainer_sys_V2.1_Biaozhun_V1.0.9_B5.zip differ diff --git a/IOTContainer/obj/Debug/IOTContainer.csproj.AssemblyReference.cache b/IOTContainer/obj/Debug/IOTContainer.csproj.AssemblyReference.cache index b2c54ab9..4fbd6acd 100644 Binary files a/IOTContainer/obj/Debug/IOTContainer.csproj.AssemblyReference.cache and b/IOTContainer/obj/Debug/IOTContainer.csproj.AssemblyReference.cache differ diff --git a/IOTContainer/obj/Debug/IOTContainer.csproj.ResolveComReference.cache b/IOTContainer/obj/Debug/IOTContainer.csproj.ResolveComReference.cache index ed839ab1..cc8f37a4 100644 Binary files a/IOTContainer/obj/Debug/IOTContainer.csproj.ResolveComReference.cache and b/IOTContainer/obj/Debug/IOTContainer.csproj.ResolveComReference.cache differ diff --git a/IOTContainer/obj/Debug/IOTContainer.exe b/IOTContainer/obj/Debug/IOTContainer.exe index f56b3806..9fdc13d8 100644 Binary files a/IOTContainer/obj/Debug/IOTContainer.exe and b/IOTContainer/obj/Debug/IOTContainer.exe differ diff --git a/IOTContainer/obj/Debug/IOTContainer.pdb b/IOTContainer/obj/Debug/IOTContainer.pdb index 211f86bf..1288169d 100644 Binary files a/IOTContainer/obj/Debug/IOTContainer.pdb and b/IOTContainer/obj/Debug/IOTContainer.pdb differ diff --git a/IOTContainer/obj/Debug/IOTContainer.sourcelink.json b/IOTContainer/obj/Debug/IOTContainer.sourcelink.json index b0bc6c85..22c954cf 100644 --- a/IOTContainer/obj/Debug/IOTContainer.sourcelink.json +++ b/IOTContainer/obj/Debug/IOTContainer.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\版本管理\\32位IOTContainerV2.1\\*":"https://git.1000my.com/raw/yanw/App_win_iot_V2.0/9c5bc10b512eb7443b39e1c9379ba1be5f5fa8f8/*"}} \ No newline at end of file +{"documents":{"D:\\版本管理\\32位IOTContainerV2.1\\*":"https://git.1000my.com/raw/yanw/App_win_iot_V2.0/997d9a6017e8eed998fffc1078c9f68874f710bd/*"}} \ No newline at end of file diff --git a/IOTContainer/obj/Debug/IOTContainer_b4ycj3x5_wpftmp.sourcelink.json b/IOTContainer/obj/Debug/IOTContainer_b4ycj3x5_wpftmp.sourcelink.json new file mode 100644 index 00000000..22c954cf --- /dev/null +++ b/IOTContainer/obj/Debug/IOTContainer_b4ycj3x5_wpftmp.sourcelink.json @@ -0,0 +1 @@ +{"documents":{"D:\\版本管理\\32位IOTContainerV2.1\\*":"https://git.1000my.com/raw/yanw/App_win_iot_V2.0/997d9a6017e8eed998fffc1078c9f68874f710bd/*"}} \ No newline at end of file diff --git a/IOTContainer/obj/Debug/IOTContainer_x25dqigy_wpftmp.sourcelink.json b/IOTContainer/obj/Debug/IOTContainer_x25dqigy_wpftmp.sourcelink.json new file mode 100644 index 00000000..22c954cf --- /dev/null +++ b/IOTContainer/obj/Debug/IOTContainer_x25dqigy_wpftmp.sourcelink.json @@ -0,0 +1 @@ +{"documents":{"D:\\版本管理\\32位IOTContainerV2.1\\*":"https://git.1000my.com/raw/yanw/App_win_iot_V2.0/997d9a6017e8eed998fffc1078c9f68874f710bd/*"}} \ No newline at end of file diff --git a/IOTContainer/obj/Debug/Interop.SpeechLib.dll b/IOTContainer/obj/Debug/Interop.SpeechLib.dll index 7aeea9ed..790439e2 100644 Binary files a/IOTContainer/obj/Debug/Interop.SpeechLib.dll and b/IOTContainer/obj/Debug/Interop.SpeechLib.dll differ