|
@@ -2,27 +2,11 @@
|
|
|
<project version="4">
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="cc871a7e-676b-4f6d-9e12-c09ccbaf84b8" name="Default Changelist" comment="">
|
|
<list default="true" id="cc871a7e-676b-4f6d-9e12-c09ccbaf84b8" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/ios/Assets/Images/dog.png" afterDir="false" />
|
|
|
|
|
- <change afterPath="$PROJECT_DIR$/ios/Assets/Images/i2.png" afterDir="false" />
|
|
|
|
|
- <change afterPath="$PROJECT_DIR$/ios/Classes/CustomAnnotation.h" afterDir="false" />
|
|
|
|
|
- <change afterPath="$PROJECT_DIR$/ios/Classes/CustomAnnotation.m" afterDir="false" />
|
|
|
|
|
- <change afterPath="$PROJECT_DIR$/ios/Classes/CustomCalloutView.h" afterDir="false" />
|
|
|
|
|
- <change afterPath="$PROJECT_DIR$/ios/Classes/CustomCalloutView.m" afterDir="false" />
|
|
|
|
|
- <change afterPath="$PROJECT_DIR$/ios/Classes/FlutterAmapView.h" afterDir="false" />
|
|
|
|
|
- <change afterPath="$PROJECT_DIR$/ios/Classes/FlutterAmapView.m" afterDir="false" />
|
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
|
|
|
<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$/amap_location.iml" beforeDir="false" afterPath="$PROJECT_DIR$/amap_location.iml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.pbxproj" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.pbxproj" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.pbxproj" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Runner.xcodeproj/project.pbxproj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/example/ios/Runner/Info.plist" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Runner/Info.plist" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/example/lib/map_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/map_util.dart" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/example/lib/map_view_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/map_view_page.dart" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/ios/Classes/AmapLocationPlugin.h" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/AmapLocationPlugin.h" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/ios/Classes/AmapLocationPlugin.m" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/AmapLocationPlugin.m" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/ios/amap_location.podspec" beforeDir="false" afterPath="$PROJECT_DIR$/ios/amap_location.podspec" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/amap_location.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/amap_location.dart" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
|
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
|
|
|
</list>
|
|
</list>
|
|
|
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -32,7 +16,6 @@
|
|
|
<option name="testRunner" value="GRADLE" />
|
|
<option name="testRunner" value="GRADLE" />
|
|
|
<option name="delegatedBuild" value="true" />
|
|
<option name="delegatedBuild" value="true" />
|
|
|
</component>
|
|
</component>
|
|
|
- <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_API_29" />
|
|
|
|
|
<component name="FileTemplateManagerImpl">
|
|
<component name="FileTemplateManagerImpl">
|
|
|
<option name="RECENT_TEMPLATES">
|
|
<option name="RECENT_TEMPLATES">
|
|
|
<list>
|
|
<list>
|
|
@@ -42,9 +25,14 @@
|
|
|
</component>
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
|
+ <option name="UPDATE_TYPE" value="MERGE" />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="ProjectId" id="1ZhcnqKcqhWNCVvGpQtRupLz0mB" />
|
|
<component name="ProjectId" id="1ZhcnqKcqhWNCVvGpQtRupLz0mB" />
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
|
|
+ <component name="ProjectViewState">
|
|
|
|
|
+ <option name="showExcludedFiles" value="true" />
|
|
|
|
|
+ <option name="showLibraryContents" value="true" />
|
|
|
|
|
+ </component>
|
|
|
<component name="PropertiesComponent">
|
|
<component name="PropertiesComponent">
|
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
|
<property name="dart.analysis.tool.window.force.activate" value="false" />
|
|
<property name="dart.analysis.tool.window.force.activate" value="false" />
|
|
@@ -56,23 +44,12 @@
|
|
|
<component name="RecentsManager">
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
<recent name="$PROJECT_DIR$/ios/Assets/Images" />
|
|
<recent name="$PROJECT_DIR$/ios/Assets/Images" />
|
|
|
|
|
+ <recent name="$PROJECT_DIR$/android/src/main/res/drawable" />
|
|
|
</key>
|
|
</key>
|
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
|
<recent name="$PROJECT_DIR$/ios" />
|
|
<recent name="$PROJECT_DIR$/ios" />
|
|
|
</key>
|
|
</key>
|
|
|
</component>
|
|
</component>
|
|
|
- <component name="RunDashboard">
|
|
|
|
|
- <option name="ruleStates">
|
|
|
|
|
- <list>
|
|
|
|
|
- <RuleState>
|
|
|
|
|
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
|
|
|
- </RuleState>
|
|
|
|
|
- <RuleState>
|
|
|
|
|
- <option name="name" value="StatusDashboardGroupingRule" />
|
|
|
|
|
- </RuleState>
|
|
|
|
|
- </list>
|
|
|
|
|
- </option>
|
|
|
|
|
- </component>
|
|
|
|
|
<component name="SvnConfiguration">
|
|
<component name="SvnConfiguration">
|
|
|
<configuration />
|
|
<configuration />
|
|
|
</component>
|
|
</component>
|
|
@@ -119,7 +96,35 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1585372093906</updated>
|
|
<updated>1585372093906</updated>
|
|
|
</task>
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="6" />
|
|
|
|
|
|
|
+ <task id="LOCAL-00006" summary="添加IOS地图和导航">
|
|
|
|
|
+ <created>1587634817150</created>
|
|
|
|
|
+ <option name="number" value="00006" />
|
|
|
|
|
+ <option name="presentableId" value="LOCAL-00006" />
|
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
|
+ <updated>1587634817150</updated>
|
|
|
|
|
+ </task>
|
|
|
|
|
+ <task id="LOCAL-00007" summary="更改我的定位图片">
|
|
|
|
|
+ <created>1592991552003</created>
|
|
|
|
|
+ <option name="number" value="00007" />
|
|
|
|
|
+ <option name="presentableId" value="LOCAL-00007" />
|
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
|
+ <updated>1592991552003</updated>
|
|
|
|
|
+ </task>
|
|
|
|
|
+ <task id="LOCAL-00008" summary="更改我的定位图片">
|
|
|
|
|
+ <created>1592992013729</created>
|
|
|
|
|
+ <option name="number" value="00008" />
|
|
|
|
|
+ <option name="presentableId" value="LOCAL-00008" />
|
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
|
+ <updated>1592992013729</updated>
|
|
|
|
|
+ </task>
|
|
|
|
|
+ <task id="LOCAL-00009" summary="修复打包错误的问题">
|
|
|
|
|
+ <created>1597654542330</created>
|
|
|
|
|
+ <option name="number" value="00009" />
|
|
|
|
|
+ <option name="presentableId" value="LOCAL-00009" />
|
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
|
+ <updated>1597654542330</updated>
|
|
|
|
|
+ </task>
|
|
|
|
|
+ <option name="localTasksCounter" value="10" />
|
|
|
<servers />
|
|
<servers />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="Vcs.Log.History.Properties">
|
|
<component name="Vcs.Log.History.Properties">
|
|
@@ -149,14 +154,58 @@
|
|
|
<MESSAGE value="更改IOS依赖包问题" />
|
|
<MESSAGE value="更改IOS依赖包问题" />
|
|
|
<MESSAGE value="解决IOS定位问题" />
|
|
<MESSAGE value="解决IOS定位问题" />
|
|
|
<MESSAGE value="去除无用的输出" />
|
|
<MESSAGE value="去除无用的输出" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="去除无用的输出" />
|
|
|
|
|
|
|
+ <MESSAGE value="添加IOS地图和导航" />
|
|
|
|
|
+ <MESSAGE value="更改我的定位图片" />
|
|
|
|
|
+ <MESSAGE value="修复打包错误的问题" />
|
|
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="修复打包错误的问题" />
|
|
|
|
|
+ </component>
|
|
|
|
|
+ <component name="WindowStateProjectService">
|
|
|
|
|
+ <state x="569" y="118" key="CommitChangelistDialog2" timestamp="1597654542131">
|
|
|
|
|
+ <screen x="0" y="23" width="1920" height="985" />
|
|
|
|
|
+ </state>
|
|
|
|
|
+ <state x="569" y="118" key="CommitChangelistDialog2/0.23.1920.985@0.23.1920.985" timestamp="1597654542131" />
|
|
|
|
|
+ <state x="569" y="118" key="CommitChangelistDialog2/0.23.1920.988@0.23.1920.988" timestamp="1592992013571" />
|
|
|
|
|
+ <state width="939" height="396" key="GridCell.Tab.0.bottom" timestamp="1600065510793">
|
|
|
|
|
+ <screen x="0" y="23" width="1920" height="985" />
|
|
|
|
|
+ </state>
|
|
|
|
|
+ <state width="939" height="396" key="GridCell.Tab.0.bottom/0.23.1920.985@0.23.1920.985" timestamp="1600065510793" />
|
|
|
|
|
+ <state width="939" height="398" key="GridCell.Tab.0.bottom/0.23.1920.988@0.23.1920.988" timestamp="1592991557080" />
|
|
|
|
|
+ <state width="939" height="396" key="GridCell.Tab.0.center" timestamp="1600065510792">
|
|
|
|
|
+ <screen x="0" y="23" width="1920" height="985" />
|
|
|
|
|
+ </state>
|
|
|
|
|
+ <state width="939" height="396" key="GridCell.Tab.0.center/0.23.1920.985@0.23.1920.985" timestamp="1600065510792" />
|
|
|
|
|
+ <state width="939" height="398" key="GridCell.Tab.0.center/0.23.1920.988@0.23.1920.988" timestamp="1592991557079" />
|
|
|
|
|
+ <state width="939" height="396" key="GridCell.Tab.0.left" timestamp="1600065510792">
|
|
|
|
|
+ <screen x="0" y="23" width="1920" height="985" />
|
|
|
|
|
+ </state>
|
|
|
|
|
+ <state width="939" height="396" key="GridCell.Tab.0.left/0.23.1920.985@0.23.1920.985" timestamp="1600065510792" />
|
|
|
|
|
+ <state width="939" height="398" key="GridCell.Tab.0.left/0.23.1920.988@0.23.1920.988" timestamp="1592991557078" />
|
|
|
|
|
+ <state width="939" height="396" key="GridCell.Tab.0.right" timestamp="1600065510792">
|
|
|
|
|
+ <screen x="0" y="23" width="1920" height="985" />
|
|
|
|
|
+ </state>
|
|
|
|
|
+ <state width="939" height="396" key="GridCell.Tab.0.right/0.23.1920.985@0.23.1920.985" timestamp="1600065510792" />
|
|
|
|
|
+ <state width="939" height="398" key="GridCell.Tab.0.right/0.23.1920.988@0.23.1920.988" timestamp="1592991557079" />
|
|
|
|
|
+ <state x="699" y="235" key="RollbackChangesDialog" timestamp="1592991084836">
|
|
|
|
|
+ <screen x="0" y="23" width="1920" height="988" />
|
|
|
|
|
+ </state>
|
|
|
|
|
+ <state x="699" y="235" key="RollbackChangesDialog/0.23.1920.988@0.23.1920.988" timestamp="1592991084836" />
|
|
|
|
|
+ <state x="560" y="256" key="Vcs.Push.Dialog.v2" timestamp="1597654543552">
|
|
|
|
|
+ <screen x="0" y="23" width="1920" height="985" />
|
|
|
|
|
+ </state>
|
|
|
|
|
+ <state x="560" y="256" key="Vcs.Push.Dialog.v2/0.23.1920.985@0.23.1920.985" timestamp="1597654543552" />
|
|
|
|
|
+ <state x="560" y="257" key="Vcs.Push.Dialog.v2/0.23.1920.988@0.23.1920.988" timestamp="1592992014935" />
|
|
|
|
|
+ <state x="740" y="440" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1600050241237">
|
|
|
|
|
+ <screen x="0" y="23" width="1920" height="985" />
|
|
|
|
|
+ </state>
|
|
|
|
|
+ <state x="740" y="440" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.23.1920.985@0.23.1920.985" timestamp="1600050241237" />
|
|
|
|
|
+ <state x="740" y="441" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.23.1920.988@0.23.1920.988" timestamp="1592991503877" />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
<component name="XDebuggerManager">
|
|
|
<breakpoint-manager>
|
|
<breakpoint-manager>
|
|
|
<breakpoints>
|
|
<breakpoints>
|
|
|
<line-breakpoint enabled="true" type="Dart">
|
|
<line-breakpoint enabled="true" type="Dart">
|
|
|
<url>file://$PROJECT_DIR$/lib/amap_location.dart</url>
|
|
<url>file://$PROJECT_DIR$/lib/amap_location.dart</url>
|
|
|
- <line>45</line>
|
|
|
|
|
|
|
+ <line>46</line>
|
|
|
<option name="timeStamp" value="5" />
|
|
<option name="timeStamp" value="5" />
|
|
|
</line-breakpoint>
|
|
</line-breakpoint>
|
|
|
</breakpoints>
|
|
</breakpoints>
|