michael/flutter-unity-view-widget
michael
/
flutter-unity-view-widget
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rework onunitymessage for ios

This commit is contained in:
Kris Pypen 2019-10-17 23:12:13 +02:00
parent db637ce73d
commit ea71d3b2be
7 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
example/unity/DemoApp/Assets/Editor/XCodePostBuild.cs
View File

@ -155,6 +155,33 @@ public static class XcodePostBuild
inScope = false;
markerDetected = false;
// Modify inline GetAppController
EditCodeFile(path, line =>
{
inScope |= line.Contains("quitHandler)");
if (inScope && !markerDetected)
{
if (line.Trim() == "")
{
inScope = false;
markerDetected = true;
return new string[]
{
"@property (nonatomic, copy) void(^unityMessageHandler)(const char* message);",
};
}
return new string[] { line };
}
return new string[] { line };
});
inScope = false;
markerDetected = false;
// Add static GetAppController
EditCodeFile(path, line =>
{
@ -171,8 +198,6 @@ public static class XcodePostBuild
"",
"// Added by " + TouchedMarker,
"+ (UnityAppController*)GetAppController;",
"+ (void)addUnityEventListenerInternal:(id<UnityEventListener>)listener;",
"+ (void)removeUnityEventListenerInternal:(id<UnityEventListener>)listener;",
""
};
}
@ -206,17 +231,7 @@ public static class XcodePostBuild
" return [UnityAppController GetAppController];",
"}",
"",
"// Added by " + TouchedMarker,
"static inline void addUnityEventListenerInternal(id<UnityEventListener> listener)",
"{",
" [UnityAppController addUnityEventListenerInternal: listener];",
"}",
"",
"// Added by " + TouchedMarker,
"static inline void removeUnityEventListenerInternal(id<UnityEventListener> listener)",
"{",
" [UnityAppController removeUnityEventListenerInternal:listener];",
"}"
};
}
@ -257,25 +272,14 @@ public static class XcodePostBuild
"}",
"",
"// Added by " + TouchedMarker,
"static NSHashTable* mUnityEventListeners = [NSHashTable weakObjectsHashTable];",
"+ (void)addUnityEventListener2:(id<UnityEventListener>)listener",
"{",
" [mUnityEventListeners addObject: listener];",
"}",
"",
"// Added by " + TouchedMarker,
"+(void)removeUnityEventListener2:(id<UnityEventListener>)listener",
"{",
" [mUnityEventListeners removeObject: listener];",
"}",
line,
"// Added by " + TouchedMarker,
"extern \"C\" void onUnityMessage(const char* message)",
"{",
" for (id<UnityEventListener> listener in mUnityEventListeners) {",
" [listener onMessage:[NSString stringWithUTF8String:message]];",
" if (GetAppController().unityMessageHandler) {",
" GetAppController().unityMessageHandler(message);",
" }",
"}",
line,
};
}
@ -330,6 +334,33 @@ public static class XcodePostBuild
return new string[] { line };
});
inScope = false;
markerDetected = false;
// Modify inline GetAppController
EditCodeFile(path, line =>
{
inScope |= line.Contains("@synthesize quitHandler");
if (inScope && !markerDetected)
{
if (line.Trim() == "")
{
inScope = false;
markerDetected = true;
return new string[]
{
"@synthesize unityMessageHandler = _unityMessageHandler;",
};
}
return new string[] { line };
}
return new string[] { line };
});
}
/// <summary>

BIN
example/unity/DemoApp/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache
View File

Binary file not shown.

BIN
example/unity/DemoApp/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache
View File

Binary file not shown.

4
ios/Classes/FlutterUnityWidgetPlugin.h
View File

@ -6,11 +6,12 @@
//
#import <Flutter/Flutter.h>
#import <UnityUtils.h>
@interface FlutterUnityWidgetPlugin : NSObject<FlutterPlugin>
@end
@interface FUController : NSObject <FlutterPlatformView>
@interface FUController : NSObject <FlutterPlatformView, UnityEventListener>
- (instancetype)initWithFrame:(CGRect)frame
viewIdentifier:(int64_t)viewId
@ -18,6 +19,7 @@
registrar:(NSObject<FlutterPluginRegistrar> *)registrar;
- (UIView*)view;
- (void)onMessage:(NSString *)message;
@end
@interface FUViewFactory : NSObject <FlutterPlatformViewFactory>

9
ios/Classes/FlutterUnityWidgetPlugin.m
View File

@ -63,11 +63,14 @@
[_channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
[weakSelf onMethodCall:call result:result];
}];
}
return self;
}
- (void)onMessage:(NSString *)message {
[_channel invokeMethod:@"onUnityMessage" arguments:message];
}
- (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
if ([[call method] isEqualToString:@"postMessage"]) {
[self postMessage:call result:result];
@ -94,6 +97,10 @@
[UnityUtils createPlayer:^{
[_uView setUnityView: (UIView*)[GetAppController() unityView]];
}];
[GetAppController() setUnityMessageHandler: ^(const char* message)
{
[_channel invokeMethod:@"onUnityMessage" arguments:[NSString stringWithUTF8String:message]];
}];
}
return _uView;
}

3
ios/Classes/UnityUtils.h
View File

@ -23,6 +23,7 @@ extern "C" {
} // extern "C"
#endif
@protocol UnityEventListener <NSObject>
- (void)onMessage:(NSString *)message;
@end
@ -31,8 +32,6 @@ extern "C" {
+ (BOOL)isUnityReady;
+ (void)createPlayer:(void (^)(void))completed;
+ (void)addUnityEventListener:(id<UnityEventListener>)listener;
+ (void)removeUnityEventListener:(id<UnityEventListener>)listener;
@end

19
ios/Classes/UnityUtils.mm
View File

@ -153,26 +153,9 @@ static BOOL _isUnityReady = NO;
UnityAppController *controller = GetAppController();
[controller application:application didFinishLaunchingWithOptions:nil];
[controller applicationDidBecomeActive:application];
[UnityUtils listenAppState];
});
}
extern "C" void onUnityMessage(const char* message)
{
for (id<UnityEventListener> listener in mUnityEventListeners) {
[listener onMessage:[NSString stringWithUTF8String:message]];
}
}
+ (void)addUnityEventListener:(id<UnityEventListener>)listener
{
[mUnityEventListeners addObject:listener];
}
+ (void)removeUnityEventListener:(id<UnityEventListener>)listener
{
[mUnityEventListeners removeObject:listener];
}
@end