Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
visualcloud
/
Vmatrix-client-taro
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d65d1f52
authored
Nov 26, 2019
by
hank
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加点击状态栏
parent
da8656ba
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
7 deletions
+40
-7
src/common/utils.ts
+4
-3
src/pages/home/device/device_list/index.tsx
+3
-1
src/pages/home/device/group_detail/index.tsx
+3
-1
src/pages/home/device/index.scss
+1
-1
src/pages/home/film/film_list/index.scss
+13
-0
src/pages/home/film/index.scss
+1
-1
src/pages/home/tempaltes/scss/index.scss
+15
-0
No files found.
src/common/utils.ts
View file @
d65d1f52
...
...
@@ -5,7 +5,6 @@ import { bluetooth } from './adapter'
function
Utf8ArrayToStr
(
array
)
{
let
out
,
i
,
len
,
c
let
char2
,
char3
out
=
''
len
=
array
.
length
i
=
0
...
...
@@ -39,8 +38,10 @@ function Utf8ArrayToStr(array) {
break
}
}
return
out
// let decoder = new TextDecoder('utf-8')
// let u8arr = new Uint8Array(array)
// return decoder.decode(u8arr)
}
/** 连接参数 */
export
function
concatParam
(
data
:
any
):
string
{
...
...
@@ -117,7 +118,7 @@ export function getBLEState(buffer: ArrayBuffer) {
/** 解析蓝牙接收到的数据 */
export
function
getBLEData
(
buffer
:
ArrayBuffer
)
{
console
.
log
(
Utf8ArrayToStr
(
new
Uint8Array
(
buffer
.
slice
(
1
,
buffer
.
byteLength
))))
console
.
log
(
Utf8ArrayToStr
(
new
Uint8Array
(
buffer
.
slice
(
1
,
buffer
.
byteLength
)))
,
buffer
.
byteLength
)
// return String.fromCharCode.apply(null, new Uint8Array(buffer.slice(1, buffer.byteLength)))
return
Utf8ArrayToStr
(
new
Uint8Array
(
buffer
.
slice
(
1
,
buffer
.
byteLength
)))
}
...
...
src/pages/home/device/device_list/index.tsx
View file @
d65d1f52
...
...
@@ -236,7 +236,9 @@ class MyDevice extends Component {
}
]
}
>
<
DeviceItem
{
...
item
}
onClick=
{
()
=>
this
.
goDetail
(
item
.
equipmentId
)
}
/>
<
View
onClick=
{
()
=>
this
.
goDetail
(
item
.
equipmentId
)
}
>
<
DeviceItem
{
...
item
}
/>
</
View
>
</
AtSwipeAction
>
</
View
>
))
}
...
...
src/pages/home/device/group_detail/index.tsx
View file @
d65d1f52
...
...
@@ -158,7 +158,9 @@ class DeviceGroup extends Component {
}
]
}
>
<
DeviceItem
{
...
item
}
onClick=
{
()
=>
this
.
goDetail
(
item
.
equipmentId
)
}
/>
<
View
onClick=
{
()
=>
this
.
goDetail
(
item
.
equipmentId
)
}
>
<
DeviceItem
{
...
item
}
/>
</
View
>
</
AtSwipeAction
>
</
View
>
))
}
...
...
src/pages/home/device/index.scss
View file @
d65d1f52
...
...
@@ -5,7 +5,7 @@
background
:
#ff9110
!
important
;
width
:
38px
;
left
:
calc
(
50%
-
19px
);
height
:
5
px
;
height
:
6
px
;
border-radius
:
3px
;
}
...
...
src/pages/home/film/film_list/index.scss
View file @
d65d1f52
...
...
@@ -27,11 +27,24 @@
.type-tab-item
{
padding
:
0
20px
;
position
:
relative
;
}
.type-tab-item-active
{
font-size
:
38px
;
color
:
#000
;
&
:
:
after
{
content
:
''
;
position
:
absolute
;
bottom
:
-13px
;
width
:
38px
;
height
:
6px
;
background
:
rgba
(
255
,
145
,
16
,
1
);
box-shadow
:
0
2px
4px
0
rgba
(
233
,
145
,
42
,
0
.43
);
border-radius
:
3px
;
left
:
calc
(
50%
-
19px
);
}
}
}
...
...
src/pages/home/film/index.scss
View file @
d65d1f52
...
...
@@ -5,7 +5,7 @@
background
:
#ff9110
!
important
;
width
:
38px
;
left
:
calc
(
50%
-
19px
);
height
:
5
px
;
height
:
6
px
;
border-radius
:
3px
;
}
...
...
src/pages/home/tempaltes/scss/index.scss
View file @
d65d1f52
...
...
@@ -19,6 +19,7 @@
width
:
38px
;
position
:
absolute
;
left
:
30px
;
top
:
25px
;
}
.type-tab
{
...
...
@@ -26,14 +27,28 @@
text-align
:
center
;
font-size
:
28px
;
color
:
#969799
;
margin-bottom
:
10px
;
.type-tab-item
{
padding
:
0
20px
;
position
:
relative
;
}
.type-tab-item-active
{
font-size
:
38px
;
color
:
#000
;
&
:
:
after
{
content
:
''
;
position
:
absolute
;
bottom
:
-13px
;
width
:
38px
;
height
:
6px
;
background
:
rgba
(
255
,
145
,
16
,
1
);
box-shadow
:
0
2px
4px
0
rgba
(
233
,
145
,
42
,
0
.43
);
border-radius
:
3px
;
left
:
calc
(
50%
-
19px
);
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment