|
@@ -3,6 +3,8 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -28,10 +30,13 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="379">
|
|
|
- <caret line="33" column="28" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="28" />
|
|
|
+ <state relative-caret-position="525">
|
|
|
+ <caret line="30" column="26" lean-forward="true" selection-start-line="29" selection-start-column="8" selection-end-line="30" selection-end-column="26" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -39,8 +44,8 @@
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="646">
|
|
|
- <caret line="830" column="74" selection-start-line="830" selection-start-column="74" selection-end-line="830" selection-end-column="74" />
|
|
|
+ <state relative-caret-position="-844">
|
|
|
+ <caret line="802" column="24" lean-forward="true" selection-start-line="802" selection-start-column="24" selection-end-line="802" selection-end-column="24" />
|
|
|
<folding>
|
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -49,9 +54,21 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="222">
|
|
|
+ <caret line="189" column="20" selection-start-line="189" selection-start-column="20" selection-end-line="189" selection-end-column="20" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#141#185#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="69">
|
|
|
+ <state relative-caret-position="487">
|
|
|
<caret line="82" column="50" selection-start-line="82" selection-start-column="50" selection-end-line="82" selection-end-column="50" />
|
|
|
<folding>
|
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
@@ -63,8 +80,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="312">
|
|
|
- <caret line="24" column="39" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="39" />
|
|
|
+ <state relative-caret-position="319">
|
|
|
+ <caret line="84" column="23" lean-forward="true" selection-start-line="84" selection-start-column="23" selection-end-line="84" selection-end-column="23" />
|
|
|
<folding>
|
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -76,7 +93,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="571">
|
|
|
- <caret line="40" column="32" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="32" />
|
|
|
+ <caret line="40" column="32" lean-forward="true" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="32" />
|
|
|
<folding>
|
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -84,6 +101,15 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="274">
|
|
|
+ <caret line="104" column="26" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="26" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
@@ -171,11 +197,11 @@
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2022_01_21_151316_add_field_to_camera_list_2021_01_21.php" />
|
|
|
- <option value="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
|
- <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
|
</list>
|
|
|
</option>
|
|
@@ -413,12 +439,12 @@
|
|
|
<workItem from="1641785500605" duration="61000" />
|
|
|
<workItem from="1641786030534" duration="477000" />
|
|
|
<workItem from="1641800375826" duration="26685000" />
|
|
|
- <workItem from="1643085370753" duration="13691000" />
|
|
|
+ <workItem from="1643085370753" duration="18328000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="443742000" />
|
|
|
+ <option name="totallyTimeSpent" value="448379000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -689,16 +715,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="252">
|
|
|
- <caret line="165" column="20" selection-start-line="165" selection-start-column="20" selection-end-line="165" selection-end-column="20" />
|
|
|
- <folding>
|
|
|
- <element signature="e#141#185#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1911">
|
|
@@ -734,13 +750,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="379">
|
|
|
- <caret line="33" column="28" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="28" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="565">
|
|
@@ -751,10 +760,20 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="347">
|
|
|
+ <caret line="461" column="44" lean-forward="true" selection-start-line="461" selection-start-column="44" selection-end-line="461" selection-end-column="44" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#51#107#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="571">
|
|
|
- <caret line="40" column="32" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="32" />
|
|
|
+ <caret line="40" column="32" lean-forward="true" selection-start-line="40" selection-start-column="32" selection-end-line="40" selection-end-column="32" />
|
|
|
<folding>
|
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -763,8 +782,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="462">
|
|
|
- <caret line="27" column="8" selection-start-line="27" selection-start-column="8" selection-end-line="28" selection-end-column="20" />
|
|
|
+ <state relative-caret-position="525">
|
|
|
+ <caret line="30" column="26" lean-forward="true" selection-start-line="29" selection-start-column="8" selection-end-line="30" selection-end-column="26" />
|
|
|
<folding>
|
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -773,38 +792,45 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="312">
|
|
|
- <caret line="24" column="39" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="39" />
|
|
|
+ <state relative-caret-position="319">
|
|
|
+ <caret line="84" column="23" lean-forward="true" selection-start-line="84" selection-start-column="23" selection-end-line="84" selection-end-column="23" />
|
|
|
<folding>
|
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="347">
|
|
|
- <caret line="461" column="44" lean-forward="true" selection-start-line="461" selection-start-column="44" selection-end-line="461" selection-end-column="44" />
|
|
|
+ <state relative-caret-position="487">
|
|
|
+ <caret line="82" column="50" selection-start-line="82" selection-start-column="50" selection-end-line="82" selection-end-column="50" />
|
|
|
<folding>
|
|
|
- <element signature="e#51#107#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="69">
|
|
|
- <caret line="82" column="50" selection-start-line="82" selection-start-column="50" selection-end-line="82" selection-end-column="50" />
|
|
|
+ <state relative-caret-position="222">
|
|
|
+ <caret line="189" column="20" selection-start-line="189" selection-start-column="20" selection-end-line="189" selection-end-column="20" />
|
|
|
<folding>
|
|
|
- <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#141#185#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="274">
|
|
|
+ <caret line="104" column="26" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="26" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="646">
|
|
|
- <caret line="830" column="74" selection-start-line="830" selection-start-column="74" selection-end-line="830" selection-end-column="74" />
|
|
|
+ <state relative-caret-position="-844">
|
|
|
+ <caret line="802" column="24" lean-forward="true" selection-start-line="802" selection-start-column="24" selection-end-line="802" selection-end-column="24" />
|
|
|
<folding>
|
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
|
</folding>
|