Skip to content

Commit 7dc2470

Browse files
juicycleffjuicycleff
committed
Upgraded Android Native codebase
1 parent 1470ee7 commit 7dc2470

27 files changed

+581
-177
lines changed

‎android/.idea/gradle.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ rootProject.allprojects {
2121
// BUILD_ADD_UNITY_LIBS
2222

2323
// FOR DEV ONLY
24-
flatDir {
24+
/* flatDir {
2525
dirs "libs"
26-
}
26+
}*/
2727
}
2828
}
2929

‎android/src/main/java/com/xraph/plugins/flutterunitywidget/ExtendedUnityActivity.java‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,51 +25,20 @@ protected void onCreate(Bundle savedInstanceState) {
2525
super.onCreate(savedInstanceState);
2626
instance = this;
2727
this.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
28-
addControlsToUnityFrame();
2928
Intent intent = getIntent();
3029
handleIntent(intent);
3130
}
3231

33-
public void addControlsToUnityFrame() {
34-
Display display = getWindowManager().getDefaultDisplay();
35-
Point point = new Point();
36-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
37-
display.getSize(point);
38-
}
39-
int size = (point.x / 2);
40-
41-
Button backButton = new Button(this);
42-
backButton.setBackgroundColor(Color.BLUE);
43-
backButton.setText("GO BACK");
44-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
45-
backButton.setX(10f);
46-
backButton.setY(25f);
47-
}
48-
backButton.setOnClickListener(new View.OnClickListener() {
49-
public void onClick(View v) {
50-
showMainActivity();
51-
}
52-
});
53-
54-
55-
Button unloadButton = new Button(this);
56-
unloadButton.setBackgroundColor(Color.BLUE);
57-
unloadButton.setText("UNLOAD");
58-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
59-
backButton.setX(25f);
60-
backButton.setY(300f);
61-
}
62-
unloadButton.setOnClickListener(new View.OnClickListener() {
63-
public void onClick(View v) {
64-
mUnityPlayer.unload();
65-
}
66-
});
32+
protected void unloadPlayer() {
33+
mUnityPlayer.unload();
34+
showMainActivity();
35+
}
6736

68-
mUnityPlayer.addView(backButton, size, size / 4);
69-
mUnityPlayer.addView(unloadButton, size, size / 4);
37+
protected void quitPlayer() {
38+
mUnityPlayer.quit();
7039
}
7140

72-
private void showMainActivity() {
41+
protected void showMainActivity() {
7342
Intent intent = new Intent(this, mMainActivityClass);
7443
intent.putExtra("showMain",true);
7544
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {

‎android/src/main/java/com/xraph/plugins/flutterunitywidget/FlutterUnityViewController.java‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ final class FlutterUnityViewController
5050
private final Context context;
5151
private UnityView unityView;
5252
private MethodChannel channel;
53+
private MethodChannel.Result unityReadyResult;
5354
private int channelId;
5455
private ThreadUtils mThreadUtils;
5556
private final AtomicInteger activityState;
@@ -101,31 +102,27 @@ void init() {
101102
switch (activityState.get()) {
102103
case STOPPED:
103104
if (unityView != null) {
104-
// this.createPlayer(true);
105105
unityView.onStop();
106106
}
107107
break;
108108
case PAUSED:
109109
if (unityView != null) {
110-
// this.createPlayer(true);
111110
unityView.onPause();
112111
}
113112
break;
114113
case RESUMED:
115114
if (unityView != null) {
116-
// this.createPlayer(true);
117115
unityView.onResume();
118116
}
119117
break;
120118
case STARTED:
121119
if (unityView != null) {
122-
// this.createPlayer(true);
123120
unityView.onStart();
124121
}
125122
break;
126123
case CREATED:
127124
if (unityView == null) {
128-
// this.createPlayer(true);
125+
// TODO: handle created lifecycle
129126
}
130127
break;
131128
case DESTROYED:
@@ -146,27 +143,28 @@ void init() {
146143
@Override
147144
public void onMethodCall(MethodCall methodCall, final MethodChannel.Result result) {
148145
switch (methodCall.method) {
149-
case "createUnity":
150-
UnityUtils.createPlayer(this.activity, mThreadUtils,this, true, new OnCreateUnityViewCallback() {
151-
@Override
152-
public void onReady() {
153-
unityView.setUnityPlayer(UnityUtils.getPlayer());
154-
result.success(true);
155-
}
156-
});
146+
case "unity#waitForUnity":
147+
if (unityView != null) {
148+
result.success(null);
149+
return;
150+
}
151+
unityReadyResult = result;
152+
break;
153+
case "unity#createUnityPlayer":
154+
this.createPlayer(unityView, true);
157155

158156
break;
159-
case "isReady":
157+
case "unity#isReady":
160158
result.success(unityView.isUnityReady());
161159
break;
162-
case "isLoaded":
160+
case "unity#isLoaded":
163161
result.success(unityView.isUnityLoaded());
164-
case "isPaused":
162+
case "unity#isPaused":
165163
result.success(unityView.isUnityPaused());
166-
case "isInBackground":
164+
case "unity#inBackground":
167165
result.success(unityView.isUnityInBackground());
168166
break;
169-
case "postMessage":
167+
case "unity#postMessage":
170168
String gameObject, methodName, message;
171169
gameObject = methodCall.argument("gameObject");
172170
methodName = methodCall.argument("methodName");
@@ -175,35 +173,35 @@ public void onReady() {
175173
UnityUtils.postMessage(gameObject, methodName, message);
176174
result.success(true);
177175
break;
178-
case "pause":
176+
case "unity#pausePlayer":
179177
UnityUtils.pause();
180178
result.success(true);
181179
break;
182-
case "openNative":
180+
case "unity#openInNativeProcess":
183181
openNativeUnity();
184182
result.success(true);
185183
break;
186-
case "resume":
184+
case "unity#resumePlayer":
187185
UnityUtils.resume();
188186
result.success(true);
189187
break;
190-
case "unload":
188+
case "unity#unloadPlayer":
191189
if (unityView != null && unityView.getUnityPlayer() != null) {
192190
unityView.unload();
193191
}
194192
UnityUtils.unload();
195193
result.success(true);
196194
break;
197-
case "dispose":
195+
case "unity#dispose":
198196
// TODO: Handle disposing player resource efficiently
199197
// UnityUtils.unload();
200198
result.success(true);
201199
break;
202-
case "silentQuitPlayer":
200+
case "unity#silentQuitPlayer":
203201
UnityUtils.quitPlayer();
204202
result.success(true);
205203
break;
206-
case "quitPlayer":
204+
case "unity#quitPlayer":
207205
if (UnityUtils.getPlayer() != null)
208206
UnityUtils.getPlayer().destroy();
209207
result.success(true);
@@ -214,18 +212,20 @@ public void onReady() {
214212

215213
}
216214

217-
218-
private void createPlayer(boolean reInitialize) {
215+
private void createPlayer(final UnityView view, boolean reInitialize) {
219216
UnityUtils.createPlayer(this.activity, mThreadUtils,this, reInitialize, new OnCreateUnityViewCallback() {
220217
@Override
221218
public void onReady() {
222-
unityView.setUnityPlayer(UnityUtils.getPlayer());
219+
view.setUnityPlayer(UnityUtils.getPlayer());
220+
if (unityReadyResult != null) {
221+
unityReadyResult.success(null);
222+
unityReadyResult = null;
223+
}
223224
}
224225
});
225226
}
226227

227228
private void openNativeUnity() {
228-
// isUnityLoaded = true;
229229
Intent intent = new Intent(activity, ExtendedUnityActivity.class);
230230
intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
231231
intent.putExtra("ar", options.isArEnable());
@@ -284,20 +284,8 @@ private UnityView getUnityView() {
284284

285285
if (UnityUtils.getPlayer() != null && UnityUtils.isUnityLoaded()) {
286286
view.setUnityPlayer(UnityUtils.getPlayer());
287-
} else if (UnityUtils.getPlayer() != null) {
288-
UnityUtils.createPlayer(this.activity, mThreadUtils,this, false, new OnCreateUnityViewCallback() {
289-
@Override
290-
public void onReady() {
291-
view.setUnityPlayer(UnityUtils.getPlayer());
292-
}
293-
});
294287
} else {
295-
UnityUtils.createPlayer(this.activity, mThreadUtils, this, false, new OnCreateUnityViewCallback() {
296-
@Override
297-
public void onReady() {
298-
view.setUnityPlayer(UnityUtils.getPlayer());
299-
}
300-
});
288+
this.createPlayer(view, false);
301289
}
302290
return view;
303291
}
@@ -306,7 +294,7 @@ public void onReady() {
306294
public void onMessage(final String message) {
307295
activity.runOnUiThread(new Runnable() {
308296
public void run() {
309-
getChannel().invokeMethod("onUnityMessage", message);
297+
getChannel().invokeMethod("events#onUnityMessage", message);
310298
}
311299
});
312300
}
@@ -320,12 +308,11 @@ public void run() {
320308
payload.put("buildIndex", buildIndex);
321309
payload.put("isLoaded", isLoaded);
322310
payload.put("isValid", isValid);
323-
getChannel().invokeMethod("onUnitySceneLoaded", payload);
311+
getChannel().invokeMethod("events#onUnitySceneLoaded", payload);
324312
}
325313
});
326314
}
327315

328-
329316
private MethodChannel getChannel() {
330317
return channel;
331318
}
@@ -336,7 +323,7 @@ private MethodChannel getChannel() {
336323
public void onUnityPlayerUnloaded() {
337324
activity.runOnUiThread(new Runnable() {
338325
public void run() {
339-
getChannel().invokeMethod("onUnityUnloaded", true);
326+
getChannel().invokeMethod("events#onUnityUnloaded", true);
340327
}
341328
});
342329
}
@@ -403,8 +390,9 @@ public void onCreate(@NonNull LifecycleOwner owner) {
403390
if (disposed) {
404391
return;
405392
}
393+
406394
if (unityView != null) {
407-
// this.createPlayer(true);
395+
// TODO: handle onCreate
408396
}
409397
}
410398

‎android/src/main/java/com/xraph/plugins/flutterunitywidget/UnityView.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ public void postMessage(String gameObject, String methodName, String message) {
129129
UnityPlayer.UnitySendMessage(gameObject, methodName, message);
130130
}
131131

132-
133132
public void quitPlayer() {
134133
try {
135134
if (unityPlayer != null) {
@@ -321,9 +320,6 @@ protected final void createDelegate(OnDelegateCreatedListener<UnityView.UnityVie
321320
if (this.delegateCreatedListener != null && this.getDelegate() == null) {
322321
try {
323322
IUnityViewDelegate viewDelegate = null;
324-
// if ((var3 = zzbz.zza(var2.zzbk).zza(ObjectWrapper.wrap(var2.zzbk), var2.zzbl)) == null) {
325-
// return;
326-
// }
327323

328324
deferredUnityView.delegateCreatedListener.onDelegateCreated(new UnityView.UnityViewDelegate(deferredUnityView.viewGroup, viewDelegate));
329325

‎example/.flutter-plugins-dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_unity_widget","path":"/Users/rex/work/private/mobile/flutter-unity-view-widget/","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"/Users/rex/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.8/","dependencies":[]},{"name":"flutter_unity_widget","path":"/Users/rex/work/private/mobile/flutter-unity-view-widget/","dependencies":["flutter_plugin_android_lifecycle"]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_unity_widget","dependencies":["flutter_plugin_android_lifecycle"]}],"date_created":"2020-11-15 18:09:18.120116","version":"1.21.0-9.2.pre"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_unity_widget","path":"/Users/rex/work/private/mobile/flutter-unity-view-widget/","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"/Users/rex/development/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.8/","dependencies":[]},{"name":"flutter_unity_widget","path":"/Users/rex/work/private/mobile/flutter-unity-view-widget/","dependencies":["flutter_plugin_android_lifecycle"]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_unity_widget","dependencies":["flutter_plugin_android_lifecycle"]}],"date_created":"2020-11-17 20:48:32.299322","version":"1.22.4"}

‎example/android/app/build.gradle‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,24 @@ flutter {
5353
source '../..'
5454
}
5555

56+
57+
58+
59+
60+
61+
5662
dependencies {
5763
implementation project(':unityLibrary')
64+
65+
implementation project(':unityLibrary')
66+
67+
implementation project(':unityLibrary')
68+
69+
implementation project(':unityLibrary')
70+
71+
implementation project(':unityLibrary')
72+
73+
implementation project(':unityLibrary')
74+
75+
implementation project(':unityLibrary')
5876
}

‎example/lib/screens/api_screen.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class _ApiScreenState extends State<ApiScreen> {
4040
Expanded(
4141
child: Container(
4242
child: UnityWidget(
43-
onUnityViewCreated: onUnityCreated,
43+
onUnityCreated: onUnityCreated,
4444
isARScene: arguments.enableAR,
4545
onUnityMessage: onUnityMessage,
4646
onUnitySceneLoaded: onUnitySceneLoaded,
@@ -76,13 +76,13 @@ class _ApiScreenState extends State<ApiScreen> {
7676
children: [
7777
MaterialButton(
7878
onPressed: () {
79-
_unityWidgetController.quitPlayer();
79+
_unityWidgetController.quit();
8080
},
8181
child: Text("Quit"),
8282
),
8383
MaterialButton(
8484
onPressed: () {
85-
_unityWidgetController.createUnity();
85+
_unityWidgetController.create();
8686
},
8787
child: Text("Create"),
8888
),
@@ -104,8 +104,8 @@ class _ApiScreenState extends State<ApiScreen> {
104104
mainAxisAlignment: MainAxisAlignment.spaceBetween,
105105
children: [
106106
MaterialButton(
107-
onPressed: () {
108-
_unityWidgetController.openNative();
107+
onPressed: () async {
108+
await _unityWidgetController.openInNativeProcess();
109109
},
110110
child: Text("Open Native"),
111111
),
@@ -117,7 +117,7 @@ class _ApiScreenState extends State<ApiScreen> {
117117
),
118118
MaterialButton(
119119
onPressed: () {
120-
_unityWidgetController.silentQuitPlayer();
120+
_unityWidgetController.quit(silent: true);
121121
},
122122
child: Text("Silent Quit"),
123123
),
@@ -141,7 +141,7 @@ class _ApiScreenState extends State<ApiScreen> {
141141
);
142142
}
143143

144-
void onUnityMessage(controller, message) {
144+
void onUnityMessage(message) {
145145
print('Received message from unity: ${message.toString()}');
146146
}
147147

0 commit comments

Comments
 (0)