Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PHP
vryPanoEdit
Commits
104358db
Commit
104358db
authored
5 years ago
by
李文起
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix/v1.2.4.15' into 'master'
切换热点修复bug See merge request
!40
parents
206d7ce6
a38103cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Services/Hotspot/HotspotAction/SwitchHotspot.php
+12
-7
src/Services/Hotspot/HotspotAction/SwitchHotspot.php
with
12 additions
and
7 deletions
+12
-7
src/Services/Hotspot/HotspotAction/SwitchHotspot.php
View file @
104358db
...
...
@@ -12,12 +12,14 @@ class SwitchHotspot extends HotspotAction
*/
public
function
actionData
(){
$sceneId
=
$this
->
getSceneIdByFrontId
(
$this
->
data
[
'actionData'
][
'sceneId'
]);
if
(
$sceneId
)
{
if
(
!
empty
(
$this
->
data
[
'actionData'
][
'sceneId'
]))
{
$this
->
r
et
urnD
ata
[
'action
_d
ata'
]
=
json_encode
([
'scene_id'
=>
$sceneId
]);
}
$sceneId
=
$this
->
g
et
SceneIdByFrontId
(
$this
->
d
ata
[
'action
D
ata'
]
[
'sceneId'
]);
if
(
$sceneId
)
{
$this
->
returnData
[
'action_data'
]
=
json_encode
([
'scene_id'
=>
$sceneId
]);
}
}
}
/**
...
...
@@ -25,10 +27,13 @@ class SwitchHotspot extends HotspotAction
*/
public
function
onclick
(){
$sceneId
=
$this
->
getSceneIdByFrontId
(
$this
->
data
[
'actionData'
][
'sceneId'
]);
if
(
$sceneId
)
{
if
(
!
empty
(
$this
->
data
[
'actionData'
][
'sceneId'
]))
{
$sceneId
=
$this
->
getSceneIdByFrontId
(
$this
->
data
[
'actionData'
][
'sceneId'
]);
if
(
$sceneId
)
{
$this
->
returnData
[
'onclick'
]
=
'loadscene(scene_'
.
$sceneId
.
');'
;
$this
->
returnData
[
'onclick'
]
=
'loadscene(scene_'
.
$sceneId
.
');'
;
}
}
return
$this
;
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help