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
ad13e7c3
authored
Nov 27, 2019
by
hank
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
92b221a2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
9 deletions
+13
-9
src/api/axios.ts
+2
-1
src/common/utils.ts
+2
-1
src/pages/home/film/film_list/index.tsx
+6
-4
src/pages/home/film/index.tsx
+1
-1
src/pages/home/film/schedule_add/components/device/index.scss
+1
-1
src/pages/home/tempaltes/film_edit_info.tsx
+1
-1
No files found.
src/api/axios.ts
View file @
ad13e7c3
...
...
@@ -77,7 +77,8 @@ $axios.interceptors.response.use(
if
(
!!
code
&&
code
!==
'0'
)
{
Taro
.
showToast
({
title
:
msg
,
duration
:
2000
duration
:
2000
,
icon
:
'none'
})
return
Promise
.
reject
(
config
.
data
)
}
...
...
src/common/utils.ts
View file @
ad13e7c3
...
...
@@ -151,6 +151,7 @@ export function analysisPage(value: arrayBuffer): Promise<ICallBack> {
return
new
Promise
(
resolve
=>
{
let
page
=
0
const
state
=
new
Uint8Array
(
value
)[
0
]
// 获取蓝牙状态
console
.
log
(
state
,
'state'
)
// 判断第8位数是否是 1
if
((
state
&
0x80
)
!==
0
)
{
// 第8位数为 1, 设备端发送资源包
...
...
@@ -168,7 +169,7 @@ export function analysisPage(value: arrayBuffer): Promise<ICallBack> {
advertisData
=
getBLEData
(
value
)
+
advertisData
// advertisData2 = String.fromCharCode.apply(null, new Uint8Array(value)) + advertisData2
}
console
.
log
(
'累加结果'
,
advertisData
)
console
.
log
(
value
,
'arrayBuffer'
)
resolve
({
page
,
advertisData
,
state
})
// callBack({ page, advertisData, state })
}
else
{
...
...
src/pages/home/film/film_list/index.tsx
View file @
ad13e7c3
...
...
@@ -112,10 +112,12 @@ class Films extends Component {
onSetting
(
item
)
{
if
(
process
.
env
.
TARO_ENV
!==
'rn'
)
{
Taro
.
hideTabBar
().
then
(()
=>
{
this
.
setState
({
isOpened
:
true
,
chooseItem
:
item
})
setTimeout
(()
=>
{
this
.
setState
({
isOpened
:
true
,
chooseItem
:
item
})
},
500
)
})
}
else
{
this
.
setState
({
...
...
src/pages/home/film/index.tsx
View file @
ad13e7c3
...
...
@@ -49,7 +49,7 @@ class Device extends Component {
return
(
<
View
>
<
View
style=
{
{
height
:
`${windowHeight
+ 43
}px`
}
}
>
<
View
style=
{
{
height
:
`${windowHeight}px`
}
}
>
<
FilmList
height=
{
windowHeight
}
/>
</
View
>
</
View
>
...
...
src/pages/home/film/schedule_add/components/device/index.scss
View file @
ad13e7c3
...
...
@@ -6,7 +6,7 @@
.device-bind
{
width
:
100%
;
height
:
100%
;
min-
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
...
...
src/pages/home/tempaltes/film_edit_info.tsx
View file @
ad13e7c3
...
...
@@ -81,7 +81,7 @@ class FilmDetail extends Component {
Taro
.
navigateBack
()
},
500
)
}
catch
(
error
)
{
showMyToast
({
title
:
'更新失败'
})
//
showMyToast({ title: '更新失败' })
}
}
...
...
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