Skip to content

F
flutter_plugin
Commit 0fd698c5 authored by 林生雨's avatar 林生雨
Browse files
Options

commit

parent a67a1ed3
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 17 deletions
.idea/workspace.xml
View file @ 0fd698c5
...@@ -6,11 +6,8 @@ ...@@ -6,11 +6,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="5be6bbb5-7d6e-4540-a24f-d2b3bf78b3ba" name="Default Changelist" comment=""> <list default="true" id="5be6bbb5-7d6e-4540-a24f-d2b3bf78b3ba" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/gengmei_flutter_plugin/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/gengmei_flutter_plugin/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/gengmei_flutter_plugin/ios/Classes/GengmeiFlutterPlugin.m" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/gengmei_flutter_plugin/ios/Classes/GengmeiFlutterPlugin.m" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ios/Classes/GengmeiFlutterPlugin.m" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/GengmeiFlutterPlugin.m" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ios/Classes/GengmeiFlutterPlugin.m" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/GengmeiFlutterPlugin.m" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ios/Classes/Image/ResultManager.m" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Classes/Image/ResultManager.m" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.dart_tool/" /> <ignored path="$PROJECT_DIR$/.dart_tool/" />
<ignored path="$PROJECT_DIR$/.idea/" /> <ignored path="$PROJECT_DIR$/.idea/" />
...@@ -33,8 +30,8 @@ ...@@ -33,8 +30,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/example/lib/main.dart"> <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274"> <state relative-caret-position="423">
<caret line="148" column="35" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" /> <caret line="149" column="20" selection-start-line="149" selection-start-column="20" selection-end-line="149" selection-end-column="20" />
<folding> <folding>
<element signature="e#0#17#0" expanded="true" /> <element signature="e#0#17#0" expanded="true" />
</folding> </folding>
...@@ -306,12 +303,12 @@ ...@@ -306,12 +303,12 @@
<window_info id="Capture Tool" order="7" /> <window_info id="Capture Tool" order="7" />
<window_info id="Favorites" order="8" side_tool="true" /> <window_info id="Favorites" order="8" side_tool="true" />
<window_info anchor="bottom" id="Dart Analysis" order="0" weight="0.32963988" /> <window_info anchor="bottom" id="Dart Analysis" order="0" weight="0.32963988" />
<window_info active="true" anchor="bottom" id="Run" order="1" visible="true" weight="0.42222223" /> <window_info anchor="bottom" id="Run" order="1" weight="0.42222223" />
<window_info anchor="bottom" id="TODO" order="2" /> <window_info anchor="bottom" id="TODO" order="2" />
<window_info anchor="bottom" id="Android Profiler" order="3" show_stripe_button="false" /> <window_info anchor="bottom" id="Android Profiler" order="3" show_stripe_button="false" />
<window_info anchor="bottom" id="Logcat" order="4" weight="0.6425591" /> <window_info anchor="bottom" id="Logcat" order="4" weight="0.6425591" />
<window_info anchor="bottom" id="Debug" order="5" /> <window_info anchor="bottom" id="Debug" order="5" />
<window_info anchor="bottom" id="Terminal" order="6" weight="0.31666666" /> <window_info active="true" anchor="bottom" id="Terminal" order="6" visible="true" weight="0.31666666" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Flutter Performance" order="8" side_tool="true" /> <window_info anchor="bottom" id="Flutter Performance" order="8" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="9" /> <window_info anchor="bottom" id="Version Control" order="9" />
...@@ -571,8 +568,8 @@ ...@@ -571,8 +568,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/example/lib/main.dart"> <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274"> <state relative-caret-position="423">
<caret line="148" column="35" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" /> <caret line="149" column="20" selection-start-line="149" selection-start-column="20" selection-end-line="149" selection-end-column="20" />
<folding> <folding>
<element signature="e#0#17#0" expanded="true" /> <element signature="e#0#17#0" expanded="true" />
</folding> </folding>
......
ios/Classes/GengmeiFlutterPlugin.m
View file @ 0fd698c5
...@@ -331,11 +331,8 @@ FlutterEventSink _eventSink; ...@@ -331,11 +331,8 @@ FlutterEventSink _eventSink;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
self.finishScanImg=true; self.finishScanImg=true;
[[ResultManager sharedSingleton] resultSuccess:[NSNumber numberWithLong:resultId] :self.finalMap]; [[ResultManager sharedSingleton] resultSuccess:[NSNumber numberWithLong:resultId] :self.finalMap];
if(self.execdTask){ static dispatch_once_t onceToken;
return ; dispatch_once(&onceToken, ^{
}
self.execdTask=true;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
[self execRealImg]; [self execRealImg];
}); });
}); });
......
ios/Classes/Image/AlbumItem.m
View file @ 0fd698c5
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
-(void)setCollection:(PHAssetCollection *)collection { -(void)setCollection:(PHAssetCollection *)collection {
_collection = collection; _collection = collection;
if ([collection.localizedTitle isEqualToString:@"All Photos"]) { if ([collection.localizedTitle isEqualToString:@"All Photos"]||[collection.localizedTitle isEqualToString:@"所有照片"]) {
self.collectionTitle = @"IsGengmeiAlbumAllImages"; self.collectionTitle = @"IsGengmeiAlbumAllImages";
} else { } else {
self.collectionTitle = collection.localizedTitle; self.collectionTitle = collection.localizedTitle;
......
ios/Classes/Image/ResultManager.m
View file @ 0fd698c5
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
result(value); result(value);
} }
[self.map removeObjectForKey:key]; [self.map removeObjectForKey:key];
NSLog(@"%ld",[self.map count]);
} }
-(void)resultError:(NSNumber*)key :(NSString*)reason :(NSObject*)value{ -(void)resultError:(NSNumber*)key :(NSString*)reason :(NSObject*)value{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment