diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..4fa1c7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/Internet/random-questions/Question" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/build/DEBIAN/control b/build/DEBIAN/control
index df3d306..535bd7e 100644
--- a/build/DEBIAN/control
+++ b/build/DEBIAN/control
@@ -5,6 +5,6 @@ Homepage: [https://gitee.com/gfdgd-xi/uengine-runner, https://github.com/gfdgd-x
Architecture: all
Priority: optional
Conflicts: com.gitee.uengine.runner.spark, spark-uengine-apk-builder
-Depends: python3, python3-tk, python3-pip, aapt, uengine, python3-setuptools, deepin-terminal, curl, python3-pil, python3-pil.imagetk, python3-requests, adb, translate-shell, python3-xlib, fonts-noto-cjk, python3-numpy, python3-matplotlib, wget
+Depends: python3, python3-tk, python3-pip, aapt, uengine, python3-setuptools, deepin-terminal, curl, python3-pil, python3-pil.imagetk, python3-requests, adb, translate-shell, python3-xlib, fonts-noto-cjk, python3-numpy, python3-matplotlib, wget, inotify-tools
Description: UEngine Runner for deepin and UOS
diff --git a/defult.png b/defult.png
old mode 100755
new mode 100644
index 4cff476..c836b68
Binary files a/defult.png and b/defult.png differ
diff --git a/icon.png b/icon.png
deleted file mode 100644
index c836b68..0000000
Binary files a/icon.png and /dev/null differ
diff --git a/icon.svg b/icon.svg
deleted file mode 100755
index baaa994..0000000
--- a/icon.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="514" height="512" viewBox="0 0 514 512" fill="none"><defs><linearGradient id="linear_0" x1="96.37%" y1="96.011%" x2="2.8400000000000003%" y2="0%" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#00BAAD" stop-opacity="1" /><stop offset="1" stop-color="#43CF7C" stop-opacity="1" /></linearGradient><filter id="filter_2" x="60.5" y="54" width="387" height="204" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/>
- <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
- <feOffset dx="0" dy="0"/>
- <feGaussianBlur stdDeviation="1"/>
- <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
- <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_Shadow"/>
- <feBlend mode="normal" in="SourceGraphic" in2="effect1_Shadow" result="shape"/></filter><linearGradient id="linear_1" x1="50%" y1="100%" x2="51%" y2="0%" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ACCBEE" stop-opacity="1" /><stop offset="1" stop-color="#E7F0FD" stop-opacity="1" /></linearGradient><filter id="filter_4" x="52" y="254" width="404" height="204" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/>
- <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
- <feOffset dx="0" dy="0"/>
- <feGaussianBlur stdDeviation="1"/>
- <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
- <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_Shadow"/>
- <feBlend mode="normal" in="SourceGraphic" in2="effect1_Shadow" result="shape"/></filter><filter id="filter_12" x="-7" y="-7" width="276" height="156" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/>
- <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
- <feOffset dx="0" dy="-2"/>
- <feGaussianBlur stdDeviation="3.5"/>
- <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
- <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_Shadow"/>
- <feBlend mode="normal" in="SourceGraphic" in2="effect1_Shadow" result="shape"/></filter><linearGradient id="linear_2" x1="50%" y1="100%" x2="51%" y2="0%" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#F5F9FF" stop-opacity="1" /><stop offset="1" stop-color="#E7F0FD" stop-opacity="1" /></linearGradient><filter id="filter_14" x="-6" y="220" width="521" height="79" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/>
- <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
- <feOffset dx="0" dy="0"/>
- <feGaussianBlur stdDeviation="2"/>
- <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
- <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_Shadow"/>
- <feBlend mode="normal" in="SourceGraphic" in2="effect1_Shadow" result="shape"/></filter><rect id="path_0" x="0" y="0" width="119.99219988153558" height="119.9950733704817" /></defs><g opacity="1" transform="translate(2 0) rotate(0 256 256)"><g id="矩形 1" filter="url(#filter_2)"><path id="矩形 1" fill-rule="evenodd" fill="url(#linear_0)" transform="translate(62.5 56) rotate(0 191.5 100)" opacity="1" d="M0,200L383,200L383,18.000000000000004C383,13.226103182888199 381.10357687342247,8.647732750706759 377.72792206135784,5.272077938642134C374.3522672492932,1.8964231265775098 369.7738968171118,-1.0658141036401503e-14 365,-7.105427357601002e-15L18.000000000000004,0C13.226103182888211,-3.552713678800501e-15 8.647732750706767,1.8964231265775169 5.272077938642141,5.272077938642143C1.8964231265775169,8.64773275070677 -3.552713678800501e-15,13.226103182888213 -3.552713678800501e-15,18.000000000000007L0,200Z " /></g><g id="矩形 2" filter="url(#filter_4)"><path id="矩形 2" fill-rule="evenodd" fill="url(#linear_1)" transform="translate(54 256) rotate(0 200 100)" opacity="1" d="M1.1021821192326181e-15,182C0,186.7738968171118 1.8964231265775169,191.35226724929322 5.272077938642141,194.72792206135784C8.647732750706766,198.10357687342247 13.226103182888204,200 17.999999999999996,200L382,200C391.94112549695427,200 400,191.94112549695427 400,182L400,0L0,0Z " /></g><g opacity="1" transform="translate(125 82) rotate(0 131 71)"><g id="形状" filter="url(#filter_12)"><path id="形状" fill-rule="evenodd" style="fill:#FFFFFF" transform="translate(0 0) rotate(0 131 71)" opacity="1" d="M218.17529,3.05216c0.30871,1.07545 0.17678,2.23009 -0.36413,3.20765l-15.89229,28.66011l-5.07931,9.08019c1.53303,0.83359 3.06078,1.68301 4.58061,2.54971c1.51983,0.8667 3.01856,1.76075 4.49881,2.68072c26.4203,16.46009 46.00135,41.4792 54.22059,70.7699c2.26656,7.79598 3.51462,15.85254 3.72043,23.96957h-263.86c0.20318,-8.12711 1.45123,-16.19375 3.72043,-23.9998c8.20077,-29.26046 27.80029,-54.27957 54.19948,-70.73966c1.47234,-0.95452 2.96578,-1.86009 4.48034,-2.72103c1.51192,-0.8595 3.04758,-1.69597 4.59908,-2.5094l-5.0793,-9.08019l-15.81049,-28.60972c-1.06072,-2.02997 -0.30872,-4.53649 1.69398,-5.64794c2.00269,-1.11 4.52783,-0.41895 5.68618,1.55776l16.10074,28.99988l5.07931,9.15073c1.59899,-0.6709 3.21909,-1.34036 4.8603,-2.00118c1.63329,-0.64642 3.28241,-1.26549 4.95001,-1.86009c30.74232,-10.81791 64.25782,-10.81791 95.00015,0c1.67023,0.59027 3.3088,1.24102 4.95001,1.86009c1.63857,0.62051 3.25867,1.28997 4.8603,2.00118l5.07931,-9.15073l16.10074,-29.05027c0.74144,-1.34036 2.15573,-2.17251 3.68876,-2.16963c0.70187,0.00432 1.39054,0.18716 2.00006,0.52981c0.98156,0.53988 1.70454,1.44833 2.01589,2.52235z M83.92,92.00001c0,-6.62736 -5.37264,-12 -12,-12c-6.62736,0 -12,5.37264 -12,12c0,6.62736 5.37264,12 12,12c6.62736,0 12,-5.37264 12,-12z M203.92,92.00001c0,-6.62736 -5.37264,-12 -12,-12c-6.62736,0 -12,5.37264 -12,12c0,6.62736 5.37264,12 12,12c6.62736,0 12,-5.37264 12,-12z " /></g></g><g id="矩形 3" filter="url(#filter_14)"><path id="矩形 3" fill-rule="evenodd" fill="url(#linear_2)" transform="translate(-2 224) rotate(0 256.5 35.5)" opacity="1" d="M10.232250952256361,58.04214068005196C8.332096543530504,60.4484473304004 7.974403633993694,63.72909499409552 9.31135108229396,66.48834670298234C10.648298530594225,69.24759841186918 13.444667959828811,71 16.510756424389392,71L496.4892435756106,71C499.5553320401712,71.00000000000001 502.3517014694058,69.24759841186919 503.6886489177061,66.48834670298237C505.02559636600637,63.72909499409554 504.66790345646956,60.448447330400406 502.7677490477437,58.04214068005195L459.3366707748275,3.042140680051967C457.81952964784824,1.1208721943948827 455.50622367478263,2.6645352591003757e-15 453.0581653026945,-8.881784197001252e-16L59.941834697305566,0C57.4937763252174,-1.7763568394002505e-15 55.180470352151815,1.1208721943948738 53.663329225172546,3.042140680051956Z " /></g><path id="文本 1" fill-rule="evenodd" style="fill:#707070" transform="translate(78.10546875 302.90625) rotate(0 29.6015625 10.546875)" opacity="0.8" d="M0 21.09L0 0L1.17 0L1.17 21.09L0 21.09ZM3.52 0L3.52 21.09L1.76 21.09L1.76 0L3.52 0ZM4.1 21.09L4.45 21.09L4.45 0L4.1 0L4.1 21.09ZM5.62 0L5.62 21.09L5.03 21.09L5.03 0L5.62 0ZM5.86 21.09L5.86 0L6.79 0L6.79 21.09L5.86 21.09ZM7.96 21.09L7.96 0L8.55 0L8.55 21.09L7.96 21.09ZM8.89 21.09L8.89 0L10.06 0L10.06 21.09L8.89 21.09ZM12.41 0L12.99 0L12.99 21.09L12.41 21.09L12.41 0ZM13.34 0L13.34 21.09L13.58 21.09L13.58 0L13.34 0ZM14.16 21.09L13.92 21.09L13.92 0L14.16 0L14.16 21.09ZM16.27 21.09L15.09 21.09L15.09 0L16.27 0L16.27 21.09ZM17.44 21.09L17.44 0L16.85 0L16.85 21.09L17.44 21.09ZM18.37 21.09L17.78 21.09L17.78 0L18.37 0L18.37 21.09ZM21.88 21.09L21.88 0L20.71 0L20.71 21.09L21.88 21.09ZM22.47 21.09L22.23 21.09L22.23 0L22.47 0L22.47 21.09ZM23.4 21.09L23.4 0L23.05 0L23.05 21.09L23.4 21.09ZM26.33 0L26.33 21.09L25.74 21.09L25.74 0L26.33 0ZM26.67 21.09L26.67 0L26.91 0L26.91 21.09L26.67 21.09ZM27.26 21.09L27.5 21.09L27.5 0L27.26 0L27.26 21.09ZM27.84 21.09L29.02 21.09L29.02 0L27.84 0L27.84 21.09ZM30.77 0L30.77 21.09L30.19 21.09L30.19 0L30.77 0ZM31.12 0L31.12 21.09L31.7 21.09L31.7 0L31.12 0ZM32.88 0L33.46 0L33.46 21.09L32.88 21.09L32.88 0ZM34.63 0L35.56 0L35.56 21.09L34.63 21.09L34.63 0ZM36.98 0L36.15 0L36.15 21.09L36.98 21.09L36.98 0ZM39.66 21.09L39.66 0L37.32 0L37.32 21.09L39.66 21.09ZM40.84 21.09L40.84 0L40.01 0L40.01 21.09L40.84 21.09ZM41.18 0L41.18 21.09L41.42 21.09L41.42 0L41.18 0ZM43.52 21.09L43.52 0L44.11 0L44.11 21.09L43.52 21.09ZM44.7 21.09L44.7 0L44.45 0L44.45 21.09L44.7 21.09ZM45.63 21.09L45.63 0L45.28 0L45.28 21.09L45.63 21.09ZM48.55 21.09L47.97 21.09L47.97 0L48.55 0L48.55 21.09ZM49.14 0L48.9 0L48.9 21.09L49.14 21.09L49.14 0ZM49.48 0L49.48 21.09L49.73 21.09L49.73 0L49.48 0ZM51.24 0L50.07 0L50.07 21.09L51.24 21.09L51.24 0ZM52.41 0L53 0L53 21.09L52.41 21.09L52.41 0ZM53.93 21.09L53.34 21.09L53.34 0L53.93 0L53.93 21.09ZM55.1 21.09L55.69 21.09L55.69 0L55.1 0L55.1 21.09ZM56.86 21.09L59.2 21.09L59.2 0L56.86 0L56.86 21.09Z" /><path id="文本 1" style="stroke:#FFFFFF; stroke-width:0.1; stroke-opacity:1; stroke-dasharray:0 0" transform="translate(78.10546875 302.90625) rotate(0 29.6015625 10.546875)" d="M26.91,0L26.91,21.09L27.5,21.09L27.5,0L26.91,0Z M23.4,21.09L23.4,0L22.23,0L22.23,21.09L23.4,21.09Z M26.33,21.09L26.33,0L25.74,0L25.74,21.09L26.33,21.09Z M36.98,0L34.63,0L34.63,21.09L36.98,21.09L36.98,0Z M33.46,0L32.88,0L32.88,21.09L33.46,21.09L33.46,0Z M31.12,0L31.12,21.09L31.7,21.09L31.7,0L31.12,0Z M17.78,21.09L18.37,21.09L18.37,0L17.78,0L17.78,21.09Z M21.88,21.09L21.88,0L20.71,0L20.71,21.09L21.88,21.09Z M23.05,0L22.47,0L22.47,21.09L23.05,21.09L23.05,0Z M49.48,0L48.9,0L48.9,21.09L49.48,21.09L49.48,0Z M53,0L52.41,0L52.41,21.09L53,21.09L53,0Z M51.24,0L50.07,0L50.07,21.09L51.24,21.09L51.24,0Z M12.99,0L12.41,0L12.41,21.09L12.99,21.09L12.99,0Z M14.16,0L13.58,0L13.58,21.09L14.16,21.09L14.16,0Z M8.89,0L8.89,21.09L10.06,21.09L10.06,0L8.89,0Z M56.86,21.09L59.2,21.09L59.2,0L56.86,0L56.86,21.09Z M53.34,21.09L53.93,21.09L53.93,0L53.34,0L53.34,21.09Z M55.1,21.09L55.69,21.09L55.69,0L55.1,0L55.1,21.09Z M43.52,0L43.52,21.09L44.11,21.09L44.11,0L43.52,0Z M45.28,21.09L45.28,0L44.7,0L44.7,21.09L45.28,21.09Z M41.18,0L40.01,0L40.01,21.09L41.18,21.09L41.18,0Z M35.56,0L35.56,21.09L36.15,21.09L36.15,0L35.56,0Z M40.84,0L40.84,21.09L41.42,21.09L41.42,0L40.84,0Z M39.66,21.09L39.66,0L37.32,0L37.32,21.09L39.66,21.09Z M0,0L0,21.09L1.17,21.09L1.17,0L0,0Z M5.86,0L4.1,0L4.1,21.09L5.86,21.09L5.86,0Z M3.52,21.09L3.52,0L1.76,0L1.76,21.09L3.52,21.09Z M5.62,21.09L6.79,21.09L6.79,0L5.62,0L5.62,21.09Z M7.96,0L7.96,21.09L8.55,21.09L8.55,0L7.96,0Z M5.03,0L4.45,0L4.45,21.09L5.03,21.09L5.03,0Z M30.77,21.09L30.77,0L30.19,0L30.19,21.09L30.77,21.09Z M27.84,21.09L29.02,21.09L29.02,0L27.84,0L27.84,21.09Z M26.67,0L26.67,21.09L27.26,21.09L27.26,0L26.67,0Z M17.44,21.09L17.44,0L16.85,0L16.85,21.09L17.44,21.09Z M15.09,21.09L16.27,21.09L16.27,0L15.09,0L15.09,21.09Z M13.34,0L13.34,21.09L13.92,21.09L13.92,0L13.34,0Z M47.97,21.09L48.55,21.09L48.55,0L47.97,0L47.97,21.09Z M45.63,21.09L45.63,0L44.45,0L44.45,21.09L45.63,21.09Z M49.14,21.09L49.73,21.09L49.73,0L49.14,0L49.14,21.09Z " /><g opacity="1" transform="translate(196.04500122074728 317.99999534076704) rotate(0 59.99609994076779 59.99753668524085)"><mask id="bg-mask" fill="white"><use xlink:href="#path_0"></use></mask><g mask="url(#bg-mask)" ><path id="分组 1" fill-rule="evenodd" style="fill:#707070" transform="translate(0 0) rotate(0 59.99609994076779 59.99753668524085)" opacity="1" d="M65.05,39.15C64.32,41.29 61.13,46.54 56.13,48.49C56.13,48.49 52.91,48.92 53.52,51.45C53.52,51.45 54.36,54.82 57.97,52.91C57.97,52.91 67.14,48.35 71.63,37.25C71.63,37.25 74.4,36.18 77.92,36.85C77.92,36.85 72.38,53.95 61.12,59.43C61.12,59.43 50.18,65.27 52.35,51.48C52.35,51.48 53.77,38.1 74.78,29.25C74.78,29.25 88.03,22.92 96.23,19.93C91.07,15.2 85.03,11.53 78.46,9.13C76.61,8.46 74.73,8.17 72.86,7.71C61.64,15.39 51.74,30.49 48.34,40.81C48.34,40.81 42.26,55.96 50.94,65.28C50.94,65.28 59.01,72.91 70.41,61.91C70.41,61.91 77.64,55.98 82.03,38.24C82.03,38.24 83.66,39.17 83.76,39.52C83.86,39.87 82.84,54.08 76.32,63.98C76.32,63.98 69.32,75.87 56.62,74.53C43.92,73.21 37.42,62.84 33.67,53.96C30.88,47.33 28.94,31.51 31.39,14.33C21.57,20.49 13.54,29.67 9.26,41.43C6.37,49.37 5.65,57.5 6.46,65.37C17.22,73.04 42.95,88.84 65.54,82.69C80.87,78.51 84.32,64.13 84.32,64.13C87.94,53.55 85.1,40.69 85.1,40.69C102.7,72.6 78.38,92.03 78.38,92.03C65.61,103.98 46.68,107.32 32.18,106.2C35.14,108.01 38.27,109.52 41.52,110.72C69.54,120.93 100.52,106.46 110.72,78.42C115.44,65.41 114.69,51.84 109.92,39.92C107.43,39.21 104.63,38.34 101.71,37.16C101.71,37.16 88.7,33.11 80.2,34.15C75.76,34.59 71.37,35.49 67.11,36.83C67.11,36.83 65.77,37 65.05,39.15Z M54.49,0.28C44.55,1.07 39.7,4.14 39.99,3.59C23.74,9.39 9.99,21.87 3.63,39.37C-7.7,70.54 8.35,105.01 39.47,116.35C70.61,127.7 105.02,111.63 116.36,80.46C127.69,49.3 111.64,14.83 80.51,3.48C71.89,0.33 63.06,-0.52 54.49,0.28Z " /><path id="分组 1" style="stroke:#FFFFFF; stroke-width:1; stroke-opacity:1; stroke-dasharray:0 0" transform="translate(0 0) rotate(0 59.99609994076779 59.99753668524085)" d="M65.05,39.15C64.32,41.29 61.13,46.54 56.13,48.49C56.13,48.49 52.91,48.92 53.52,51.45C53.52,51.45 54.36,54.82 57.97,52.91C57.97,52.91 67.14,48.35 71.63,37.25C71.63,37.25 74.4,36.18 77.92,36.85C77.92,36.85 72.38,53.95 61.12,59.43C61.12,59.43 50.18,65.27 52.35,51.48C52.35,51.48 53.77,38.1 74.78,29.25C74.78,29.25 88.03,22.92 96.23,19.93C91.07,15.2 85.03,11.53 78.46,9.13C76.61,8.46 74.73,8.17 72.86,7.71C61.64,15.39 51.74,30.49 48.34,40.81C48.34,40.81 42.26,55.96 50.94,65.28C50.94,65.28 59.01,72.91 70.41,61.91C70.41,61.91 77.64,55.98 82.03,38.24C82.03,38.24 83.66,39.17 83.76,39.52C83.86,39.87 82.84,54.08 76.32,63.98C76.32,63.98 69.32,75.87 56.62,74.53C43.92,73.21 37.42,62.84 33.67,53.96C30.88,47.33 28.94,31.51 31.39,14.33C21.57,20.49 13.54,29.67 9.26,41.43C6.37,49.37 5.65,57.5 6.46,65.37C17.22,73.04 42.95,88.84 65.54,82.69C80.87,78.51 84.32,64.13 84.32,64.13C87.94,53.55 85.1,40.69 85.1,40.69C102.7,72.6 78.38,92.03 78.38,92.03C65.61,103.98 46.68,107.32 32.18,106.2C35.14,108.01 38.27,109.52 41.52,110.72C69.54,120.93 100.52,106.46 110.72,78.42C115.44,65.41 114.69,51.84 109.92,39.92C107.43,39.21 104.63,38.34 101.71,37.16C101.71,37.16 88.7,33.11 80.2,34.15C75.76,34.59 71.37,35.49 67.11,36.83C67.11,36.83 65.77,37 65.05,39.15Z M54.49,0.28C44.55,1.07 39.7,4.14 39.99,3.59C23.74,9.39 9.99,21.87 3.63,39.37C-7.7,70.54 8.35,105.01 39.47,116.35C70.61,127.7 105.02,111.63 116.36,80.46C127.69,49.3 111.64,14.83 80.51,3.48C71.89,0.33 63.06,-0.52 54.49,0.28Z " /></g></g></g></svg>
\ No newline at end of file
diff --git a/information-new.json b/information-new.json
index 0edbe3a..940fd37 100755
--- a/information-new.json
+++ b/information-new.json
@@ -4,7 +4,7 @@
"https://gitee.com/gfdgd-xi/uengine-runner",
"https://github.com/gfdgd-xi/uengine-runner"
],
- "Version": "1.6.0",
+ "Version": "1.6.1",
"System": "Linux（deepin/UOS）",
"Tips": [
"更多可见：https://gitee.com/gfdgd-xi/uengine-runner/wikis",
@@ -22,6 +22,8 @@
"5、如果想要使用adb连接UEngine或其他手机，请使用 1.2.0 以前的版本。（如需连接UEngine请安装adb补丁）"
],
"Update": [
+ "V1.6.1：",
+ "※1、修复了打包 deb 包在 APK 的包名有大写时无法启动的问题",
"V1.6.0：",
"※1、更换了新的图标",
"※2、支持程序的评分和查看分数详情的功能（如果炸了我的服务器，这个就作废了）",
diff --git a/information.json b/information.json
index 383fa29..2468f07 100755
--- a/information.json
+++ b/information.json
@@ -4,7 +4,7 @@
"https://gitee.com/gfdgd-xi/uengine-runner",
"https://github.com/gfdgd-xi/uengine-runner"
],
- "Version": "1.6.0",
+ "Version": "1.6.1",
"System": "Linux（deepin/UOS）",
"Tips": [
"更多可见：https://gitee.com/gfdgd-xi/uengine-runner/wikis",
@@ -22,6 +22,8 @@
"5、如果想要使用adb连接UEngine或其他手机，请使用 1.2.0 以前的版本。（如需连接UEngine请安装adb补丁）"
],
"Update": [
+ "V1.6.1：",
+ "※1、修复了打包 deb 包在 APK 的包名有大写时无法启动的问题",
"V1.6.0：",
"※1、更换了新的图标",
"※2、支持程序的评分和查看分数详情的功能（如果炸了我的服务器，这个就作废了）",
diff --git a/mount-disk-uengine.py b/mount-disk-uengine.py
new file mode 100644
index 0000000..986c94e
--- /dev/null
+++ b/mount-disk-uengine.py
@@ -0,0 +1,57 @@
+import os
+import psutil
+import string
+import ttkthemes
+import tkinter as tk
+import tkinter.ttk as ttk
+import tkinter.messagebox as messagebox
+
+class Program:
+ def GetRoot():
+ return os.geteuid() == 0
+
+ def MountDisk():
+ Disk.MountDisk(diskChoose.get(), "/data/uengine/安卓应用文件/media/" + name.get())
+
+class Disk:
+ def MountDisk(disk, path):
+ if not os.path.exists(path):
+ os.makedirs(path)
+ os.system("mount \"{}\" \"{}\"".format(disk, path))
+
+class File:
+ def DiskList():
+ diskList = []
+ partitions = psutil.disk_partitions()
+ for p in partitions:
+ if not "loop" in p.device and not "boot" in p.device and not p.device in diskList:
+ #print(p.device)
+ diskList.append(p.device)
+ #print(p.mountpoint)
+ return diskList
+
+if __name__ == "__main__":
+ window = tk.Tk()
+ print(File.DiskList())
+ if not Program.GetRoot():
+ window.withdraw()
+ messagebox.showerror(title="错误", message="此程序必须在 root 下运行！")
+ quit()
+ if not os.path.exists("/data/uengine/安卓应用文件/media"):
+ os.makedirs("/data/uengine/安卓应用文件/media")
+ #window.withdraw()
+ #messagebox.showerror(title="错误", message="目录不存在，无法继续操作！")
+ #quit()
+ window.title("挂载磁盘")
+ diskList = File.DiskList()
+ diskChoose = tk.StringVar()
+ diskChoose.set(diskList[0])
+ weight = ttk.Frame(window)
+ ttk.Label(weight, text="挂载磁盘：").grid(row=0, column=0)
+ ttk.OptionMenu(weight, diskChoose, diskList[0], *diskList).grid(row=0, column=1)
+ ttk.Label(weight, text="挂载名称：").grid(row=1, column=0)
+ name = ttk.Entry(weight)
+ ttk.Button(weight, text="挂载", command=Program.MountDisk).grid(row=2, column=1)
+ name.grid(row=1, column=1)
+ weight.pack()
+ window.mainloop()
\ No newline at end of file
diff --git a/new-deb-build/DEBIAN/control b/new-deb-build/DEBIAN/control
index f0fec3a..caaa56c 100644
--- a/new-deb-build/DEBIAN/control
+++ b/new-deb-build/DEBIAN/control
@@ -3,7 +3,7 @@ Source: com.gitee.uengine.runner.spark
Version: 1.6.0
Architecture: all
Maintainer: gfdgd xi <3025613752@qq.com>, actionchen<917981399@qq.com>
-Depends: deepin-elf-verify (>= 0.0.16.7-1), python3, python3-tk, python3-pip, aapt, uengine, python3-setuptools, deepin-terminal, curl, python3-pil, python3-pil.imagetk, python3-requests, adb, translate-shell, python3-xlib, fonts-noto-cjk, python3-numpy, python3-matplotlib, wget
+Depends: deepin-elf-verify (>= 0.0.16.7-1), python3, python3-tk, python3-pip, aapt, uengine, python3-setuptools, deepin-terminal, curl, python3-pil, python3-pil.imagetk, python3-requests, adb, translate-shell, python3-xlib, fonts-noto-cjk, python3-numpy, python3-matplotlib, wget, inotify-tools
Section: utils
Priority: optional
Conflicts: spark-uengine-runner, spark-uengine-apk-builder
diff --git a/uengine-apk-builder b/uengine-apk-builder
index 2f5756f..6a963bd 100755
--- a/uengine-apk-builder
+++ b/uengine-apk-builder
@@ -2,8 +2,8 @@
# 使用系统默认的 python3 运行
###########################################################################################
# 作者：gfdgd xi
-# 版本：1.5.3
-# 更新时间：2022年02月07日（要开学了）
+# 版本：1.6.1
+# 更新时间：2022年04月30日（五一了）
# 感谢：anbox、deepin 和 统信
# 基于 Python3 的 tkinter 构建
###########################################################################################
@@ -68,9 +68,9 @@ def BuildApkDeb(apkPath):
RunCommandShow("echo '写入文件，因为写入过程过于复杂，不显示写入命令……'")
apkPackageName = GetApkPackageName(apkPath, False)
if qianZhui.get():
- apkPackageNameNew = GetApkPackageName(apkPath, True)
+ apkPackageNameNew = GetApkPackageName(apkPath, True).lower()
else:
- apkPackageNameNew = GetApkPackageName(apkPath, False)
+ apkPackageNameNew = GetApkPackageName(apkPath, False).lower()
apkPackageVersion = GetApkVersion(apkPath)
if apkPackageVersion[0].upper() == "V":
package = list(apkPackageVersion)
@@ -274,8 +274,8 @@ def GetApkPackageName(apkFilePath, setting):
line = line.replace(" ", "")
# 此较为特殊，因为需要判断用户是否要添加前缀
if setting:
- return "uengine-dc-{}".format(line).lower()
- return line.lower()
+ return "uengine-dc-{}".format(line)
+ return line
def GetApkVersion(apkFilePath):
info = GetApkInformation(apkFilePath)
diff --git a/uengine-runner-api/__init__.py b/uengine-runner-api/__init__.py
new file mode 100644
index 0000000..226a2c7
--- /dev/null
+++ b/uengine-runner-api/__init__.py
@@ -0,0 +1,23 @@
+import os
+import subprocess
+import getxmlimg
+# 判断程序以正确方式运行
+class ROOT:
+ def GetRoot():
+ return os.geteuid() == 0
+
+class APK:
+ def __init__(self, apkPath):
+ self.apkPath = apkPath
+
+ def install(self):
+ os.system("pkexec /usr/bin/uengine-session-launch-helper -- uengine install --apk='{}'".format(self.apkPath))
+
+ def information(self):
+ return subprocess.getoutput("aapt dump badging '{}'".format(self.apkPath))
+
+if __name__ == "__main__":
+ print("本 API 不支持直接运行，请通过引入的方式使用此 API")
+ quit()
+if not ROOT.GetRoot():
+ print("请获取 ROOT 权限以便更好的使用该 API")
\ No newline at end of file
diff --git a/uengine-runner-api/getxmlimg.py b/uengine-runner-api/getxmlimg.py
new file mode 100755
index 0000000..af59a70
--- /dev/null
+++ b/uengine-runner-api/getxmlimg.py
@@ -0,0 +1,118 @@
+import PIL.Image as Image
+import PIL.ImageDraw as ImageDraw
+import zipfile
+import subprocess
+import re
+
+class getsavexml():
+
+ def savexml(self,apkFilePath,xmlpath,iconSavePath):
+ cmddumpid = "aapt dump xmltree "+ apkFilePath + " " + xmlpath
+ print(cmddumpid)
+ xmltree = subprocess.getoutput(cmddumpid)
+ xmls = xmltree.splitlines()
+ # find strs ,print next line
+ def FindStrs(lines,strs):
+ i=0
+ while i < len(lines):
+ if re.search(strs,lines[i]):
+ tmpstr = lines[i+1]
+ i += 1
+ Resultstr = tmpstr.split(":")[-1].split("=")[-1].split("0x")[-1]
+ return Resultstr
+ else:
+ i += 1
+ #从apk的信息中获取前后景图片的ID号
+ backimgid = FindStrs(xmls,"background")
+ foreimgid = FindStrs(xmls,"foreground")
+ print(backimgid)
+ print(foreimgid)
+
+ # 直接从apk resource文件获取前后两层图片路径及ID字符串
+ resource = subprocess.getoutput("aapt dump --values resources " + apkFilePath + "| grep -iE -A1 " + "\"" + backimgid + "|" + foreimgid + "\"")
+ resourcelines = resource.splitlines()
+ print(resourcelines)
+
+ # 从过滤出的字符串中获取所有相同ID的图片路径
+ def Findpicpath(lines,imgid):
+ i=0
+ Resultstr = []
+ while i < len(lines):
+ if re.search(imgid,lines[i]) and re.search("string8",lines[i+1]) :
+ print(lines[i+1])
+ tmpstr = lines[i+1].replace("\"","")
+ i += 1
+ Resultstr.append(tmpstr.split()[-1])
+ else:
+ i += 1
+ return Resultstr
+
+ #获取所有带前后图片ID的图片路径（相同背景或者前景的图片ID但分辨率不一样）
+ backimgs = Findpicpath(resourcelines,backimgid)
+ foreimgs = Findpicpath(resourcelines,foreimgid)
+ print(backimgs)
+ print(foreimgs)
+ #获取分辨率最高的图片路径
+ def getmaxsize(imgs):
+ j = 0
+ size=(0,0)
+ zipapk = zipfile.ZipFile(apkFilePath)
+ imgpath = ""
+ while j < len(imgs):
+ print(imgs[j])
+ img = Image.open(zipapk.open(imgs[j]))
+ print(imgs[j])
+ print(img.size)
+ if size < img.size:
+ size = img.size
+ imgpath = imgs[j]
+ j += 1
+ return imgpath
+
+ # 获取到文件列表后，进行比较分辨率，选取分辨率最高的张图片
+ iconbackpath = getmaxsize(backimgs)
+ iconforepath = getmaxsize(foreimgs)
+ print(iconbackpath + " " + iconforepath)
+
+ #从APK文件获取最终图片
+ zipapk = zipfile.ZipFile(apkFilePath)
+ iconback = zipapk.open(iconbackpath)
+ iconfore = zipapk.open(iconforepath)
+
+
+ # 叠加图片，mask 设置前景为蒙版
+ iconbackimg = Image.open(iconback).convert("RGBA")
+ iconforeimg = Image.open(iconfore).convert("RGBA")
+ iconbackimg.paste(iconforeimg,mask=iconforeimg)
+
+
+ # 圆角图片函数，网上拷贝的
+ def circle_corner(img, radii): #把原图片变成圆角，这个函数是从网上找的，原址 https://www.pyget.cn/p/185266
+ """
+ 圆角处理
+ :param img: 源图象。
+ :param radii: 半径，如：30。
+ :return: 返回一个圆角处理后的图象。
+ """
+ # 画圆（用于分离4个角）
+ circle = Image.new('L', (radii * 2, radii * 2), 0) # 创建一个黑色背景的画布
+ draw = ImageDraw.Draw(circle)
+ draw.ellipse((0, 0, radii * 2, radii * 2), fill=255) # 画白色圆形
+ # 原图
+ img = img.convert("RGBA")
+ w, h = img.size
+ # 画4个角（将整圆分离为4个部分）
+ alpha = Image.new('L', img.size, 255)
+ alpha.paste(circle.crop((0, 0, radii, radii)), (0, 0)) # 左上角
+ alpha.paste(circle.crop((radii, 0, radii * 2, radii)), (w - radii, 0)) # 右上角
+ alpha.paste(circle.crop((radii, radii, radii * 2, radii * 2)), (w - radii, h - radii)) # 右下角
+ alpha.paste(circle.crop((0, radii, radii, radii * 2)), (0, h - radii)) # 左下角
+ # alpha.show()
+ img.putalpha(alpha) # 白色区域透明可见，黑色区域不可见
+ return img
+
+ # 圆角半径1/8边长,保存icon图片
+ w,h = iconbackimg.size
+ iconimg = circle_corner(iconbackimg,int(w/8))
+ iconimg.save(iconSavePath)
+