improve SoundService mute

improve PythonCallbackProvider ref-in Scriptable remove Interface.h add MixerBoolean ref-in AmplifierService update android Firebase 33.7.0 wip plugin LayoutEditorPlugin
irov · Jan 3, 2025 · cc8f8f5 · cc8f8f5
1 parent b3b6d78
commit cc8f8f5
Show file tree

Hide file tree

Showing 197 changed files with 1,793 additions and 1,165 deletions.
diff --git a/cmake/Win32/CMakeLists.txt b/cmake/Win32/CMakeLists.txt
@@ -47,6 +47,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_UIFRAMEWORK ON OFF "MENGINE_PLUGIN_UIFRAMEWORK")
 ADD_PLUGIN(MENGINE_PLUGIN_DEVELOPMENTCONVERTER ON ON "MENGINE_PLUGIN_DEVELOPMENTCONVERTER")
 ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGRENDER ON OFF "MENGINE_PLUGIN_NODEDEBUGRENDER")
 ADD_PLUGIN(MENGINE_PLUGIN_DEBUGPANEL ON OFF "MENGINE_PLUGIN_DEBUGPANEL")
+ADD_PLUGIN(MENGINE_PLUGIN_LAYOUTEDITOR ON OFF "MENGINE_PLUGIN_LAYOUTEDITOR")
 ADD_PLUGIN(MENGINE_PLUGIN_TEXTVALIDATE ON OFF "MENGINE_PLUGIN_TEXTVALIDATE")
 ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEVALIDATE ON OFF "MENGINE_PLUGIN_RESOURCEVALIDATE")
 ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREFETCHER")

diff --git a/gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineApplication.java b/gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineApplication.java
@@ -1034,11 +1034,31 @@ public void onCreate() {
         String engine_gitsha1 = this.getEngineGITSHA1();
         this.setState("engine.gitsha1", engine_gitsha1);
 
-        String engine_version = this.getEngineVersion();
-        this.setState("engine.version", engine_version);
+        this.setState("application.init", "services_version");
 
-        String engine_builddate = this.getBuildDate();
-        this.setState("engine.build_date", engine_builddate);
+        Map<String, String> pluginVersions = new HashMap<>();
+
+        for (MengineListenerApplication l : applicationListeners) {
+            String version = l.onAppVersion(this);
+
+            if (version == null) {
+                continue;
+            }
+
+            String serviceName = l.getServiceName();
+
+            pluginVersions.put(serviceName, version);
+        }
+
+        for (Map.Entry<String, String> entry: pluginVersions.entrySet()) {
+            String name = entry.getKey();
+            String version = entry.getValue();
+
+            MengineLog.logMessage(TAG, "plugin: %s version: %s"
+                , name
+                , version
+            );
+        }
 
         this.setState("application.init", "services_prepare");
 
@@ -1048,7 +1068,7 @@ public void onCreate() {
                     , l.getServiceName()
                 );
 
-                l.onAppPrepare(this);
+                l.onAppPrepare(this, pluginVersions);
             } catch (final MengineServiceInvalidInitializeException e) {
                 MengineAnalytics.buildEvent("mng_app_create_failed")
                     .addParameterException("exception", e)
@@ -1121,7 +1141,7 @@ public void onCreate() {
 
             String name = p.getServiceName();
 
-            MengineNative.AndroidNativePython_addPlugin(name, p);
+            MengineNative.AndroidNativePython_addPlugin("Mengine" + name, p);
         }
 
         this.setState("application.init", "run_main");
@@ -1159,7 +1179,7 @@ public void onTerminate() {
 
             String name = p.getServiceName();
 
-            MengineNative.AndroidNativePython_removePlugin(name);
+            MengineNative.AndroidNativePython_removePlugin("Mengine" + name);
         }
 
         for (MengineService service : m_services) {

diff --git a/gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineListenerApplication.java b/gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineListenerApplication.java
@@ -5,12 +5,20 @@
 
 import androidx.annotation.NonNull;
 
+import java.util.Map;
+
 public interface MengineListenerApplication extends MengineServiceInterface {
     default void onAppInit(@NonNull MengineApplication application, boolean isMainProcess) throws MengineServiceInvalidInitializeException {
         //Empty
     }
+
+    default String onAppVersion(@NonNull MengineApplication application) {
+        //Empty
+
+        return null;
+    }
 
-    default void onAppPrepare(@NonNull MengineApplication application) throws MengineServiceInvalidInitializeException {
+    default void onAppPrepare(@NonNull MengineApplication application, @NonNull Map<String, String> pluginVersions) throws MengineServiceInvalidInitializeException {
         //Empty
     }
 

diff --git a/...le/libraries/Mengine/src/main/java/org/Mengine/Base/MengineMonitorConnectivityStatus.java b/...le/libraries/Mengine/src/main/java/org/Mengine/Base/MengineMonitorConnectivityStatus.java
@@ -9,7 +9,7 @@
 import androidx.annotation.NonNull;
 
 public class MengineMonitorConnectivityStatus extends MengineService implements MengineListenerApplication {
-    public static final String SERVICE_NAME = "MengineMConnStatus";
+    public static final String SERVICE_NAME = "MConnStatus";
 
     private ConnectivityManager.NetworkCallback m_networkCallback;
 

diff --git a/gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineMonitorPerformance.java b/gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineMonitorPerformance.java
@@ -6,7 +6,7 @@
 import java.util.Timer;
 
 public class MengineMonitorPerformance extends MengineService implements MengineListenerApplication, MengineListenerEngine, MengineListenerAnalytics {
-    public static final String SERVICE_NAME = "MengineMPerformance";
+    public static final String SERVICE_NAME = "MPerformance";
 
     private static final String TRACE_STARTUP = "mng_startup";
     private static final String TRACE_FPS = "mng_fps";

diff --git a/gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineService.java b/gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineService.java
@@ -98,51 +98,51 @@ public void setState(String name, Object value) {
     }
 
     public String logVerbose(String format, Object ... args) {
-        String m = MengineLog.logVerbose(m_serviceName, format, args);
+        String m = MengineLog.logVerbose("Mengine" + m_serviceName, format, args);
 
         return m;
     }
 
     public String logDebug(String format, Object ... args) {
-        String m = MengineLog.logDebug(m_serviceName, format, args);
+        String m = MengineLog.logDebug("Mengine" + m_serviceName, format, args);
 
         return m;
     }
 
     public String logInfo(String format, Object ... args) {
-        String m = MengineLog.logInfo(m_serviceName, format, args);
+        String m = MengineLog.logInfo("Mengine" + m_serviceName, format, args);
 
         return m;
     }
 
     public String logMessage(String format, Object ... args) {
-        String m = MengineLog.logMessage(m_serviceName, format, args);
+        String m = MengineLog.logMessage("Mengine" + m_serviceName, format, args);
 
         return m;
     }
 
     public String logMessageRelease(String format, Object ... args) {
-        String m = MengineLog.logMessageRelease(m_serviceName, format, args);
+        String m = MengineLog.logMessageRelease("Mengine" + m_serviceName, format, args);
 
         return m;
     }
 
     public String logWarning(String format, Object ... args) {
-        String m = MengineLog.logWarning(m_serviceName, format, args);
+        String m = MengineLog.logWarning("Mengine" + m_serviceName, format, args);
 
         return m;
     }
 
     public String logError(String format, Object ... args) {
-        String m = MengineLog.logError(m_serviceName, format, args);
+        String m = MengineLog.logError("Mengine" + m_serviceName, format, args);
 
         return m;
     }
 
     public void assertionError(String format, Object ... args) {
         String msg = String.format(Locale.US, format, args);
 
-        throw new AssertionError("[" + m_serviceName + "] " + msg);
+        throw new AssertionError("[" + "Mengine" + m_serviceName + "] " + msg);
     }
 
     public MengineAnalyticsEventBuilder buildEvent(@Size(min = 1L,max = 40L) String name) {
@@ -156,7 +156,7 @@ public void pythonCall(String method, Object ... args) {
             return;
         }
 
-        m_activity.pythonCall(m_serviceName, method, args);
+        m_activity.pythonCall("Mengine" + m_serviceName, method, args);
     }
 
     public void activateSemaphore(String name) {

diff --git a/gradle/plugins/AdMob/src/main/java/org/Mengine/Plugin/AdMob/MengineAdMobPlugin.java b/gradle/plugins/AdMob/src/main/java/org/Mengine/Plugin/AdMob/MengineAdMobPlugin.java
@@ -5,13 +5,19 @@
 import org.Mengine.Base.MengineApplication;
 import org.Mengine.Base.MengineService;
 import org.Mengine.Base.MengineListenerApplication;
-import org.Mengine.Base.MengineServiceInvalidInitializeException;
+
+import com.google.android.gms.ads.MobileAds;
+import com.google.android.gms.ads.VersionInfo;
 
 public class MengineAdMobPlugin extends MengineService implements MengineListenerApplication {
-    public static final String SERVICE_NAME = "MengineAdMob";
+    public static final String SERVICE_NAME = "AdMob";
 
     @Override
-    public void onAppCreate(@NonNull MengineApplication application) throws MengineServiceInvalidInitializeException {
-        // Empty
+    public String onAppVersion(@NonNull MengineApplication application) {
+        VersionInfo admobSdkVersion = MobileAds.getVersion();
+
+        String admobSdkVersionString = String.valueOf(admobSdkVersion);
+
+        return admobSdkVersionString;
     }
 }
diff --git a/gradle/plugins/Adjust/src/main/java/org/Mengine/Plugin/Adjust/MengineAdjustPlugin.java b/gradle/plugins/Adjust/src/main/java/org/Mengine/Plugin/Adjust/MengineAdjustPlugin.java
@@ -29,7 +29,7 @@
 import org.Mengine.Base.MengineTransparencyConsentParam;
 
 public class MengineAdjustPlugin extends MenginePlugin implements MenginePluginApplicationListener, MenginePluginActivityListener, MenginePluginAdRevenueListener, MenginePluginTransparencyConsentListener, MenginePluginRemoteMessageListener, MenginePluginPushTokenListener {
-    public static final String SERVICE_NAME = "MengineAdjust";
+    public static final String SERVICE_NAME = "Adjust";
     public static final boolean SERVICE_EMBEDDING = true;
 
     public static final String METADATA_APP_TOKEN = "mengine.adjust.app_token";

diff --git a/...ns/Advertising/src/main/java/org/Mengine/Plugin/Advertising/MengineAdvertisingPlugin.java b/...ns/Advertising/src/main/java/org/Mengine/Plugin/Advertising/MengineAdvertisingPlugin.java
@@ -20,7 +20,7 @@
 import java.util.concurrent.Future;
 
 public class MengineAdvertisingPlugin extends MengineService implements MengineListenerApplication {
-    public static final String SERVICE_NAME = "MengineAdvertising";
+    public static final String SERVICE_NAME = "Advertising";
 
     private static final String LIMIT_ADVERTISING_ID = "00000000-0000-0000-0000-000000000000";
 

diff --git a/gradle/plugins/Amazon/src/main/java/org/Mengine/Plugin/Amazon/MengineAmazonPlugin.java b/gradle/plugins/Amazon/src/main/java/org/Mengine/Plugin/Amazon/MengineAmazonPlugin.java
@@ -15,7 +15,7 @@
 import org.Mengine.Base.MenginePluginInvalidInitializeException;
 
 public class MengineAmazonPlugin extends MenginePlugin implements MenginePluginApplicationListener {
-    public static final String SERVICE_NAME = "MengineAmazon";
+    public static final String SERVICE_NAME = "Amazon";
 
     public static final String METADATA_APP_ID = "mengine.amazon.app_id";
     public static final String METADATA_ENABLE_TESTING = "mengine.amazon.enable_testing";

diff --git a/gradle/plugins/AppLovin/src/main/java/org/Mengine/Plugin/AppLovin/MengineAppLovinPlugin.java b/gradle/plugins/AppLovin/src/main/java/org/Mengine/Plugin/AppLovin/MengineAppLovinPlugin.java
@@ -36,7 +36,7 @@
 import java.util.Map;
 
 public class MengineAppLovinPlugin extends MengineService implements MengineListenerApplication, MengineListenerActivity, MengineListenerEngine {
-    public static final String SERVICE_NAME = "MengineAppLovin";
+    public static final String SERVICE_NAME = "AppLovin";
     public static final boolean SERVICE_EMBEDDING = true;
 
     public static final String METADATA_SDK_KEY = "mengine.applovin.sdk_key";
@@ -48,9 +48,9 @@ public class MengineAppLovinPlugin extends MengineService implements MengineList
 
     private AppLovinSdk m_appLovinSdk;
 
-    private Map<String, MengineAppLovinBanner> m_banners;
-    private Map<String, MengineAppLovinInterstitial> m_interstitials;
-    private Map<String, MengineAppLovinRewarded> m_rewardeds;
+    private Map<String, MengineAppLovinBanner> m_banners = new HashMap<>();
+    private Map<String, MengineAppLovinInterstitial> m_interstitials = new HashMap<>();
+    private Map<String, MengineAppLovinRewarded> m_rewardeds = new HashMap<>();
 
     private MengineAppLovinMediationInterface m_mediationAmazon;
 
@@ -59,11 +59,14 @@ public class MengineAppLovinPlugin extends MengineService implements MengineList
     private boolean m_bannerAdaptive;
 
     @Override
-    public void onAppCreate(@NonNull MengineApplication application) throws MengineServiceInvalidInitializeException {
-        m_banners = new HashMap<>();
-        m_interstitials = new HashMap<>();
-        m_rewardeds = new HashMap<>();
+    public String onAppVersion(@NonNull MengineApplication application) {
+        String sdkVersion = AppLovinSdk.VERSION;
+
+        return sdkVersion;
+    }
 
+    @Override
+    public void onAppCreate(@NonNull MengineApplication application) throws MengineServiceInvalidInitializeException {
         boolean MengineAppLovinPlugin_BannerAdaptive = this.getMetaDataBoolean(METADATA_BANNER_ADAPTIVE);
 
         this.logMessage("%s: %b"

diff --git a/...ugins/AppMetrica/src/main/java/org/Mengine/Plugin/AppMetrica/MengineAppMetricaPlugin.java b/...ugins/AppMetrica/src/main/java/org/Mengine/Plugin/AppMetrica/MengineAppMetricaPlugin.java
@@ -27,7 +27,7 @@
 import io.appmetrica.analytics.AppMetricaConfig;
 
 public class MengineAppMetricaPlugin extends MenginePlugin implements MenginePluginLoggerListener, MenginePluginAnalyticsListener, MenginePluginAdRevenueListener, MenginePluginApplicationListener, MenginePluginEngineListener, MenginePluginSessionIdListener {
-    public static final String SERVICE_NAME = "MengineAppMetrica";
+    public static final String SERVICE_NAME = "AppMetrica";
     public static final boolean SERVICE_EMBEDDING = true;
 
     public static final String METADATA_API_KEY = "mengine.appmetrica.api_key";

diff --git a/.../plugins/AppsFlyer/src/main/java/org/Mengine/Plugin/AppsFlyer/MengineAppsFlyerPlugin.java b/.../plugins/AppsFlyer/src/main/java/org/Mengine/Plugin/AppsFlyer/MengineAppsFlyerPlugin.java
@@ -27,7 +27,7 @@
 import java.util.Map;
 
 public class MengineAppsFlyerPlugin extends MenginePlugin implements MenginePluginAnalyticsListener, MenginePluginAdRevenueListener, MenginePluginApplicationListener, MenginePluginSessionIdListener {
-    public static final String SERVICE_NAME = "MengineAppsFlyer";
+    public static final String SERVICE_NAME = "AppsFlyer";
     public static final boolean SERVICE_EMBEDDING = true;
 
     public static final String METADATA_API_KEY = "mengine.appsflyer.api_key";

diff --git a/gradle/plugins/DataDog/src/main/java/org/Mengine/Plugin/DataDog/MengineDataDogPlugin.java b/gradle/plugins/DataDog/src/main/java/org/Mengine/Plugin/DataDog/MengineDataDogPlugin.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 public class MengineDataDogPlugin extends MenginePlugin implements MenginePluginLoggerListener, MenginePluginApplicationListener, MenginePluginActivityListener, MenginePluginSessionIdListener {
-    public static final String SERVICE_NAME = "MengineDataDog";
+    public static final String SERVICE_NAME = "DataDog";
     public static final boolean SERVICE_EMBEDDING = true;
 
     public static final String METADATA_SITE = "mengine.datadog.site";

diff --git a/...ns/DevDebugger/src/main/java/org/Mengine/Plugin/DevDebugger/MengineDevDebuggerPlugin.java b/...ns/DevDebugger/src/main/java/org/Mengine/Plugin/DevDebugger/MengineDevDebuggerPlugin.java
@@ -7,7 +7,7 @@
 import android.os.Bundle;
 
 public class MengineDevDebuggerPlugin extends MenginePlugin {
-    public static final String SERVICE_NAME = "MengineDevDebugger";
+    public static final String SERVICE_NAME = "DevDebugger";
 
     @FunctionalInterface
     public interface DevButtonCallbackInterface {

diff --git a/gradle/plugins/DevToDev/src/main/java/org/Mengine/Plugin/DevToDev/MengineDevToDevPlugin.java b/gradle/plugins/DevToDev/src/main/java/org/Mengine/Plugin/DevToDev/MengineDevToDevPlugin.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 public class MengineDevToDevPlugin extends MenginePlugin implements MenginePluginAnalyticsListener, MenginePluginAdRevenueListener, MenginePluginApplicationListener, MenginePluginSessionIdListener {
-    public static final String SERVICE_NAME = "MengineDevToDev";
+    public static final String SERVICE_NAME = "DevToDev";
     public static final boolean SERVICE_EMBEDDING = true;
 
     public static final String METADATA_APP_ID = "mengine.devtodev.app_id";

diff --git a/gradle/plugins/Facebook/src/main/java/org/Mengine/Plugin/Facebook/MengineFacebookPlugin.java b/gradle/plugins/Facebook/src/main/java/org/Mengine/Plugin/Facebook/MengineFacebookPlugin.java
@@ -44,7 +44,7 @@
 import java.util.Map;
 
 public class MengineFacebookPlugin extends MengineService implements MengineListenerAnalytics, MengineListenerApplication, MengineListenerRemoteMessage, MengineListenerPushToken, MengineListenerSessionId {
-    public static final String SERVICE_NAME = "MengineFacebook";
+    public static final String SERVICE_NAME = "Facebook";
     public static final boolean SERVICE_EMBEDDING = true;
 
     private static final int ERROR_CODE_UNKNOWN = 0;
@@ -58,6 +58,13 @@ public class MengineFacebookPlugin extends MengineService implements MengineList
     private ProfileTracker m_profileTracker;
     private AppEventsLogger m_logger;
 
+    @Override
+    public String onAppVersion(@NonNull MengineApplication application) {
+        String fbSdkVersion = FacebookSdk.getSdkVersion();
+
+        return fbSdkVersion;
+    }
+
     @Override
     public void onAppCreate(@NonNull MengineApplication application) throws MengineServiceInvalidInitializeException {
         try {

diff --git a/gradle/plugins/Firebase/firebase.gradle b/gradle/plugins/Firebase/firebase.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    implementation platform('com.google.firebase:firebase-bom:33.6.0')
+    implementation platform('com.google.firebase:firebase-bom:33.7.0')
 }
diff --git a/gradle/plugins/Firebase/src/main/java/org/Mengine/Plugin/Firebase/MengineFirebasePlugin.java b/gradle/plugins/Firebase/src/main/java/org/Mengine/Plugin/Firebase/MengineFirebasePlugin.java
@@ -10,7 +10,7 @@
 import com.google.firebase.FirebaseApp;
 
 public class MengineFirebasePlugin extends MengineService implements MengineListenerApplication {
-    public static final String SERVICE_NAME = "MengineFB";
+    public static final String SERVICE_NAME = "FB";
 
     @Override
     public void onAppInit(@NonNull MengineApplication application, boolean isMainProcess) throws MengineServiceInvalidInitializeException {

diff --git a/...cs/src/main/java/org/Mengine/Plugin/FirebaseAnalytics/MengineFirebaseAnalyticsPlugin.java b/...cs/src/main/java/org/Mengine/Plugin/FirebaseAnalytics/MengineFirebaseAnalyticsPlugin.java
@@ -26,13 +26,13 @@
 import java.util.Map;
 
 public class MengineFirebaseAnalyticsPlugin extends MengineService implements MengineListenerAnalytics, MengineListenerAdRevenue, MengineListenerTransparencyConsent, MengineListenerApplication, MengineListenerSessionId {
-    public static final String SERVICE_NAME = "MengineFBAnalytics";
+    public static final String SERVICE_NAME = "FBAnalytics";
     public static final boolean SERVICE_EMBEDDING = true;
 
     FirebaseAnalytics m_firebaseAnalytics;
 
     @Override
-    public void onAppPrepare(@NonNull MengineApplication application) throws MengineServiceInvalidInitializeException {
+    public void onAppPrepare(@NonNull MengineApplication application, @NonNull Map<String, String> pluginVersions) throws MengineServiceInvalidInitializeException {
         FirebaseAnalytics firebaseAnalytics = FirebaseAnalytics.getInstance(application);
 
         String sessionId = application.getSessionId();

diff --git a/...heck/src/main/java/org/Mengine/Plugin/FirebaseAppCheck/MengineFirebaseAppCheckPlugin.java b/...heck/src/main/java/org/Mengine/Plugin/FirebaseAppCheck/MengineFirebaseAppCheckPlugin.java
@@ -10,14 +10,16 @@
 import org.Mengine.Base.MengineListenerApplication;
 import org.Mengine.Base.MengineServiceInvalidInitializeException;
 
+import java.util.Map;
+
 public class MengineFirebaseAppCheckPlugin extends MengineService implements MengineListenerApplication {
-    public static final String SERVICE_NAME = "MengineFBAppCheck";
+    public static final String SERVICE_NAME = "FBAppCheck";
     public static final boolean SERVICE_EMBEDDING = true;
 
     FirebaseAppCheck m_firebaseAppCheck;
 
     @Override
-    public void onAppPrepare(@NonNull MengineApplication application) throws MengineServiceInvalidInitializeException {
+    public void onAppPrepare(@NonNull MengineApplication application, @NonNull Map<String, String> pluginVersions) throws MengineServiceInvalidInitializeException {
         FirebaseAppCheck firebaseAppCheck = FirebaseAppCheck.getInstance();
 
         PlayIntegrityAppCheckProviderFactory factory = PlayIntegrityAppCheckProviderFactory.getInstance();

diff --git a/gradle/plugins/FirebaseCrashlytics/build.gradle b/gradle/plugins/FirebaseCrashlytics/build.gradle
@@ -7,6 +7,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-crashlytics:19.2.1'
-    implementation 'com.google.firebase:firebase-crashlytics-ndk:19.2.1'
+    implementation 'com.google.firebase:firebase-crashlytics:19.3.0'
+    implementation 'com.google.firebase:firebase-crashlytics-ndk:19.3.0'
 }