Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Iotfinal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jiajunw6
Iotfinal
Merge requests
!3
Update server/report.php
Code
Review changes
Check out branch
Download
Patches
Plain diff
Open
Update server/report.php
jiajunw6-main-patch-94260
into
main
Overview
0
Commits
1
Pipelines
1
Changes
1
Open
jiajunw6
requested to merge
jiajunw6-main-patch-94260
into
main
2 years ago
Overview
0
Commits
1
Pipelines
1
Changes
1
Expand
0
0
Merge request reports
Compare
main
main (HEAD)
and
latest version
latest version
32467dec
1 commit,
2 years ago
1 file
+
2
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
server/report.php
+
2
−
3
Options
@@ -12,11 +12,11 @@ getint('id'); getstr('IMEI');
$device
=
new
device
();
$report
=
new
report
();
if
(
!
$device
->
load
(
$id
))
dieapp
(
'
设备ID不正确
'
);
if
(
!
$device
->
load
(
$id
))
dieapp
(
'
ID ERROR
'
);
$postdata
=
file_get_contents
(
"php://input"
);
$data
=
json_decode
(
$postdata
);
if
(
!
$data
)
dieapp
(
'JSON
格式不正确
'
);
if
(
!
$data
)
dieapp
(
'JSON
ERROR
'
);
$command
=
$defaultcommand
;
@@ -82,7 +82,6 @@ if($device->reportstatus=='recording') {
if
(
$device
->
loginuid
||
$noneedlogin
)
$login
=
1
;
else
$login
=
0
;
//有record最优先,然后url浏览再处理,没有再处理上传
$url
=
null
;
$fileid
=
null
;
if
(
$device
->
record
)
{
$command
=
'record'
;
Loading