From 3dd224963a3407bba6671a925a27587c819775de Mon Sep 17 00:00:00 2001 From: luojiayi <1712054227@qq.com> Date: Mon, 21 Apr 2025 18:27:42 +0800 Subject: [PATCH] =?UTF-8?q?2025=E5=B9=B404=E6=9C=8821=E6=97=A518:27:41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 1 + jsconfig.json | 1 + src/app.config.js | 21 +++ src/app.js | 2 +- src/app.less | 10 +- src/assets/addDev.png | Bin 0 -> 142726 bytes src/assets/connectble.png | Bin 0 -> 18883 bytes src/assets/menu/m1.png | Bin 0 -> 1112 bytes src/assets/menu/m1_a.png | Bin 0 -> 1327 bytes src/assets/menu/m2.png | Bin 0 -> 1607 bytes src/assets/menu/m2_a.png | Bin 0 -> 1384 bytes src/assets/pause.png | Bin 0 -> 17846 bytes src/assets/play.png | Bin 43701 -> 17795 bytes src/assets/roundble.png | Bin 0 -> 1578 bytes src/baseRouter/index.js | 92 ++++++++++ src/components/color-picker/index.jsx | 24 +-- .../{index copy => device}/index.config.js | 0 src/pages/device/index.jsx | 72 ++++++++ src/pages/device/index.less | 79 +++++++++ src/pages/deviceList/index.config.js | 3 + src/pages/deviceList/index.jsx | 65 ++++++++ src/pages/deviceList/index.less | 126 ++++++++++++++ src/pages/game/index.jsx | 65 ++++++-- src/pages/game/index.less | 6 +- src/pages/history/index.jsx | 55 +++--- src/pages/history/index.less | 60 +++++-- src/pages/index/index.jsx | 157 ++++++++++++++---- src/pages/index/index.less | 18 ++ src/pages/test/index.config.js | 3 + src/pages/{index copy => test}/index.jsx | 0 src/pages/{index copy => test}/index.less | 0 src/utils/ble.js | 43 +++-- src/utils/index.js | 14 +- src/utils/sendOrder.js | 26 ++- src/utils/taskQueue copy.js | 38 +++++ 35 files changed, 837 insertions(+), 144 deletions(-) create mode 100644 src/assets/addDev.png create mode 100644 src/assets/connectble.png create mode 100644 src/assets/menu/m1.png create mode 100644 src/assets/menu/m1_a.png create mode 100644 src/assets/menu/m2.png create mode 100644 src/assets/menu/m2_a.png create mode 100644 src/assets/pause.png create mode 100644 src/assets/roundble.png create mode 100644 src/baseRouter/index.js rename src/pages/{index copy => device}/index.config.js (100%) create mode 100644 src/pages/device/index.jsx create mode 100644 src/pages/device/index.less create mode 100644 src/pages/deviceList/index.config.js create mode 100644 src/pages/deviceList/index.jsx create mode 100644 src/pages/deviceList/index.less create mode 100644 src/pages/test/index.config.js rename src/pages/{index copy => test}/index.jsx (100%) rename src/pages/{index copy => test}/index.less (100%) create mode 100644 src/utils/taskQueue copy.js diff --git a/config/index.js b/config/index.js index bff92b0..a2c98c6 100644 --- a/config/index.js +++ b/config/index.js @@ -15,6 +15,7 @@ export default defineConfig(async (merge, { command, mode }) => { '@src': require('path').resolve(__dirname, '../src/src'), '@api': require('path').resolve(__dirname, '../src/api'), '@config': require('path').resolve(__dirname, '../src/config'), + '@baseRouter': require('path').resolve(__dirname, '../src/baseRouter'), }, projectName: 'myApp', date: '2023-8-18', diff --git a/jsconfig.json b/jsconfig.json index 1695c86..9d82c3b 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -8,6 +8,7 @@ "@/images/*": ["./src/images/*"], "@/api/*": ["./src/api/*"], "@/store/*": ["./src/store/*"], + "@/baseRouter/*": ["./src/baseRouter/*"], "@/src/*": ["./src/*"] } } diff --git a/src/app.config.js b/src/app.config.js index 145f834..5751861 100644 --- a/src/app.config.js +++ b/src/app.config.js @@ -1,5 +1,7 @@ export default defineAppConfig({ pages: [ + "pages/device/index", + "pages/deviceList/index", "pages/index/index", "pages/game/index", "pages/history/index", @@ -10,4 +12,23 @@ export default defineAppConfig({ navigationBarBackgroundColor: "#fff", navigationBarTextStyle: "black", }, + tabBar: { + color: "#787878", + selectedColor: "#5F93FA", + list: [ + { + pagePath: "pages/index/index", + text: "控制", + iconPath: "./assets/menu/m1.png", + selectedIconPath: "./assets/menu/m1_a.png", + }, + { + pagePath: "pages/device/index", + text: "设备", + iconPath: "./assets/menu/m2.png", + selectedIconPath: "./assets/menu/m2_a.png", + }, + + ], + }, }); diff --git a/src/app.js b/src/app.js index 600559e..cb19051 100644 --- a/src/app.js +++ b/src/app.js @@ -5,7 +5,7 @@ import BLESDK from './utils/ble' function App({ children }) { useLaunch(() => { - // BLESDK.openBluetoothAdapter() + BLESDK.openBluetoothAdapter() }) // children 是将要会渲染的页面 diff --git a/src/app.less b/src/app.less index 615ed30..7ef3177 100644 --- a/src/app.less +++ b/src/app.less @@ -1,7 +1,3 @@ -.index { - flex: 1; -} - page { margin: 0; padding: 0; @@ -13,5 +9,9 @@ page { overflow: hidden; display: flex; flex-direction: column; - +} + +.index { + flex: 1; + background: #F7F7F7; } diff --git a/src/assets/addDev.png b/src/assets/addDev.png new file mode 100644 index 0000000000000000000000000000000000000000..f4513dec4a95af3c5e32b051a5ddf89d4ce2e970 GIT binary patch literal 142726 zcmYIPRa{i<*ByF
29P2q+7Z>l@O#$x>LHlrCXXIK7Ice-^KZz
zbDpaw)?Rz9efIgHq9lWfPKFKu05IRlN~!_?h|~Z8f)Wt*??^{((T~5kSB|neE&u=q
z{=W+Wkda05cM!ovRYn|8F-CFl_XXKfOi>H~sE);WG)4g+vXH-%6jS#=IDXP8P$QEi7|dmywk6qCg9n{`**0uH_0o6;{C4zo{ToWF4rZ+^}_+!)}d
z?`g)DZDLiQ3Hw<{OG`>iOCLX-eDpcer75$wx7A% @5*BrY;P>2!o18Lk& ?}(@dvy*>H9gdm#g^FHsC{?4kKtu1Vc4B
zV4>)%`Wnl7t(;n_b`Dm-PEvelP=G+(n!u3V_-U3(`TP40CmoJ*wPnn)Hg#{Y1jYi)
z8K*lF*EPy|MPF)ZF&V}J7o;HN;q0GxIo2}Y(E?(O_9IPr_(HRahFM(X?1@=t!*rHf
z;U}-_=s7n7I
zsSby+Dn(Okc1+dBp)&4qu$g3|bh&0Hpm1p)S_vma7NyBqHYpS%;?&we!ywr#O&qjO
zqj;W|6iGHQXj)yqdRj$Ja&jd@42OGeu(sL+cAnVNDQ
p_n$zD!h*4DS-`1<4vIi&p-ruJ_8Hg0u(HscP<}R+*i%DbeUz7d`dd|
z41{C~wUw9kZ9geZb{0|zZoe*-mf*u3BEFl1!`dt?C62*kmE2`n#r7osNqEKm4krSb
z_;85l?qthoI5wJ9zx;jxd<*@Jf{)cfkEyDgf0mP_BrGtVHjUru2o||hDm%SYtMp6coiYl2e1CH$A_fkN__$J
zAKj4MPm{NhcRS@a(1yhDi?AJcPOoPD70XMo@;7_6*22p4{=hO3oLb5)bRc;BRZGRi
zvhV%ijfnkO??tPTYvTkkHLG}=O~-OLot6tXrUgW(ML@^L;bOxWaTbyT4`Chv27~@-?HridNpZQz2IcdJ-@*%4Yx8d@
zSsx}bTBh?Ub2v@UM{P!6RbZ%Yax9bh!1O}`vMNOF^|J?`!4!c<*_Qyx&?AjWyjn{D
ztd7foLB=tDM%i2+$NrbPQ+RJYY5yfPl9+1Cd&LUN>Bml*1}`k+?tGxM?RLAI0Rs?1
z-w%XQcQUDX2-)u=vmJBhLxU_3qdVMTz~fr7?z9-D0gHuaQLgZPSDgA=-LG>veS4dy
zR?-i4>iHqyL+sWuQF}Yv=i$V17uuJyGC3^~kew)=A2#u0=$s7p4?<46y^(6@%6`Cl
z9n8n=gL;5KAIPynQg7n~_Dx*x{(7Mei6G<^C%xYa^+z8~Us^-ZFXb19?&F*P-XAv~
zZr+i&U||
dXW07{RE+&
z3``MZNT)3Bl>i^Tq}ihHMrg*;SPLZFrpyzBb|jCqp46YA7w~~lzc`b|=Tc-$1{O6F
zI}XP*_|ONWkOH+sk!Id9dbMLwW^W3#ilyKp_!wDV#`GW<*eYjHF6p|ZIiF&Hl9-qc
z(qII@I&`WhnRtvYb$7A>Zm_gfr0pV%LHARDh_cL{6_Txj6y09g4q