Skip to content
Snippets Groups Projects
Commit f2acf04f authored by wce's avatar wce
Browse files

fix bug

parent e4eac73f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 28
− 22
View file @ f2acf04f
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="568b48a6-ca7f-4dc8-b0ca-a3d09f437fa9" name="Default Changelist" comment=""> <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$/.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" /> <change beforePath="$PROJECT_DIR$/app.py" beforeDir="false" afterPath="$PROJECT_DIR$/app.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -170,7 +169,14 @@ ...@@ -170,7 +169,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1656318119843</updated> <updated>1656318119843</updated>
</task> </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 /> <servers />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
...@@ -181,55 +187,55 @@ ...@@ -181,55 +187,55 @@
<option name="LAST_COMMIT_MESSAGE" value="update" /> <option name="LAST_COMMIT_MESSAGE" value="update" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="409" y="6" key="CommitChangelistDialog2" timestamp="1656318119399"> <state x="409" y="6" key="CommitChangelistDialog2" timestamp="1656320532500">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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/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="1656318119399" /> <state x="409" y="6" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1656320532500" />
<state x="549" y="167" key="FileChooserDialogImpl" timestamp="1656170973860"> <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1656170973860">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1656170973860" /> <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="176" key="GridCell.Tab.0.bottom" timestamp="1656320493402"> <state width="1515" height="127" key="GridCell.Tab.0.bottom" timestamp="1656321390859">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="259" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1656276357461" />
<state width="1515" height="176" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1656320493402" /> <state width="1515" height="127" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1656321390859" />
<state width="1515" height="176" key="GridCell.Tab.0.center" timestamp="1656320493402"> <state width="1515" height="127" key="GridCell.Tab.0.center" timestamp="1656321390859">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="259" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1656276357461" />
<state width="1515" height="176" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1656320493402" /> <state width="1515" height="127" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1656321390859" />
<state width="1515" height="176" key="GridCell.Tab.0.left" timestamp="1656320493401"> <state width="1515" height="127" key="GridCell.Tab.0.left" timestamp="1656321390859">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="259" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1656276357461" />
<state width="1515" height="176" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1656320493401" /> <state width="1515" height="127" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1656321390859" />
<state width="1515" height="176" key="GridCell.Tab.0.right" timestamp="1656320493402"> <state width="1515" height="127" key="GridCell.Tab.0.right" timestamp="1656321390859">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="259" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1656276357461" />
<state width="1515" height="176" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1656320493402" /> <state width="1515" height="127" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1656321390859" />
<state width="1515" height="127" key="GridCell.Tab.1.bottom" timestamp="1656319838671"> <state width="1515" height="127" key="GridCell.Tab.1.bottom" timestamp="1656321390860">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="1656319838671" /> <state width="1515" height="127" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1656321390860" />
<state width="1515" height="127" key="GridCell.Tab.1.center" timestamp="1656319838671"> <state width="1515" height="127" key="GridCell.Tab.1.center" timestamp="1656321390859">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="1656319838671" /> <state width="1515" height="127" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1656321390859" />
<state width="1515" height="127" key="GridCell.Tab.1.left" timestamp="1656319838670"> <state width="1515" height="127" key="GridCell.Tab.1.left" timestamp="1656321390859">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="1656319838670" /> <state width="1515" height="127" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1656321390859" />
<state width="1515" height="127" key="GridCell.Tab.1.right" timestamp="1656319838671"> <state width="1515" height="127" key="GridCell.Tab.1.right" timestamp="1656321390860">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="1656319838671" /> <state width="1515" height="127" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1656321390860" />
<state x="270" y="54" key="SettingsEditor" timestamp="1656170734965"> <state x="270" y="54" key="SettingsEditor" timestamp="1656170734965">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
...@@ -238,10 +244,10 @@ ...@@ -238,10 +244,10 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="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="1656309609576"> <state x="449" y="236" key="com.intellij.ide.util.TipDialog" timestamp="1656332010633">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </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="1656255857724" /> <state x="449" y="236" key="com.intellij.ide.util.TipDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1656332010633" />
<state x="449" y="236" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1656309609576" /> <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"> <state x="562" y="329" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1656318098623">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
......
app.py
+ 1
− 1
View file @ f2acf04f
...@@ -74,7 +74,7 @@ def getDoorStatus(): ...@@ -74,7 +74,7 @@ def getDoorStatus():
def getCamera(): def getCamera():
res = requests.get(url="http://114.116.217.108:59882/api/v2/device/name/camera/nameList") 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'] userId = json.loads(res.text)['event']['readings'][0]['value']
isLocal = (userId != 'unknow') isLocal = (userId != 'unknown')
Data = '{"videoTab": 1, "name": "用户id","english": "' + str( Data = '{"videoTab": 1, "name": "用户id","english": "' + str(
userId) + '"}, {"videoTab": 2, "name": "通行权限","english": "' + str(isLocal) + '"}' userId) + '"}, {"videoTab": 2, "name": "通行权限","english": "' + str(isLocal) + '"}'
return Data return Data
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment