chao 1 年之前
父節點
當前提交
de14858254

二進制
dist/assets/AppCenter_ai_emotion-y1kPDTeZ.jpg


二進制
dist/assets/AppCenter_ai_gesture_recognition-cqVjYw81.jpg


二進制
dist/assets/AppCenter_ai_speech-yiUdB6rq.jpg


二進制
dist/assets/AppCenter_ai_teachableMachine-kEyGJlcC.jpg


二進制
dist/assets/AppCenter_comingSoon-vNzRs8Zi.jpg


二進制
dist/assets/AppCenter_iot_ifttt-WpVmSIVM.jpg


二進制
dist/assets/AppCenter_iot_thingspeak-u1OGZcEl.jpg


File diff suppressed because it is too large
+ 1 - 1
dist/assets/index-V0ASwftu.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-qlFFXC7D.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-yjGHODhS.css


二進制
dist/assets/nav_help-bsnNaGyc.png


二進制
dist/assets/object_recognition_header-hNuf-pLj.jpg


二進制
dist/assets/posenet_recogition-enZUqhPU.png


二進制
dist/assets/tm_with_pose-IOGS0MIo.jpg


+ 2 - 2
dist/index.html

@@ -5,8 +5,8 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Mini Pi</title>
-    <script type="module" crossorigin src="/assets/index-DkR7hYw5.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-yjGHODhS.css">
+    <script type="module" crossorigin src="/assets/index-V0ASwftu.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-qlFFXC7D.css">
   </head>
   <body>
     <div id="app"></div>

+ 1 - 0
src/App.vue

@@ -25,6 +25,7 @@ watchEffect(() => {
       <BlocklyComponent></BlocklyComponent>
     </div>
     <Footer></Footer>
+    <ConnectAdb></ConnectAdb>
   </div>
 </template>
 

+ 1 - 0
src/assets/css/header.css

@@ -25,6 +25,7 @@
 .link_stydy .header_menu_li a {
     display: block;
     padding: 14px;
+    color: #26a69a;
 }
 
 .el-dropdown-menu .header_menu_li:hover {

+ 10 - 4
src/assets/css/main.css

@@ -1,5 +1,9 @@
 @import './base.css';
 
+html {
+  font-size: 15px;
+}
+
 /* 清零所有标签的内外边距 */
 * {
   margin: 0;
@@ -41,7 +45,7 @@ a {
 button,
 input {
   /* "\5B8B\4F53" 就是宋体的意思 这样浏览器兼容性比较好 */
-  font-family: Microsoft YaHei, Heiti SC, tahoma, arial, Hiragino Sans GB, "\5B8B\4F53", sans-serif;
+  font-family: sans-serif, Heiti SC, tahoma, arial, Hiragino Sans GB, "\5B8B\4F53", sans-serif;
   /* 手动去掉默认的灰色边框 */
   border: 0;
   /* 手动去掉input输入时的蓝色/加粗边框 */
@@ -52,7 +56,7 @@ body {
   /* CSS3 抗锯齿形 让文字显示的更加清晰 */
   -webkit-font-smoothing: antialiased;
   background-color: #fff;
-  font: 12px/1.5 Microsoft YaHei, Heiti SC, tahoma, arial, Hiragino Sans GB, "\5B8B\4F53", sans-serif;
+  font: 16px/1.5 sans-serif, Heiti SC, tahoma, arial, Hiragino Sans GB, "\5B8B\4F53", sans-serif;
   color: #666
 }
 
@@ -96,9 +100,11 @@ a,
   padding-bottom: 0;
   color: #000;
 }
-#app .el-card__body{
+
+#app .el-card__body {
   padding: 0;
 }
+
 .background_blue {
   background-color: #2196F3 !important;
 }
@@ -119,7 +125,7 @@ a,
 }
 
 a {
-  color: #26a69a;
+  color: #fff;
 }
 
 a:hover {

+ 45 - 3
src/components/footer/footer.vue

@@ -1,14 +1,56 @@
 <template>
-    <div id="footer">
-        footer
+    <div class="footer">
+        <div>
+            <span class="translatable_copyright_left" style="color:#fff;">可可乐博(深圳)科技有限公司 © </span>
+            <span id="copyright_middle" style="color:#fff;"> 2023</span>
+            <span class="translatable_copyright_right" style="color:#fff;">版权所有</span>
+        </div>
+        <div style="">
+            <span @click="updateLogVisible = true" style="cursor: pointer;">
+                <span class="translatable_update_logs" style="color: #fff;">更新日志</span>
+                <i class="material-icons sketch_name_icon"
+                    style="margin-left:5px;cursor: pointer;position: relative;top: 7px;">message</i>
+            </span>
+            <span class="vertical-separator" style="padding: 4px 6px 4px 6px;"></span>
+            <span>
+                <a id="help" target="_blank" href="//pi-help.cocorobo.cn" style="position:relative">
+
+                    <span class="translatable_help_board" style="color: #fff;">Help</span>
+                    <img class="nav-icon" :src="helpImg"
+                        style="height: 20px;margin-left: 5px;position: relative;top: -8px;">
+                </a>
+            </span>
+            <span class="vertical-separator" style="padding: 4px 6px 4px 6px;"></span>
+            <span>CocoBlockly Pi</span>
+        </div>
     </div>
+    <el-dialog v-model="updateLogVisible" title="更新日志">
+        <div>111111111</div>
+        <div>111111111</div><div>111111111</div>
+        <div>111111111</div>
+    </el-dialog>
 </template>
 <script setup>
+import { ref } from 'vue';
+import helpImg from '@/assets/img/nav_help.png'
+
+const updateLogVisible = ref(false)
 
+const updateLogModel = ()=>{
+    console.log("更新日志弹框")
+}
 </script>
 <style lang="scss" scoped>
-#footer{
+.footer {
+    padding: 0 1.5rem;
     width: 100%;
     height: 60px;
+    display: flex;
+    background: #2c4fcd;
+    justify-content: space-between;
+    color: #fff;
+    // line-height: 60px;
+    align-items:center;
+    
 }
 </style>

+ 18 - 5
src/components/headerRight/labs.vue

@@ -8,7 +8,8 @@
             <template #header="{ close }">
                 <div class="my-header">
                     <span class="labs_title">CocoBlockly Pi 实验室</span>
-                    <i class="material-icons right" style="margin-top: 10px;cursor: pointer;" @click="close">close</i>
+                    <i class="material-icons right" style="margin-top: 5px;cursor: pointer;margin-right:-15px"
+                        @click="close">close</i>
                 </div>
             </template>
             <el-row class="labs_body">
@@ -32,10 +33,18 @@
                         <li v-else-if="calssActive == 2">
                             <Iot></Iot>
                         </li>
-                        <li v-else-if="calssActive == 3">机器人控制</li>
-                        <li v-else-if="calssActive == 4">科学实验</li>
-                        <li v-else-if="calssActive == 5">互动游戏</li>
-                        <li v-else>AR/VR</li>
+                        <li v-else-if="calssActive == 3">
+                            <RobotContro></RobotContro>
+                        </li>
+                        <li v-else-if="calssActive == 4">
+                            <Science></Science>
+                        </li>
+                        <li v-else-if="calssActive == 5">
+                            <interactiveGames></interactiveGames>
+                        </li>
+                        <li v-else>
+                            <ARVR></ARVR>
+                        </li>
                     </ul>
                 </el-col>
             </el-row>
@@ -47,6 +56,10 @@ import { ref } from 'vue';
 import imgIcon from '../../assets/img/cocoblockly-navbar_labs-icon.png'
 import AI from '../labs/ai.vue'
 import Iot from '../labs/iot.vue'
+import RobotContro from '../labs/robotContro.vue';
+import Science from '../labs/science.vue'
+import interactiveGames from '../labs/interactiveGames.vue'
+import ARVR from '../labs/ARVR.vue'
 
 const dialogVisible = ref(false)
 const calssActive = ref(1)

+ 17 - 0
src/components/labs/ARVR.vue

@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <el-row class="el_row_card">
+            <el-col :span="12" class="card_style">
+                <Card :imgSrc="comingSoonImg" :linkSrc="'//thingspeak.com/'" :title="'敬请期待'"
+                    @getNextValue="getNextValue" :comingSoon="true">
+                </Card>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+<script setup>
+import Card from './targetCard.vue'
+import '../../assets/css/header.css'
+import comingSoonImg from '../../assets/img/AppCenter_comingSoon.jpg'
+
+</script>

+ 17 - 0
src/components/labs/interactiveGames.vue

@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <el-row class="el_row_card">
+            <el-col :span="12" class="card_style">
+                <Card :imgSrc="comingSoonImg" :linkSrc="'//thingspeak.com/'" :title="'敬请期待'"
+                    @getNextValue="getNextValue" :comingSoon="true">
+                </Card>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+<script setup>
+import Card from './targetCard.vue'
+import '../../assets/css/header.css'
+import comingSoonImg from '../../assets/img/AppCenter_comingSoon.jpg'
+
+</script>

+ 17 - 0
src/components/labs/robotContro.vue

@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <el-row class="el_row_card">
+            <el-col :span="12" class="card_style">
+                <Card :imgSrc="comingSoonImg" :linkSrc="'//thingspeak.com/'" :title="'敬请期待'"
+                    @getNextValue="getNextValue" :comingSoon="true">
+                </Card>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+<script setup>
+import Card from './targetCard.vue'
+import '../../assets/css/header.css'
+import comingSoonImg from '../../assets/img/AppCenter_comingSoon.jpg'
+
+</script>

+ 17 - 0
src/components/labs/science.vue

@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <el-row class="el_row_card">
+            <el-col :span="12" class="card_style">
+                <Card :imgSrc="comingSoonImg" :linkSrc="'//thingspeak.com/'" :title="'敬请期待'"
+                    @getNextValue="getNextValue" :comingSoon="true">
+                </Card>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+<script setup>
+import Card from './targetCard.vue'
+import '../../assets/css/header.css'
+import comingSoonImg from '../../assets/img/AppCenter_comingSoon.jpg'
+
+</script>

+ 2 - 14
src/components/labs/targetCard.vue

@@ -1,9 +1,9 @@
 <template>
-    <el-card style="border-radius:10px"> 
+    <el-card style="border-radius:10px">
         <img class="labs_card_img" :src="imgSrc" alt="">
         <div style="padding:20px;">
             <p class="labs_card_p">{{ title }}</p>
-            <el-button v-if="!comingSoon">
+            <el-button v-if="!comingSoon" type="primary">
                 <a :href="linkSrc" target="_Blank" v-if="linkSrc != ''">进入</a>
                 <span v-else @click="goNext(title)">进入</span>
             </el-button>
@@ -44,16 +44,4 @@ const goNext = (value) => {
     margin-bottom: 8px;
     font-size: 24px;
 }
-
-.el-button {
-    background-color: #2979FF;
-    color: #fff;
-
-    a {
-        color: #fff;
-    }
-    a:hover{
-        color: (--el-button-hover-text-color)
-    }
-}
 </style>

+ 13 - 18
src/components/webadb/connect.vue

@@ -1,25 +1,20 @@
 <template>
     <div>
-        <div>连接</div>
+        <div style="cursor: pointer;" @click="concent()">连接</div>
     </div>
 </template>
 
-<script>
-// import { AdbDaemonDevice } from "@yume-chan/adb";
-// import { AdbDaemonWebUsbDeviceManager } from "@yume-chan/adb-daemon-webusb";
-export default{
-    name:"connect",
-    data(){
-        return{
-            adb:"",
-            device:""
-        }
-    },
-    mounted(){
-        console.log("1111111")
-    }
+<script setup>
+import { ref } from 'vue';
+// import { Adb, AdbBackend, AdbPacketData, AdbPacketInit } from '@yume-chan/adb';
+// import AdbDirectSocketsBackend from "@yume-chan/adb-backend-direct-sockets";
+// import AdbWebUsbBackend, { AdbWebUsbBackendWatcher } from '@yume-chan/adb-backend-webusb';
+// import AdbWsBackend from '@yume-chan/adb-backend-ws';
+// import AdbWebCredentialStore from '@yume-chan/adb-credential-web';
+// import { InspectStream, pipeFrom, ReadableStream, WritableStream } from '@yume-chan/stream-extra';
+
+const concent = () => {
+    // console.log(AdbWebUsbBackend.requestDevice())
 }
 </script>
-<style scoped>
-
-</style>
+<style scoped></style>

Some files were not shown because too many files changed in this diff