Release 3.0.1

Author: Unity Ads Travis

.editorconfig

@@ -0,0 +1,14 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=false
+indent_style=space
+indent_size=4
+
+[*.java]
+indent_style=tab
+tab_width=4
+
+[{*.yml,*.yaml}]
+indent_style=space
+indent_size=2

Jenkinsfile

@@ -0,0 +1,6 @@
+@Library('applifier-shared-libs@master') _
+
+Script {
+    extraSteps = ['scripts/extra.groovy']
+    disable_registry = true
+}

Makefile

@@ -56,8 +56,8 @@ zip: release
 	rm unity-ads.aar
 
 use-local-webview:
-	sed -i '' 's/return "https:\/\/config.unityads.unity3d.com\/webview\/" + getWebViewBranch() + "\/" + flavor + "\/config.json";/return "new-ip";/' "lib/src/main/java/com/unity3d/ads/properties/SdkProperties.java"
-	sed -i '' 's/return ".*";/return "http:\/\/$(shell ifconfig |grep "inet" |grep -E -o "([0-9]{1,3}[\.]){3}[0-9]{1,3}" |grep -v -E "^0|^127" -m 1):8000\/build\/dev\/config.json";/' "lib/src/main/java/com/unity3d/ads/properties/SdkProperties.java"
+	sed -i '' 's/return "https:\/\/config.unityads.unity3d.com\/webview\/" + getWebViewBranch() + "\/" + flavor + "\/config.json";/return "new-ip";/' "lib/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"
+	sed -i '' 's/return ".*";/return "http:\/\/$(shell ifconfig |grep "inet" |grep -E -o "([0-9]{1,3}[\.]){3}[0-9]{1,3}" |grep -v -E "^0|^127" -m 1):8000\/build\/" + flavor + "\/config.json";/' "lib/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"
 
 use-public-webview:
-	sed -i '' 's/return ".*";/return "https:\/\/config.unityads.unity3d.com\/webview\/" + getWebViewBranch() + "\/" + flavor + "\/config.json";/' "lib/src/main/java/com/unity3d/ads/properties/SdkProperties.java"
+	sed -i '' 's/return ".*";/return "https:\/\/config.unityads.unity3d.com\/webview\/" + getWebViewBranch() + "\/" + flavor + "\/config.json";/' "lib/src/main/java/com/unity3d/services/core/properties/SdkProperties.java"

app/src/main/java/com/unity3d/ads/example/UnityAdsExample.java

@@ -29,6 +29,7 @@ public class UnityAdsExample extends Activity {
 
 	private String interstitialPlacementId;
 	private String incentivizedPlacementId;
+	private Button bannerButton;
 
 	private static int ordinal = 1;
 
@@ -93,6 +94,9 @@ public void onClick(View v) {
 			}
 		});
 
+		bannerButton = (Button) findViewById(R.id.unityads_example_banner_button);
+		disableButton(bannerButton);
+
 		final Button initializeButton = (Button) findViewById(R.id.unityads_example_initialize_button);
 		final EditText gameIdEdit = (EditText) findViewById(R.id.unityads_example_gameid_edit);
 		final CheckBox testModeCheckbox = (CheckBox) findViewById(R.id.unityads_example_testmode_checkbox);

app/src/main/java/com/unity3d/ads/example/UnityMonetizationExample.java

@@ -24,6 +24,7 @@
 import com.unity3d.services.UnityServices;
 import com.unity3d.services.banners.IUnityBannerListener;
 import com.unity3d.services.banners.UnityBanners;
+import com.unity3d.services.banners.view.BannerPosition;
 import com.unity3d.services.core.log.DeviceLog;
 import com.unity3d.services.core.properties.SdkProperties;
 import com.unity3d.services.core.webview.WebView;
@@ -155,11 +156,12 @@ public void onAdFinished(String placementId, UnityAds.FinishState withState) {
 		});
 
 		bannerButton = (Button) findViewById(R.id.unityads_example_banner_button);
-		enableButton(bannerButton);
+		disableButton(bannerButton);
 		bannerButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				if (bannerView == null) {
+					UnityBanners.setBannerPosition(BannerPosition.BOTTOM_CENTER);
 					UnityBanners.loadBanner(thisActivity, bannerPlacementId);
 				} else {
 					UnityBanners.destroy();
@@ -196,6 +198,8 @@ public void onClick(View v) {
 				SharedPreferences.Editor preferencesEdit = preferences.edit();
 				preferencesEdit.putString("gameId", gameId);
 				preferencesEdit.commit();
+
+				enableButton(bannerButton);
 			}
 		});
 
@@ -230,6 +234,8 @@ protected void onResume() {
 			else {
 				disableButton((Button) findViewById(R.id.unityads_example_incentivized_button));
 			}
+
+			enableButton(bannerButton);
 		}
 	}
 

lib/build.gradle

@@ -11,8 +11,18 @@ android {
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 26
-    versionCode = 3000
-    versionName = "3.0.0"
+    /*
+    Please ensure that the last two digits of version number does not exceed 50 unless
+    it is a China SDK. This is because adding 50 to the version number is a one-to-one
+    mapping between normal SDK and China SDK.
+
+    Example : version number 2350 corresponds to China version of 2300.
+
+    All SDK with version numbers with last two digits >= 50 will be treated
+    as China SDK for filtering in the backend.
+    */
+    versionCode = 3001
+    versionName = "3.0.1"
 
     setProperty("archivesBaseName", "unity-ads")
 
@@ -77,6 +87,7 @@ android.libraryVariants.all { variant ->
 		       linksOffline "http://developer.android.com/reference","${android.sdkDirectory}/docs/reference"
         }
         exclude '**/R.java'
+        exclude 'com/unity3d/services/ar/view/GLSurfaceView.java'
 		destinationDir = file("../javadoc/")
     }
 }

lib/src/main/java/com/unity3d/services/ads/api/Placement.java

@@ -18,4 +18,10 @@ public static void setPlacementState(String placement, String placementState, We
 
 		callback.invoke();
 	}
+
+	@WebViewExposed
+	public static void setDefaultBannerPlacement(String placement, WebViewCallback callback) {
+		com.unity3d.services.ads.placement.Placement.setDefaultBannerPlacement(placement);
+		callback.invoke();
+	}
 }

lib/src/main/java/com/unity3d/services/ar/api/AR.java

@@ -135,6 +135,33 @@ public static void advanceFrame(WebViewCallback callback) {
 		}
 	}
 
+	@WebViewExposed
+	public static void swapBuffers(WebViewCallback callback) {
+		AdUnitActivity activity = AdUnit.getAdUnitActivity();
+		if (activity != null && AR.getARView() != null) {
+			AR.getARView().swapBuffers();
+			callback.invoke();
+		} else {
+			callback.error(ARError.ARVIEW_NULL);
+		}
+	}
+
+	@WebViewExposed
+	public static void setViewRenderMode(Integer mode, WebViewCallback callback) {
+		final AdUnitActivity activity = AdUnit.getAdUnitActivity();
+		if (activity != null && AR.getARView() != null) {
+			try {
+				AR.getARView().setRenderMode(mode);
+			} catch (IllegalArgumentException e) {
+				callback.error(ARError.INVALID_VALUE);
+				return;
+			}
+			callback.invoke();
+		} else {
+			callback.error(ARError.ARVIEW_NULL);
+		}
+	}
+
 	// Android doesn't support video format selection at the moment and it's not possible to get the
 	// image size before session starts. This is here for API compatibility with iOS.
 	@WebViewExposed

lib/src/main/java/com/unity3d/services/ar/view/ARView.java

@@ -3,7 +3,6 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
 import android.os.Build;
 import android.util.SparseArray;
 
@@ -79,7 +78,8 @@ public ARView(Context context) {
 		setEGLContextClientVersion(2);
 		setEGLConfigChooser(8, 8, 8, 8, 16, 0); // Alpha used for plane blending.
 		setRenderer(this);
-		setRenderMode(GLSurfaceView.RENDERMODE_CONTINUOUSLY);
+		setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+		setPreserveEGLContextOnPause(true);
 
 		_displayRotationHelper = new DisplayRotationHelper(context);
 	}
@@ -144,8 +144,6 @@ public void onSurfaceChanged(GL10 gl, int width, int height) {
 
 	@Override
 	public void onDrawFrame(GL10 gl) {
-		GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
-
 		if (_shouldSendResize) {
 			// Fix for Samsung devices (S7-S9, manually send AR_WINDOW_RESIZED)
 			WebViewApp webViewApp = WebViewApp.getCurrentApp();
@@ -176,22 +174,12 @@ public void onDrawFrame(GL10 gl) {
 				return;
 			}
 
-			if (!_showCameraFrame) {
-				return;
-			}
-			_backgroundRenderer.draw(frame);
-
 			long currentTime = System.currentTimeMillis();
 			if (_timeOfLastDrawnCameraFrame == 0) {
 				_timeOfLastDrawnCameraFrame = currentTime;
 			}
-			long timeSinceLastDrawnCameraFrame = currentTime - _timeOfLastDrawnCameraFrame;
-			if (timeSinceLastDrawnCameraFrame < FRAME_UPDATE_TIMEOUT && !_drawNextCameraFrame) {
-				return;
-			}
 
 			_timeOfLastDrawnCameraFrame = currentTime;
-			_drawNextCameraFrame = false;
 
 			camera.getProjectionMatrix(_projectionMatrixArray, 0, _arNear, _arFar);
 			camera.getViewMatrix(_viewMatrixArray, 0);
@@ -234,6 +222,13 @@ public void onDrawFrame(GL10 gl) {
 			updatePlanes(updatedTrackables);
 
 			DeviceLog.debug(frame.toString());
+
+			if (!_showCameraFrame) {
+				return;
+			}
+
+			GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+			_backgroundRenderer.draw(frame);
 		}
 	}
 
@@ -325,6 +320,13 @@ public void restartSession(JSONObject properties) throws JSONException {
 		_sessionRunning = true;
 
 		_displayRotationHelper.onResume();
+
+		postDelayed(new Runnable() {
+			@Override
+			public void run() {
+				requestRender();
+			}
+		}, 200);
 	}
 
 	public void pauseSession() {
@@ -334,7 +336,7 @@ public void pauseSession() {
 	}
 
 	public void setDrawNextCameraFrame() {
-		_drawNextCameraFrame = true;
+		requestRender();
 	}
 
 	public boolean getShowCameraFrame() {