zw/iOSAI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
906523b5ba32ce01ab080e019bf00e7fc3d65d96
iOSAI/.idea/workspace.xml

166 lines
11 KiB
XML
Raw Normal View History

合并代码。解决冲突
2025-08-15 20:14:59 +08:00
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
调整路径
2025-08-15 22:24:41 +08:00
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
合并代码。解决冲突
2025-08-15 20:14:59 +08:00
<component name="ChangeListManager">
<list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="">
调整路径
2025-08-15 22:24:41 +08:00
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Module/DeviceInfo.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/DeviceInfo.py" afterDir="false" />
修复bug
2025-08-18 19:22:20 +08:00
<change beforePath="$PROJECT_DIR$/Module/FlaskService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/FlaskService.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Utils/Requester.py" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/Requester.py" afterDir="false" />
调整逻辑，修复bug。
2025-08-18 15:51:09 +08:00
<change beforePath="$PROJECT_DIR$/out/Main.dist/IOSAI.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/certifi/cacert.pem" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/cv2/opencv_videoio_ffmpeg4120_64.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/jaraco/text/Lorem ipsum.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/libcrypto-3.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/libffi-8.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/libssl-3.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/numpy.libs/libscipy_openblas64_-43e11ff0749b8cbe0a615c9cf6737e0e.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/numpy.libs/msvcp140-263139962577ecda4cd9469ca360a746.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/python3.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/python312.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/pythoncom312.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/pywintypes312.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/add.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/advertisement.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/back.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/comment.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/icon.ico" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/bz2.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/getopt.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevice_id.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicebackup.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicebackup2.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicebtlogger.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicecrashreport.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicedate.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicedebug.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicedebugserverproxy.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicedevmodectl.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicediagnostics.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/ideviceenterrecovery.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/ideviceimagemounter.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/ideviceinfo.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicename.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicenotificationproxy.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicepair.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/ideviceprovision.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicerestore.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicescreenshot.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicesetlocation.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/idevicesyslog.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/inetcat.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/iproxy.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/irecovery.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/libcrypto-3.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/libcurl.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/libssl-3.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/plistutil.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/readline.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/zip.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/iproxy/zlib1.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/like.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/resources/search.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/tcl86t.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/tk86t.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/vcruntime140.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/vcruntime140_1.dll" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/Main.dist/zlib1.dll" beforeDir="false" />
合并代码。解决冲突
2025-08-15 20:14:59 +08:00
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
调整路径
2025-08-15 22:24:41 +08:00
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 5
}</component>
合并代码。解决冲突
2025-08-15 20:14:59 +08:00
<component name="ProjectId" id="31K5VnrGt5SBVafKVv8gi0HPOF6" />
调整路径
2025-08-15 22:24:41 +08:00
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
合并代码。解决冲突
2025-08-15 20:14:59 +08:00
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
调整路径
2025-08-15 22:24:41 +08:00
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;Python.Main.executor&quot;: &quot;Run&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;git-widget-placeholder&quot;: &quot;main&quot;,
&quot;last_opened_file_path&quot;: &quot;E:/Code/python/iOSAI/Module/Main.py&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
合并代码。解决冲突
2025-08-15 20:14:59 +08:00
}
调整路径
2025-08-15 22:24:41 +08:00
}</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\Code\python\iOSAI\resources" />
<recent name="E:\Code\python\iOSAI" />
</key>
</component>
合并代码。解决冲突
2025-08-15 20:14:59 +08:00
<component name="RunManager">
<configuration name="Main" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
<module name="iOSAI" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="SDK_NAME" value="Python 3.12" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/Module/Main.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
</component>
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-PY-241.18034.82" />
<option value="bundled-python-sdk-975db3bf15a3-2767605e8bc2-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-241.18034.82" />
</set>
</attachedChunks>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="" />
<created>1755259950275</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1755259950275</updated>
调整路径
2025-08-15 22:24:41 +08:00
<workItem from="1755259951484" duration="5216000" />
<workItem from="1755265222367" duration="2238000" />
修复bug
2025-08-18 19:22:20 +08:00
<workItem from="1755494675056" duration="9621000" />
<workItem from="1755512435623" duration="2909000" />
合并代码。解决冲突
2025-08-15 20:14:59 +08:00
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
调整路径
2025-08-15 22:24:41 +08:00
<component name="com.intellij.coverage.CoverageDataManagerImpl">
修复bug
2025-08-18 19:22:20 +08:00
<SUITE FILE_PATH="coverage/iOSAI$Main.coverage" NAME="Main Coverage Results" MODIFIED="1755515386914" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
调整路径
2025-08-15 22:24:41 +08:00
</component>
合并代码。解决冲突
2025-08-15 20:14:59 +08:00
</project>
Reference in New Issue Copy Permalink