|
@@ -3,6 +3,7 @@
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
<change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.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>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -27,11 +28,11 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="480">
|
|
|
|
- <caret line="51" column="17" selection-start-line="51" selection-start-column="17" selection-end-line="51" selection-end-column="17" />
|
|
|
|
|
|
+ <state relative-caret-position="386">
|
|
|
|
+ <caret line="97" column="31" selection-start-line="97" selection-start-column="20" selection-end-line="97" selection-end-column="31" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#140#184#0#PHP" expanded="true" />
|
|
<element signature="e#140#184#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -48,11 +49,11 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="319">
|
|
|
|
- <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
|
|
|
|
|
|
+ <state relative-caret-position="593">
|
|
|
|
+ <caret line="42" column="36" selection-start-line="42" selection-start-column="36" selection-end-line="42" selection-end-column="36" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#6#91#0#PHP" expanded="true" />
|
|
<element signature="e#6#91#0#PHP" expanded="true" />
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
<element signature="e#126#164#0#PHP" expanded="true" />
|
|
@@ -168,13 +169,13 @@
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" />
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" />
|
|
- <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
- <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
|
|
|
|
+ <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -429,7 +430,7 @@
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="490988000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="491543000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -742,16 +743,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="431">
|
|
|
|
- <caret line="104" column="26" lean-forward="true" selection-start-line="104" selection-start-column="26" selection-end-line="104" selection-end-column="26" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="231">
|
|
<state relative-caret-position="231">
|
|
@@ -803,26 +794,36 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="319">
|
|
|
|
- <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
|
|
|
|
|
|
+ <state relative-caret-position="582">
|
|
|
|
+ <caret line="135" column="10" lean-forward="true" selection-start-line="135" selection-start-column="10" selection-end-line="135" selection-end-column="10" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
|
- <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#40#71#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="480">
|
|
|
|
- <caret line="51" column="17" selection-start-line="51" selection-start-column="17" selection-end-line="51" selection-end-column="17" />
|
|
|
|
|
|
+ <state relative-caret-position="386">
|
|
|
|
+ <caret line="97" column="31" selection-start-line="97" selection-start-column="20" selection-end-line="97" selection-end-column="31" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#140#184#0#PHP" expanded="true" />
|
|
<element signature="e#140#184#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="593">
|
|
|
|
+ <caret line="42" column="36" selection-start-line="42" selection-start-column="36" selection-end-line="42" selection-end-column="36" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
|
+ <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
</component>
|
|
</component>
|
|
</project>
|
|
</project>
|