Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
edge
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
成恩 伍
edge
Commits
f2acf04f
Commit
f2acf04f
authored
2 years ago
by
wce
Browse files
Options
Downloads
Patches
Plain Diff
fix bug
parent
e4eac73f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.idea/workspace.xml
+28
-22
28 additions, 22 deletions
.idea/workspace.xml
app.py
+1
-1
1 addition, 1 deletion
app.py
with
29 additions
and
23 deletions
.idea/workspace.xml
+
28
−
22
View file @
f2acf04f
...
...
@@ -3,7 +3,6 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"568b48a6-ca7f-4dc8-b0ca-a3d09f437fa9"
name=
"Default Changelist"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/README.md"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/README.md"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/app.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/app.py"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -170,7 +169,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1656318119843
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"8"
/>
<task
id=
"LOCAL-00008"
summary=
"update"
>
<created>
1656320533035
</created>
<option
name=
"number"
value=
"00008"
/>
<option
name=
"presentableId"
value=
"LOCAL-00008"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1656320533035
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"9"
/>
<servers
/>
</component>
<component
name=
"VcsManagerConfiguration"
>
...
...
@@ -181,55 +187,55 @@
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"update"
/>
</component>
<component
name=
"WindowStateProjectService"
>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2"
timestamp=
"16563
18119399
"
>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2"
timestamp=
"16563
20532500
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656176204394"
/>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
18119399
"
/>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
20532500
"
/>
<state
x=
"549"
y=
"167"
key=
"FileChooserDialogImpl"
timestamp=
"1656170973860"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
x=
"549"
y=
"167"
key=
"FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656170973860"
/>
<state
width=
"1515"
height=
"17
6
"
key=
"GridCell.Tab.0.bottom"
timestamp=
"165632
0493402
"
>
<state
width=
"1515"
height=
"1
2
7"
key=
"GridCell.Tab.0.bottom"
timestamp=
"165632
1390859
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
width=
"1515"
height=
"259"
key=
"GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656276357461"
/>
<state
width=
"1515"
height=
"17
6
"
key=
"GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824"
timestamp=
"165632
0493402
"
/>
<state
width=
"1515"
height=
"17
6
"
key=
"GridCell.Tab.0.center"
timestamp=
"165632
0493402
"
>
<state
width=
"1515"
height=
"1
2
7"
key=
"GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824"
timestamp=
"165632
1390859
"
/>
<state
width=
"1515"
height=
"1
2
7"
key=
"GridCell.Tab.0.center"
timestamp=
"165632
1390859
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
width=
"1515"
height=
"259"
key=
"GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656276357461"
/>
<state
width=
"1515"
height=
"17
6
"
key=
"GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824"
timestamp=
"165632
0493402
"
/>
<state
width=
"1515"
height=
"17
6
"
key=
"GridCell.Tab.0.left"
timestamp=
"165632
0493401
"
>
<state
width=
"1515"
height=
"1
2
7"
key=
"GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824"
timestamp=
"165632
1390859
"
/>
<state
width=
"1515"
height=
"1
2
7"
key=
"GridCell.Tab.0.left"
timestamp=
"165632
1390859
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
width=
"1515"
height=
"259"
key=
"GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656276357461"
/>
<state
width=
"1515"
height=
"17
6
"
key=
"GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824"
timestamp=
"165632
0493401
"
/>
<state
width=
"1515"
height=
"17
6
"
key=
"GridCell.Tab.0.right"
timestamp=
"165632
0493402
"
>
<state
width=
"1515"
height=
"1
2
7"
key=
"GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824"
timestamp=
"165632
1390859
"
/>
<state
width=
"1515"
height=
"1
2
7"
key=
"GridCell.Tab.0.right"
timestamp=
"165632
1390859
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
width=
"1515"
height=
"259"
key=
"GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656276357461"
/>
<state
width=
"1515"
height=
"17
6
"
key=
"GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824"
timestamp=
"165632
0493402
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.bottom"
timestamp=
"16563
19838671
"
>
<state
width=
"1515"
height=
"1
2
7"
key=
"GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824"
timestamp=
"165632
1390859
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.bottom"
timestamp=
"16563
21390860
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
width=
"1515"
height=
"261"
key=
"GridCell.Tab.1.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656276357457"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
19838671
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.center"
timestamp=
"16563
19838671
"
>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
21390860
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.center"
timestamp=
"16563
21390859
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
width=
"1515"
height=
"261"
key=
"GridCell.Tab.1.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656276357457"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
19838671
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.left"
timestamp=
"16563
19838670
"
>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
21390859
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.left"
timestamp=
"16563
21390859
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
width=
"1515"
height=
"261"
key=
"GridCell.Tab.1.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656276357457"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
19838670
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.right"
timestamp=
"16563
19838671
"
>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
21390859
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.right"
timestamp=
"16563
21390860
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
width=
"1515"
height=
"261"
key=
"GridCell.Tab.1.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656276357457"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
19838671
"
/>
<state
width=
"1515"
height=
"127"
key=
"GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824"
timestamp=
"16563
21390860
"
/>
<state
x=
"270"
y=
"54"
key=
"SettingsEditor"
timestamp=
"1656170734965"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
...
...
@@ -238,10 +244,10 @@
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
x=
"361"
y=
"134"
key=
"Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656176209063"
/>
<state
x=
"449"
y=
"236"
key=
"com.intellij.ide.util.TipDialog"
timestamp=
"16563
09609576
"
>
<state
x=
"449"
y=
"236"
key=
"com.intellij.ide.util.TipDialog"
timestamp=
"16563
32010633
"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
x=
"449"
y=
"236"
key=
"com.intellij.ide.util.TipDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656
255857724
"
/>
<state
x=
"449"
y=
"236"
key=
"com.intellij.ide.util.TipDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656
332010633
"
/>
<state
x=
"449"
y=
"236"
key=
"com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824"
timestamp=
"1656309609576"
/>
<state
x=
"562"
y=
"329"
key=
"com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2"
timestamp=
"1656318098623"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
...
...
This diff is collapsed.
Click to expand it.
app.py
+
1
−
1
View file @
f2acf04f
...
...
@@ -74,7 +74,7 @@ def getDoorStatus():
def
getCamera
():
res
=
requests
.
get
(
url
=
"
http://114.116.217.108:59882/api/v2/device/name/camera/nameList
"
)
userId
=
json
.
loads
(
res
.
text
)[
'
event
'
][
'
readings
'
][
0
][
'
value
'
]
isLocal
=
(
userId
!=
'
unknow
'
)
isLocal
=
(
userId
!=
'
unknow
n
'
)
Data
=
'
{
"
videoTab
"
: 1,
"
name
"
:
"
用户id
"
,
"
english
"
:
"'
+
str
(
userId
)
+
'"
}, {
"
videoTab
"
: 2,
"
name
"
:
"
通行权限
"
,
"
english
"
:
"'
+
str
(
isLocal
)
+
'"
}
'
return
Data
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment