|
@@ -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/HaiKangController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.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" />
|
|
@@ -16,22 +17,10 @@
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="336">
|
|
|
|
- <caret line="16" column="35" lean-forward="true" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="213">
|
|
|
|
- <caret line="520" column="64" selection-start-line="520" selection-start-column="56" selection-end-line="520" selection-end-column="64" />
|
|
|
|
|
|
+ <state relative-caret-position="552">
|
|
|
|
+ <caret line="612" column="39" selection-start-line="612" selection-start-column="39" selection-end-line="612" selection-end-column="39" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -39,32 +28,11 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="420">
|
|
|
|
- <caret line="20" column="61" selection-start-line="20" selection-start-column="50" selection-end-line="20" selection-end-column="61" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="272">
|
|
|
|
- <caret line="47" column="38" lean-forward="true" selection-start-line="47" selection-start-column="38" selection-end-line="47" selection-end-column="38" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#139#160#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
<file pinned="false" current-in-tab="true">
|
|
<file pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="486">
|
|
|
|
- <caret line="91" column="26" selection-start-line="91" selection-start-column="16" selection-end-line="91" selection-end-column="26" />
|
|
|
|
|
|
+ <state relative-caret-position="563">
|
|
|
|
+ <caret line="216" column="30" selection-start-line="216" selection-start-column="30" selection-end-line="216" selection-end-column="30" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#185#0#PHP" expanded="true" />
|
|
<element signature="e#141#185#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -75,8 +43,8 @@
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="494">
|
|
|
|
- <caret line="82" column="51" lean-forward="true" selection-start-line="82" selection-start-column="51" selection-end-line="82" selection-end-column="51" />
|
|
|
|
|
|
+ <state relative-caret-position="385">
|
|
|
|
+ <caret line="82" column="50" lean-forward="true" selection-start-line="82" selection-start-column="50" selection-end-line="82" selection-end-column="50" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -85,34 +53,10 @@
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="354">
|
|
|
|
- <caret line="56" column="36" lean-forward="true" selection-start-line="56" selection-start-column="36" selection-end-line="56" selection-end-column="36" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="508">
|
|
|
|
- <caret line="289" column="39" selection-start-line="289" selection-start-column="39" selection-end-line="289" selection-end-column="39" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="253">
|
|
|
|
- <caret line="43" column="10" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
|
|
|
|
|
|
+ <state relative-caret-position="375">
|
|
|
|
+ <caret line="75" column="27" selection-start-line="75" selection-start-column="10" selection-end-line="75" selection-end-column="27" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -206,9 +150,9 @@
|
|
<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$/Modules/Camera/Enum/CameraEnum.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
- <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
@@ -445,7 +389,7 @@
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="465768000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="467228000" />
|
|
</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" />
|
|
@@ -727,16 +671,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</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" 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/UpdateCameraStatus.php">
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="224">
|
|
<state relative-caret-position="224">
|
|
@@ -747,16 +681,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="494">
|
|
|
|
- <caret line="82" column="51" lean-forward="true" selection-start-line="82" selection-start-column="51" selection-end-line="82" selection-end-column="51" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="420">
|
|
<state relative-caret-position="420">
|
|
@@ -781,29 +705,22 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="253">
|
|
|
|
- <caret line="43" column="10" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.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="213">
|
|
|
|
- <caret line="520" column="64" selection-start-line="520" selection-start-column="56" selection-end-line="520" selection-end-column="64" />
|
|
|
|
|
|
+ <state relative-caret-position="336">
|
|
|
|
+ <caret line="16" column="35" lean-forward="true" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#129#150#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#6#91#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="336">
|
|
|
|
- <caret line="16" column="35" lean-forward="true" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
|
|
|
|
|
|
+ <state relative-caret-position="508">
|
|
|
|
+ <caret line="289" column="39" selection-start-line="289" selection-start-column="39" selection-end-line="289" selection-end-column="39" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#127#148#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -818,20 +735,47 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="508">
|
|
|
|
- <caret line="289" column="39" selection-start-line="289" selection-start-column="39" selection-end-line="289" selection-end-column="39" />
|
|
|
|
|
|
+ <state relative-caret-position="369">
|
|
|
|
+ <caret line="461" column="44" selection-start-line="461" selection-start-column="44" selection-end-line="461" selection-end-column="44" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#51#107#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="385">
|
|
|
|
+ <caret line="82" column="50" lean-forward="true" 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" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="552">
|
|
|
|
+ <caret line="612" column="39" selection-start-line="612" selection-start-column="39" selection-end-line="612" selection-end-column="39" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#129#150#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="375">
|
|
|
|
+ <caret line="75" column="27" selection-start-line="75" selection-start-column="10" selection-end-line="75" selection-end-column="27" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="486">
|
|
|
|
- <caret line="91" column="26" selection-start-line="91" selection-start-column="16" selection-end-line="91" selection-end-column="26" />
|
|
|
|
|
|
+ <state relative-caret-position="563">
|
|
|
|
+ <caret line="216" column="30" selection-start-line="216" selection-start-column="30" selection-end-line="216" selection-end-column="30" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#185#0#PHP" expanded="true" />
|
|
<element signature="e#141#185#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|