From b05c1f9038dd7b63ca4a15f4a75ca9c059f6a0d6 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 23 Aug 2023 14:45:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=94=B5=E5=AD=90?=
=?UTF-8?q?=E7=9C=BC=E5=9B=BE=E6=A0=87=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/assets/omdb_config.json | 2 +-
collect-library/src/main/assets/editormarker.xml | 9 ++++++---
collect-library/src/main/assets/omdb/4010/down.svg | 1 +
.../main/assets/omdb/4010/icon_electroniceye_4010.svg | 4 ++++
collect-library/src/main/assets/omdb/4010/left.svg | 1 +
collect-library/src/main/assets/omdb/4010/right.svg | 1 +
collect-library/src/main/assets/omdb/4010/top.svg | 1 +
vtm | 2 +-
8 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 collect-library/src/main/assets/omdb/4010/down.svg
create mode 100644 collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg
create mode 100644 collect-library/src/main/assets/omdb/4010/left.svg
create mode 100644 collect-library/src/main/assets/omdb/4010/right.svg
create mode 100644 collect-library/src/main/assets/omdb/4010/top.svg
diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 55b5705a..3414f1c2 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -333,7 +333,7 @@
"k": "geometry",
"v": "~",
"klib": "geometry",
- "vlib": "generateDirectReferenceLine(3)"
+ "vlib": "generateDirectReferenceLine('',3)"
},
{
"k": "geometry",
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index bba9dfa9..ade3a752 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -2294,11 +2294,14 @@
<!--电子眼-->
<m v="OMDB_ELECTRONICEYE">
- <caption dy="-30" fill="#0000FF" k="name" priority="0" size="12"
- stroke="#ffffff" stroke-width="1.0"></caption>
+ <m k="eleceyeId">
+ <caption dy="-30" fill="#0000FF" k="name" priority="0" size="12"
+ stroke="#ffffff" stroke-width="1.0"></caption>
+ <symbol repeat="false" src="assets:omdb/4010/icon_electroniceye_4010.svg" symbol-height="24" symbol-width="24"></symbol>
+ </m>
<m k="type" v="angle">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
- src="assets:omdb/icon_4010.svg" symbol-height="24" symbol-width="18"></symbol>
+ src="assets:omdb/4010/right.svg" symbol-height="24" symbol-width="24"></symbol>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />
diff --git a/collect-library/src/main/assets/omdb/4010/down.svg b/collect-library/src/main/assets/omdb/4010/down.svg
new file mode 100644
index 00000000..af9695ad
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/4010/down.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" viewBox="0 0 90.7 90.7"><defs><style>.d{fill:#ca171d;stroke:#8b1c21;stroke-miterlimit:10;}.e{fill:#d7e2e3;opacity:0;}</style></defs><g id="c"><g><rect class="e" width="90.7" height="90.7"/><path class="d" d="M52.4,75.2l-7.3,14.6c-.2,.3-.6,.5-.9,.3-.1,0-.2-.2-.3-.3l-7.3-14.6c-.2-.3,0-.8,.3-.9,.2,0,.4,0,.5,0l7.1,2.5,7.1-2.5c.4-.1,.8,0,.9,.4,0,.2,0,.4,0,.5Z"/></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg b/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg
new file mode 100644
index 00000000..074675df
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 90.7 90.7">
+ <defs>
+ <style>.n{fill:url(#j);}.o{fill:url(#m);}.p{fill:url(#k);}.q{fill:url(#l);}.r{fill:url(#f);}.s{fill:#fff;}.t{fill:#fdfefe;}.u{fill:#8b9798;}.v,.w{fill:#d7e2e3;}.x{fill:#9aabad;}.y{fill:#3d444c;}.z{fill:#272d35;isolation:isolate;opacity:.2;}.aa{fill:url(#g);stroke:#8ba0ae;}.aa,.ab{stroke-miterlimit:10;stroke-width:1px;}.ab{fill:url(#h);stroke:#161b20;}.w{opacity:0;}</style><linearGradient id="f" x1="43.1" y1="75.6" x2="47.9" y2="75.6" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#999899"/><stop offset=".2" stop-color="#7e7e80"/><stop offset=".4" stop-color="#5b5d60"/><stop offset=".6" stop-color="#46494d"/><stop offset=".8" stop-color="#3f4246"/><stop offset="1" stop-color="#404247"/><stop offset="1" stop-color="#43434a"/></linearGradient><linearGradient id="g" x1="23.1" y1="49" x2="67.6" y2="49" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b1bbcb"/><stop offset=".1" stop-color="#c2cddb"/><stop offset=".4" stop-color="#dbe7f0"/><stop offset=".5" stop-color="#e4f1f9"/><stop offset=".6" stop-color="#deeaf3"/><stop offset=".8" stop-color="#cdd9e5"/><stop offset="1" stop-color="#b1bccd"/><stop offset="1" stop-color="#aeb9ca"/></linearGradient><linearGradient id="h" x1="23.6" y1="49.8" x2="67.1" y2="49.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#403c42"/><stop offset=".1" stop-color="#3c4353"/><stop offset=".3" stop-color="#3a475d"/><stop offset=".5" stop-color="#344256"/><stop offset=".7" stop-color="#233445"/><stop offset="1" stop-color="#0d212d"/></linearGradient><linearGradient id="j" x1="41.1" y1="53.4" x2="46.6" y2="53.4" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#647779"/><stop offset=".6" stop-color="#93a2a3"/><stop offset="1" stop-color="#c1cccc"/></linearGradient><linearGradient id="k" x1="31.8" y1="58.9" x2="44.1" y2="58.9" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#647779"/><stop offset="0" stop-color="#6b7d7f"/><stop offset=".1" stop-color="#859597"/><stop offset=".2" stop-color="#9ba9aa"/><stop offset=".3" stop-color="#acb9b9"/><stop offset=".4" stop-color="#b8c4c4"/><stop offset=".6" stop-color="#bfcaca"/><stop offset="1" stop-color="#c1cccc"/></linearGradient><linearGradient id="l" x1="33.9" y1="63.5" x2="47.1" y2="54.9" xlink:href="#k"/><linearGradient id="m" x1="52.8" y1="48.4" x2="56.3" y2="55.2" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#647779"/><stop offset=".1" stop-color="#718384"/><stop offset=".3" stop-color="#8e9d9e"/><stop offset=".4" stop-color="#a4b2b2"/><stop offset=".6" stop-color="#b4c0c0"/><stop offset=".8" stop-color="#bec9c9"/><stop offset="1" stop-color="#c1cccc"/></linearGradient></defs><g id="c"><g><rect class="w" width="90.7" height="90.7"/><g><ellipse id="d" class="z" cx="45.4" cy="87" rx="14.4" ry="3.7"/><ellipse id="e" class="y" cx="45.4" cy="87" rx="7.5" ry="3"/><path class="r" d="M45.4,63.5h0c1.4,0,2.6,1.2,2.6,2.6v19.2c0,1.4-1.1,2.5-2.5,2.5h-.3c-1.4,0-2.5-1.1-2.5-2.5v-19.3c0-1.4,1.2-2.6,2.6-2.6Z"/><rect class="aa" x="23.1" y="25.7" width="44.5" height="46.6" rx="14.4" ry="14.4"/><rect class="ab" x="23.6" y="27.8" width="43.5" height="44" rx="14.1" ry="14.1"/><path id="i" class="s" d="M29,36.5c-.3,0-.6-.2-.7-.4s0-.6,.1-.8c1.3-1.6,3-2.9,4.8-3.9,.2,0,.4-.1,.6,0,.2,0,.4,.2,.5,.4,.2,.4,0,.9-.3,1.1-1.7,.9-3.1,2.1-4.3,3.5-.2,.2-.4,.3-.6,.3h0Zm-1.8,2.6c-.1,0-.3,0-.4-.1-.2-.1-.3-.3-.4-.5,0-.2,0-.4,.1-.6l.3-.4c.1-.2,.3-.3,.5-.4,.2,0,.4,0,.6,0,.2,.1,.3,.3,.4,.5s0,.4-.1,.6l-.3,.4c-.1,.2-.4,.4-.7,.4h0Z"/><g><path class="t" d="M47.8,50.1l-15.1-7.5c-.5-.3-.8-.8-.7-1.4l.7-3.2c.1-.6,.6-1,1.2-1l8.1,.2s0,0,0,0l18.8,8.1c.2,0,.1,.4,0,.4l-7.9-.4c0,0-.1,0-.2,0l-3.5,4.2c-.4,.4-1,.6-1.5,.3Z"/><path class="x" d="M32.7,44.7v1.2c0,.1,0,.3,.2,.3l2.7,1.4c.3,.1,.6,0,.6-.3v-1.4c0-.2,0-.3-.2-.4l-2.7-1.3c-.3-.1-.6,0-.6,.4Z"/><path class="x" d="M37.3,46.3l10.5,5.2c.1,0,.2,.2,.2,.4v1.3c0,.3-.3,.5-.6,.4l-10.5-5.1c-.1,0-.2-.2-.2-.4v-1.3c0-.3,.3-.5,.6-.3Z"/><path class="u" d="M60,46.4h2.8c.3,.1,.5,.5,.3,.8l-3.3,4.1c-.1,.1-.3,.2-.4,.1h0c-.2,0-.3-.3-.2-.6l.2-.5s0,0,0-.1l.2-3.4c0-.2,.2-.4,.4-.4Z"/><path class="n" d="M43.9,52.4l2.7,1.3v.7h-5.5v-.9s1.4,1,2.7-1Z"/><path class="p" d="M31.8,55v8.2c0,.2,.2,.4,.4,.4h.1c.2,0,.3-.1,.4-.3l.5-2.4c0-.1,.1-.2,.2-.3l10.4-4.3c.1,0,.2-.2,.2-.4v-1.7s-3,0-3,0v1.5c0,.2-.1,.3-.3,.4l-7.2,2.5c-.2,0-.5,0-.5-.3l-.6-3.5c0-.2-.2-.3-.4-.3h0c-.2,0-.4,.2-.4,.4Z"/><path class="u" d="M33.3,55.2l.5,2.4c0,.2,.3,.4,.5,.3l3.8-1.3c.2,0,.3-.3,.2-.5l-.4-1.1c0-.2-.2-.3-.4-.3h-3.9c-.3,0-.4,.2-.4,.4Z"/><path class="q" d="M44.7,54.2h1.9s0,2.1,0,2.1c0,.2-.1,.5-.4,.6l-7.2,3.8c-.2,0-.3,.2-.3,.4l-.5,1.9c0,.3-.3,.5-.6,.5h-3.3c-.4,0-.8-.4-.7-.8l.3-1.6c0-.2,.2-.4,.4-.5l9.9-4c.2-.1,.4-.3,.4-.6v-1.9Z"/><path class="x" d="M40.2,50.5l3.2,1.6s-.4,1.4-1.8,1.1c0,0-1.2-.3-1.4-2.7Z"/><path class="o" d="M58.7,46.3l-5.2-.2s0,0,0,0c-.6,0-4.7,5.3-4.7,5.3,0,0,0,.2,0,.2l-.2,2.3c0,.2,.1,.3,.3,.3l6.8,.3c.4,0,.7-.2,.9-.5l2.2-3.7c0-.1,.1-.3,.1-.5l.2-3.3c0-.2-.1-.3-.3-.3Zm-2.4,3l-.6,2.1c-.1,.4-.5,.7-.9,.6h-2.5c-.6-.1-1-.7-.8-1.2l.6-2.1c.1-.4,.5-.7,.9-.7h2.6c.6,0,1,.7,.8,1.2Z"/></g><path class="v" d="M52.8,45.5l-3.5,4.3c-.4,.4-1,.6-1.5,.2l-15.1-7.5c-.5-.2-.8-.7-.7-1.3l.7-3.2c.1-.6,.6-1,1.2-1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/4010/left.svg b/collect-library/src/main/assets/omdb/4010/left.svg
new file mode 100644
index 00000000..58e2c48e
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/4010/left.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" viewBox="0 0 90.7 90.7"><defs><style>.d{fill:#ca171d;stroke:#8b1c21;stroke-miterlimit:10;}.e{fill:#d7e2e3;opacity:0;}</style></defs><g id="c"><g><rect class="e" width="90.7" height="90.7"/><path class="d" d="M17.4,54.1l-14.6-7.3c-.3-.2-.5-.6-.3-.9,0-.1,.2-.2,.3-.3l14.6-7.3c.3-.2,.8,0,.9,.3,0,.2,0,.4,0,.5l-2.5,7.1,2.5,7.1c.1,.4,0,.8-.4,.9-.2,0-.4,0-.5,0Z"/></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/4010/right.svg b/collect-library/src/main/assets/omdb/4010/right.svg
new file mode 100644
index 00000000..27301104
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/4010/right.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" viewBox="0 0 90.7 90.7"><defs><style>.d{fill:#ca171d;stroke:#8b1c21;stroke-miterlimit:10;}.e{fill:#d7e2e3;opacity:0;}</style></defs><g id="c"><g><rect class="e" width="90.7" height="90.7"/><path class="d" d="M73.3,39.5l14.6,7.3c.3,.2,.5,.6,.3,.9,0,.1-.2,.2-.3,.3l-14.6,7.3c-.3,.2-.8,0-.9-.3,0-.2,0-.4,0-.5l2.5-7.1-2.5-7.1c-.1-.4,0-.8,.4-.9,.2,0,.4,0,.5,0Z"/></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/4010/top.svg b/collect-library/src/main/assets/omdb/4010/top.svg
new file mode 100644
index 00000000..62a3398e
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/4010/top.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" viewBox="0 0 90.7 90.7"><defs><style>.d{fill:#ca171d;stroke:#8b1c21;stroke-miterlimit:10;}.e{fill:#d7e2e3;opacity:0;}</style></defs><g id="c"><g><rect class="e" width="90.7" height="90.7"/><path class="d" d="M37.7,19.2l7.3-14.6c.2-.3,.6-.5,.9-.3,.1,0,.2,.2,.3,.3l7.3,14.6c.2,.3,0,.8-.3,.9-.2,0-.4,0-.5,0l-7.1-2.5-7.1,2.5c-.4,.1-.8,0-.9-.4,0-.2,0-.4,0-.5Z"/></g></g></svg>
\ No newline at end of file
diff --git a/vtm b/vtm
index f9efeaf0..c6a242fa 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit f9efeaf09d3d912e2e21c7ebf8a6ad043c16f80c
+Subproject commit c6a242fab870bc5b1b0e62856afc6350abe5ff3c