Merge pull request #180 from entrylabs/develop

2.1.3 버전업

Author: Tnks2U

build/entryx64.nsi

@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.1.2"
+!define PRODUCT_VERSION "2.1.3"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

build/entryx86.nsi

@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.1.2"
+!define PRODUCT_VERSION "2.1.3"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

package.json

@@ -2,7 +2,7 @@
     "private": true,
     "productName": "Entry",
     "name": "entry",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "description": "Entry for offline",
     "main": "src/main_build/main.bundle.js",
     "scripts": {
@@ -36,8 +36,8 @@
         "async-csv": "^2.1.3",
         "axios": "^0.19.2",
         "cross-spawn": "^7.0.3",
-        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.39_3",
-        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.2",
+        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.40",
+        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.3",
         "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20221024",
         "excel4node": "^1.7.0",
         "fs-extra": "^8.1.0",

src/main/constants.ts

@@ -11,16 +11,19 @@ export default class {
                     result = result
                         .replace('./bower_components', '../../../node_modules')
                         .replace('entryjs', 'entry-js'); // 과거 웹 WS 대응
+                } else if (result.startsWith('/lib')) { // 신규 웹 기본 오브젝트 대응
+                    result = result.replace('/lib', '../../../node_modules');
                 } else if (result.indexOf('temp') > -1) { // 일반 오브젝트 대응
                     result = result.substring(result.indexOf('temp'));
                     result = path.join(this.appPath, result)
                         .replace(/\\/gi, '/');
                 }
 
-                if (fileUrl.endsWith('.svg')) {
-                    // svg 파일의 경우 png 파일로 교체한다.
-                    result = result.replace('.svg', '.png');
-                }
+                // TODO: 히스토리 파악 후 완전 제거
+                // if (fileUrl.endsWith('.svg')) {
+                //     // svg 파일의 경우 png 파일로 교체한다.
+                //     result = result.replace('.svg', '.png');
+                // }
 
                 result = result.replace(/.*\/\//, ''); // 외부 접속 프로토콜 스키마 보안 대응
                 return result;
@@ -72,6 +75,27 @@ export default class {
             './bower_components/entryjs/images/media/entrybot2.png',
             './bower_components/entry-js/images/_1x1.png',
             './bower_components/entryjs/images/_1x1.png',
+
+            './bower_components/entry-js/images/media/entrybot1.svg',
+            './bower_components/entryjs/images/media/entrybot1.svg',
+            './bower_components/entry-js/images/media/entrybot2.svg',
+            './bower_components/entryjs/images/media/entrybot2.svg',
+            './bower_components/entry-js/images/_1x1.svg',
+            './bower_components/entryjs/images/_1x1.svg',
+
+            './lib/entry-js/images/media/entrybot1.png',
+            './lib/entryjs/images/media/entrybot1.png',
+            './lib/entry-js/images/media/entrybot2.png',
+            './lib/entryjs/images/media/entrybot2.png',
+            './lib/entry-js/images/_1x1.png',
+            './lib/entryjs/images/_1x1.png',
+
+            './lib/entry-js/images/media/entrybot1.svg',
+            './lib/entryjs/images/media/entrybot1.svg',
+            './lib/entry-js/images/media/entrybot2.svg',
+            './lib/entryjs/images/media/entrybot2.svg',
+            './lib/entry-js/images/_1x1.svg',
+            './lib/entryjs/images/_1x1.svg',
         ];
     }
 

src/renderer/resources/lang/ko.json

@@ -1409,6 +1409,10 @@
         "hw_connection_success_desc": "하드웨어 아이콘을 더블클릭하면, 센서값만 확인할 수 있습니다.",
         "hw_connection_success_desc2": "하드웨어와 정상적으로 연결되었습니다.",
         "parameter_can_not_space": "값 블록은 빈 칸이 될 수 없습니다.",
+        "hw_connection_termination_title": "하드웨어 연결 해제",
+        "hw_connection_termination_desc": "하드웨어와 연결이 해제되었습니다.",
+        "hw_connection_failed_title": "하드웨어 연결 실패",
+        "hw_connection_failed_desc": "작품에서 사용된 하드웨어가\n연결되어 있는지 확인해 주세요.",
         "ai_utilize_train_pop_error": "작품에 적용된 모델이 비활성화 또는 삭제되었습니다.",
         "list_can_not_space": "리스트의 이름은 빈 칸이 될 수 없습니다.",
         "sign_can_not_space": "신호의 이름은 빈 칸이 될 수 없습니다.",

yarn.lock

@@ -3393,9 +3393,9 @@ enquirer@^2.3.5:
   dependencies:
     crypto-js "^4.0.0"
 
-"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.39_3":
-  version "1.9.39"
-  resolved "git+https://github.com/entrylabs/entry-hw.git#78808975e4a4d5d45dc26f2b81ede5af925e24eb"
+"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.40":
+  version "1.9.40"
+  resolved "git+https://github.com/entrylabs/entry-hw.git#86d6526357e94610a1898c79158775d9e8145ac4"
   dependencies:
     cross-spawn "^7.0.0"
     fs-extra "^8.1.0"
@@ -3410,9 +3410,9 @@ enquirer@^2.3.5:
     winston "^3.2.1"
     winston-daily-rotate-file "^4.4.2"
 
-"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.2":
+"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.3":
   version "0.0.0"
-  resolved "git+https://github.com/entrylabs/entryjs.git#8dd80bc0a615edbcb130d13b8ac85b266c1760ac"
+  resolved "git+https://github.com/entrylabs/entryjs.git#f70baff8c0f4b735050eccb20a122a0b44a2eab7"
 
 "entry-tool@git+https://github.com/entrylabs/entry-tool.git#dist/20221024":
   version "0.0.0"