Skip to content

Commit

Permalink
1. load the machine find page in dialog 2. fix the issue that it will…
Browse files Browse the repository at this point in the history
… be crush when opening login dialog or device dialog after changing

language 3. surport chinese and english 4. mac and linux use sha1_xxx instead of sha1_xxx_mqtt
  • Loading branch information
womendoushihaoyin committed Jan 13, 2025
1 parent d8ffab7 commit a9b9c05
Show file tree
Hide file tree
Showing 210 changed files with 62,422 additions and 944,986 deletions.
3 changes: 3 additions & 0 deletions localization/i18n/zh_CN/Snapmaker_Orca_zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 3.2.2\n"

msgid "Add Device"
msgstr "添加设备"

msgid "Supports Painting"
msgstr "支撑绘制"

Expand Down
2 changes: 2 additions & 0 deletions resources/web/data/text.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ var LangText = {
t111: "Create New",
t112: "Join the Program",
t113: "You may change your choice in preference anytime.",
t114: "Device Management",
orca1: "Edit Project Info",
orca2: "no model information",
orca3: "Stealth Mode",
Expand Down Expand Up @@ -763,6 +764,7 @@ var LangText = {
t111: "新建",
t112: "加入该计划",
t113: "您可以随时更改您的偏好。",
t114: "设备管理",
wk1: "快速入门指南",
wk2: "本文介绍了Snapmaker Orca的最基本用法。它指导用户配置软件,创建项目,并逐步完成第一个打印任务。",
wk3: "基于项目的工作流",
Expand Down
Binary file modified resources/web/flutter/assets/AssetManifest.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/web/flutter/assets/AssetManifest.bin.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"DQA="
"DQMHE2Fzc2V0cy9pMTBuL2VuLmpzb24MAQ0BBwVhc3NldAcTYXNzZXRzL2kxMG4vZW4uanNvbgcWYXNzZXRzL2kxMG4vemgtQ04uanNvbgwBDQEHBWFzc2V0BxZhc3NldHMvaTEwbi96aC1DTi5qc29uBxthc3NldHMvaW1hZ2VzLzNkcHJpbnRlci5wbmcMAQ0BBwVhc3NldAcbYXNzZXRzL2ltYWdlcy8zZHByaW50ZXIucG5n"
2 changes: 1 addition & 1 deletion resources/web/flutter/assets/AssetManifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{"assets/i10n/en.json":["assets/i10n/en.json"],"assets/i10n/zh-CN.json":["assets/i10n/zh-CN.json"],"assets/images/3dprinter.png":["assets/images/3dprinter.png"]}
146 changes: 112 additions & 34 deletions resources/web/flutter/assets/NOTICES
Original file line number Diff line number Diff line change
Expand Up @@ -1747,6 +1747,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
async
collection
stream_channel
typed_data

Copyright 2015, the Dart project authors.

Expand Down Expand Up @@ -7094,6 +7095,9 @@ shared_preferences_linux
shared_preferences_platform_interface
shared_preferences_web
shared_preferences_windows
vector_graphics
vector_graphics_codec
vector_graphics_compiler
xdg_directories

Copyright 2013 The Flutter Authors. All rights reserved.
Expand Down Expand Up @@ -7122,6 +7126,28 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
flutter_svg

Copyright (c) 2018 Dan Field

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--------------------------------------------------------------------------------
freetype2

Expand Down Expand Up @@ -13993,6 +14019,42 @@ Except as contained in this notice, the name of a copyright holder
shall not be used in advertising or otherwise to promote the sale,
use or other dealings in these Data Files or Software without prior
written authorization of the copyright holder.
--------------------------------------------------------------------------------
http
http_parser
matcher
path
source_span
string_scanner

Copyright 2014, the Dart project authors.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of Google LLC nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
icu

Expand Down Expand Up @@ -31062,40 +31124,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

--------------------------------------------------------------------------------
matcher
path
source_span
string_scanner

Copyright 2014, the Dart project authors.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of Google LLC nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
material_color_utilities

Expand Down Expand Up @@ -31316,6 +31344,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--------------------------------------------------------------------------------
path_parsing

Copyright (c) 2018 Dan Field

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

--------------------------------------------------------------------------------
perfetto

Expand Down Expand Up @@ -31506,6 +31557,33 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--------------------------------------------------------------------------------
petitparser
xml

The MIT License

Copyright (c) 2006-2023 Lukas Renggli.
All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

--------------------------------------------------------------------------------
platform

Expand Down
11 changes: 11 additions & 0 deletions resources/web/flutter/assets/assets/i10n/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"title": "Discovery Device",
"add device": "add device",
"input_ip_address": "Enter IP address",
"ok": "OK",
"cancel": "Cancel",
"discovery_tip1": "1. Only printers within the same LAN can be found",
"discovery_tip2": "2. The device only supports a 2.4GHz Wi-Fi connection",
"Nearby printer": "Nearby printer"

}
12 changes: 12 additions & 0 deletions resources/web/flutter/assets/assets/i10n/zh-CN.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"title": "发现设备",
"description": "发现设备",
"add device": "添加设备",
"input_ip_address": "输入IP地址",
"ok": "确定",
"cancel": "取消",
"discovery_tip1": "1. 仅能发现同一局域网内的打印机",
"discovery_tip2": "2. 设备只支持使用2.4GHz Wi-Fi连接使用",
"Nearby printer": "附近打印机"

}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/web/flutter/flutter_bootstrap.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions resources/web/flutter/flutter_service_worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ const MANIFEST = 'flutter-app-manifest';
const TEMP = 'flutter-temp-cache';
const CACHE_NAME = 'flutter-app-cache';

const RESOURCES = {"flutter_bootstrap.js": "04a4fbdce4a21f08b83a841ab2ea1bf6",
const RESOURCES = {"flutter_bootstrap.js": "e0b4a85f597d817065bcac3c0698f5e2",
"version.json": "01826e76d41ce77a190fd78b947729b7",
"index.html": "9fb70138560cba4cb2a77693cb24188a",
"/": "9fb70138560cba4cb2a77693cb24188a",
"main.dart.js": "effa77066d7af6adc7915064744b7fb5",
"main.dart.js": "187abb3a11b1c283a86e83aaed6a260b",
"flutter.js": "383e55f7f3cce5be08fcf1f3881f585c",
"favicon.png": "5dcef449791fa27946b3d35ad8803796",
"icons/Icon-192.png": "ac9a721a12bbc803b44f645561ecb1e1",
"icons/Icon-maskable-192.png": "c457ef57daa1d16f64b27b786ec2ea3c",
"icons/Icon-maskable-512.png": "301a7604d45b3e739efc881eb04896ea",
"icons/Icon-512.png": "96e752610906ba2a93c65f8abe1645f1",
"manifest.json": "901d86fb8842ec0d66225a542131d689",
"assets/AssetManifest.json": "99914b932bd37a50b983c5e7c90ae93b",
"assets/NOTICES": "376d20da61b3df5046f0df87cc8a73b6",
"assets/AssetManifest.json": "45e5093867cb3ca3bd4764ce353af94e",
"assets/NOTICES": "eef2ab060883e1029c57289e759489be",
"assets/FontManifest.json": "d751713988987e9331980363e24189ce",
"assets/AssetManifest.bin.json": "a1fee2517bf598633e2f67fcf3e26c94",
"assets/AssetManifest.bin.json": "309cb0368ef1ffe89ab0e7432daa86bc",
"assets/shaders/ink_sparkle.frag": "ecc85a2e95f5e9f53123dcaf8cb9b6ce",
"assets/AssetManifest.bin": "0b0a3415aad49b6e9bf965ff578614f9",
"assets/AssetManifest.bin": "eb55ee987ee884c9ef5e0970bcc513ce",
"assets/assets/i10n/zh-CN.json": "751676383180185f6be13c761d7334ff",
"assets/assets/i10n/en.json": "23577d705e4f75869cfb51c99e8e394c",
"assets/assets/images/3dprinter.png": "4515f02e633d58a1119c2f55114da32b",
"canvaskit/skwasm.js": "5d4f9263ec93efeb022bb14a3881d240",
"canvaskit/skwasm.js.symbols": "c3c05bd50bdf59da8626bbe446ce65a3",
"canvaskit/canvaskit.js.symbols": "74a84c23f5ada42fe063514c587968c6",
Expand Down
Loading

0 comments on commit a9b9c05

Please sign in to comment.