chao 2 months ago
parent
commit
c0c37f21d4
4 changed files with 28 additions and 26 deletions
  1. 2 20
      package.json
  2. 1 1
      src/Blockly/blocklyXml.js
  3. 4 5
      src/pages/Home.tsx
  4. 21 0
      webadb.packages.txt

+ 2 - 20
package.json

@@ -22,26 +22,6 @@
     "@types/streamsaver": "^2.0.1",
     "@types/streamsaver": "^2.0.1",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/w3c-web-usb": "^1.0.6",
     "@uiw/react-codemirror": "^4.23.10",
     "@uiw/react-codemirror": "^4.23.10",
-    "@yume-chan/adb": "file:../ya-webadb/libraries/adb",
-    "@yume-chan/adb-credential-web": "file:../ya-webadb/libraries/adb-credential-web",
-    "@yume-chan/adb-daemon-direct-sockets": "file:../ya-webadb/libraries/adb-daemon-direct-sockets",
-    "@yume-chan/adb-daemon-webusb": "file:../ya-webadb/libraries/adb-daemon-webusb",
-    "@yume-chan/adb-daemon-ws": "file:../ya-webadb/libraries/adb-daemon-ws",
-    "@yume-chan/adb-scrcpy": "file:../ya-webadb/libraries/adb-scrcpy",
-    "@yume-chan/adb-server-node-tcp": "file:../ya-webadb/libraries/adb-server-node-tcp",
-    "@yume-chan/android-bin": "file:../ya-webadb/libraries/android-bin",
-    "@yume-chan/aoa": "file:../ya-webadb/libraries/aoa",
-    "@yume-chan/b-tree": "file:../ya-webadb/libraries/b-tree",
-    "@yume-chan/dataview-bigint-polyfill": "file:../ya-webadb/libraries/dataview-bigint-polyfill",
-    "@yume-chan/event": "file:../ya-webadb/libraries/event",
-    "@yume-chan/pcm-player": "file:../ya-webadb/libraries/pcm-player",
-    "@yume-chan/scrcpy": "file:../ya-webadb/libraries/scrcpy",
-    "@yume-chan/scrcpy-decoder-tinyh264": "file:../ya-webadb/libraries/scrcpy-decoder-tinyh264",
-    "@yume-chan/scrcpy-decoder-webcodecs": "file:../ya-webadb/libraries/scrcpy-decoder-webcodecs",
-    "@yume-chan/stream-extra": "file:../ya-webadb/libraries/stream-extra",
-    "@yume-chan/struct": "file:../ya-webadb/libraries/struct",
-    "@yume-chan/tabby-launcher": "file:../ya-webadb/libraries/tabby-launcher",
-    "@yume-chan/tabby-tango": "file:../ya-webadb/libraries/tabby-tango",
     "antd": "^5.6.4",
     "antd": "^5.6.4",
     "axios": "^1.8.4",
     "axios": "^1.8.4",
     "blockly": "^10.3.0",
     "blockly": "^10.3.0",
@@ -88,3 +68,5 @@
     ]
     ]
   }
   }
 }
 }
+
+    

+ 1 - 1
src/Blockly/blocklyXml.js

@@ -892,7 +892,7 @@ export default `<xml  style="height: 100%">
             </block>
             </block>
             <block type="ai_lcd_draw_image_on_canvas">
             <block type="ai_lcd_draw_image_on_canvas">
               <value name="image_path">
               <value name="image_path">
-                   <block type="v831_img_open">
+                   <block type="image_open">
                        <value name="save_path">
                        <value name="save_path">
                            <shadow type="text">
                            <shadow type="text">
                                <field name="TEXT">/root/user/img/saved.jpg</field>
                                <field name="TEXT">/root/user/img/saved.jpg</field>

+ 4 - 5
src/pages/Home.tsx

@@ -235,7 +235,7 @@ const Home: React.FC = () => {
                       {contentRightTopShow === 1 ? <Col span={24} style={{ height: "100%" }}> 
                       {contentRightTopShow === 1 ? <Col span={24} style={{ height: "100%" }}> 
                         <FileManagerReadFile setEditable={editableValue} />
                         <FileManagerReadFile setEditable={editableValue} />
                       </Col> : ""}
                       </Col> : ""}
-                      {contentRightTopShow === 2 ? <Col span={24} style={{ height: "100%" }} ref={handleBottomLeftAreaRef}>
+                      {/* {contentRightTopShow === 2 ? <Col span={24} style={{ height: "100%" }} ref={handleBottomLeftAreaRef}>
                         <Terminal
                         <Terminal
                           height={"100%"}
                           height={"100%"}
                           width={bottomLeftAreaWidth - 70}
                           width={bottomLeftAreaWidth - 70}
@@ -251,12 +251,12 @@ const Home: React.FC = () => {
                             width: bottomLeftAreaWidth - 20,
                             width: bottomLeftAreaWidth - 20,
                           }}
                           }}
                         />
                         />
-                      </Col>
+                      </Col> */}
                     </Row>
                     </Row>
                   </Col>
                   </Col>
 
 
                 </Row>
                 </Row>
-                <Row
+                {/* <Row
                   style={{
                   style={{
                     marginTop: 20,
                     marginTop: 20,
                     backgroundColor:"#f8f8f8",paddingRight:10
                     backgroundColor:"#f8f8f8",paddingRight:10
@@ -266,7 +266,6 @@ const Home: React.FC = () => {
                     <AdbHeader  />
                     <AdbHeader  />
                   </Col>
                   </Col>
                   <Col className="run-reboot" span={24}>
                   <Col className="run-reboot" span={24}>
-                    {/* <SelectDevice /> */}
                     <DeviceConnection style={{ width: "59%", }} />
                     <DeviceConnection style={{ width: "59%", }} />
                     <AddDevice style={{ width: "39%" }} />
                     <AddDevice style={{ width: "39%" }} />
                   </Col>
                   </Col>
@@ -274,7 +273,7 @@ const Home: React.FC = () => {
                     <RunCommandShell />
                     <RunCommandShell />
                     <Reboot />
                     <Reboot />
                   </Col>
                   </Col>
-                </Row>
+                </Row> */}
               </Col>
               </Col>
             </Row>
             </Row>
 
 

+ 21 - 0
webadb.packages.txt

@@ -22,3 +22,24 @@
 @yume-chan/scrcpy-decoder-tinyh264
 @yume-chan/scrcpy-decoder-tinyh264
 @yume-chan/scrcpy
 @yume-chan/scrcpy
 @yume-chan/aoa
 @yume-chan/aoa
+
+"@yume-chan/adb": "file:../ya-webadb/libraries/adb",
+    "@yume-chan/adb-credential-web": "file:../ya-webadb/libraries/adb-credential-web",
+    "@yume-chan/adb-daemon-direct-sockets": "file:../ya-webadb/libraries/adb-daemon-direct-sockets",
+    "@yume-chan/adb-daemon-webusb": "file:../ya-webadb/libraries/adb-daemon-webusb",
+    "@yume-chan/adb-daemon-ws": "file:../ya-webadb/libraries/adb-daemon-ws",
+    "@yume-chan/adb-scrcpy": "file:../ya-webadb/libraries/adb-scrcpy",
+    "@yume-chan/adb-server-node-tcp": "file:../ya-webadb/libraries/adb-server-node-tcp",
+    "@yume-chan/android-bin": "file:../ya-webadb/libraries/android-bin",
+    "@yume-chan/aoa": "file:../ya-webadb/libraries/aoa",
+    "@yume-chan/b-tree": "file:../ya-webadb/libraries/b-tree",
+    "@yume-chan/dataview-bigint-polyfill": "file:../ya-webadb/libraries/dataview-bigint-polyfill",
+    "@yume-chan/event": "file:../ya-webadb/libraries/event",
+    "@yume-chan/pcm-player": "file:../ya-webadb/libraries/pcm-player",
+    "@yume-chan/scrcpy": "file:../ya-webadb/libraries/scrcpy",
+    "@yume-chan/scrcpy-decoder-tinyh264": "file:../ya-webadb/libraries/scrcpy-decoder-tinyh264",
+    "@yume-chan/scrcpy-decoder-webcodecs": "file:../ya-webadb/libraries/scrcpy-decoder-webcodecs",
+    "@yume-chan/stream-extra": "file:../ya-webadb/libraries/stream-extra",
+    "@yume-chan/struct": "file:../ya-webadb/libraries/struct",
+    "@yume-chan/tabby-launcher": "file:../ya-webadb/libraries/tabby-launcher",
+    "@yume-chan/tabby-tango": "file:../ya-webadb/libraries/tabby-tango",