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
4925f57d
Commit
4925f57d
authored
2 years ago
by
wce
Browse files
Options
Downloads
Patches
Plain Diff
update
parent
f2acf04f
Branches
main
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
+19
-7
19 additions, 7 deletions
.idea/workspace.xml
app.py
+1
-2
1 addition, 2 deletions
app.py
with
20 additions
and
9 deletions
.idea/workspace.xml
+
19
−
7
View file @
4925f57d
...
...
@@ -37,7 +37,7 @@
<recent
name=
"D:\大三下\iot\作业\大作业\edge"
/>
</key>
</component>
<component
name=
"RunManager"
selected=
"Python.
test (1)
"
>
<component
name=
"RunManager"
selected=
"Python.
app
"
>
<configuration
name=
"app"
type=
"PythonConfigurationType"
factoryName=
"Python"
temporary=
"true"
nameIsGenerated=
"true"
>
<module
name=
"edge"
/>
<option
name=
"INTERPRETER_OPTIONS"
value=
""
/>
...
...
@@ -176,7 +176,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1656320533035
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"9"
/>
<task
id=
"LOCAL-00009"
summary=
"fix bug"
>
<created>
1656332414917
</created>
<option
name=
"number"
value=
"00009"
/>
<option
name=
"presentableId"
value=
"LOCAL-00009"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1656332414917
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"10"
/>
<servers
/>
</component>
<component
name=
"VcsManagerConfiguration"
>
...
...
@@ -184,14 +191,19 @@
<MESSAGE
value=
"修改了数据格式"
/>
<MESSAGE
value=
"加入了camera请求"
/>
<MESSAGE
value=
"update"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"update"
/>
<MESSAGE
value=
"fix bug"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"fix bug"
/>
</component>
<component
name=
"WindowStateProjectService"
>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2"
timestamp=
"16563
20532500
"
>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2"
timestamp=
"16563
32414158
"
>
<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=
"1656
176204394
"
/>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656
332414158
"
/>
<state
x=
"409"
y=
"6"
key=
"CommitChangelistDialog2/0.0.1536.824@0.0.1536.824"
timestamp=
"1656320532500"
/>
<state
x=
"147"
y=
"65"
key=
"DiffContextDialog"
timestamp=
"1656332407631"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
<state
x=
"147"
y=
"65"
key=
"DiffContextDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"1656332407631"
/>
<state
x=
"549"
y=
"167"
key=
"FileChooserDialogImpl"
timestamp=
"1656170973860"
>
<screen
x=
"0"
y=
"0"
width=
"1536"
height=
"824"
/>
</state>
...
...
@@ -244,10 +256,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
32010633
"
>
<state
x=
"449"
y=
"236"
key=
"com.intellij.ide.util.TipDialog"
timestamp=
"16563
41710115
"
>
<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=
"16563
32010633
"
/>
<state
x=
"449"
y=
"236"
key=
"com.intellij.ide.util.TipDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824"
timestamp=
"16563
41710115
"
/>
<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
−
2
View file @
4925f57d
...
...
@@ -75,8 +75,7 @@ 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
!=
'
unknown
'
)
Data
=
'
{
"
videoTab
"
: 1,
"
name
"
:
"
用户id
"
,
"
english
"
:
"'
+
str
(
userId
)
+
'"
}, {
"
videoTab
"
: 2,
"
name
"
:
"
通行权限
"
,
"
english
"
:
"'
+
str
(
isLocal
)
+
'"
}
'
Data
=
'
{
"
text
"
:
"
用户id:
'
+
str
(
userId
)
+
'
,通行权限:
'
+
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