com.amanotes.gdk 0.2.46 → 0.2.47

package/Runtime/AmaGDK.Adapters.cs

@@ -6,109 +6,87 @@ using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
-    public abstract class AdapterContext
+    public abstract partial class Adapter2
     {
-        public string adapterId;
-        public string adapterVersion;
-        public int initOrder;
-        public GameObject refObj;
-
-        // Status support
-        public Status status = Status.None;
+        // internal use
+        [HideInInspector] [SerializeField] internal int initOrder;
+        [HideInInspector] [SerializeField] internal bool enabled = true;
+        [NonSerialized] internal string adapterId;
+        [NonSerialized] internal string adapterVersion;
+        [NonSerialized] internal protected Status status = Status.None;
+        
+        protected abstract void Init(Action<bool> onComplete);
+        
         public bool IsReady => status == Status.Ready;
-
-        public void Init()
+        
+        internal void InitSDK() // call by AmaGDK
         {
             if (status != Status.None)
             {
-                LogWarning($"Invalid status: {status}");
+                LogWarning($"InitSDK() - Invalid Adapter <{adapterId}> status (expect <None>, got: <{status}>)");
                 return;
             }
-
+            
+            #if UNITY_EDITOR
+            status = Status.Ready;
+            #else
             status = Status.Initialize;
             Init(success =>
             {
                 status = success ? Status.Ready : Status.Failed;
             });
+            #endif
         }
-
-        protected virtual void Init(Action<bool> onCompleted) { }
-        public T GetAdapterApi<T>() { return (T)(object)this; }
-        public abstract T GetAdapterConfig<T>() where T : class;
     }
-
-    public static class Adapter
+    
+    public abstract partial class Adapter2 
     {
-        internal static readonly List<AdapterContext> listAdapters = new List<AdapterContext>();
-
-        public static string GetId(Type adapterType)
+        [NonSerialized] internal static readonly Dictionary<string, Adapter2> adapterMap = new Dictionary<string, Adapter2>();
+        protected static bool Register(string id, string version)
         {
-            return adapterType.Name.Replace("Adapter", string.Empty);
-        }
-
-        public static void Register<T>(Func<ConfigAsset, T> createFunc) where T : AdapterContext
-        {
-            if (AmaGDK._status != Status.None)
+            if (adapterMap.ContainsKey(id))
             {
-                LogWarningOnce($"RegisterAdapter - Invalid status: {AmaGDK._status}");
-                return;
+                LogWarning($"Duplicated Adapter id registered <{id}>");
+                return false;
             }
-
-            T adapter = createFunc(AmaGDK.Config);
-            InitOrder orderConfig = AmaGDK.Config.initOrder.FirstOrDefault(item => item.id == adapter.adapterId);
-            if (orderConfig != null) adapter.initOrder = orderConfig.order;
-            listAdapters.Add(adapter);
-        }
-
-        public static AdapterContext Find<T>()
-        {
-            for (var i = 0; i < listAdapters.Count; i++)
+            
+            var adapter = AmaGDK.Config.GetFieldValue<Adapter2>(id);
+            if (adapter == null)
             {
-                AdapterContext item = listAdapters[i];
-                Type itemType = item.GetType();
-                if (!typeof(T).IsAssignableFrom(itemType)) continue;
-                return item;
+                LogWarning($"Adapter <{id}> == null in ConfigAsset? (non-serialized?)");
+                return false;
             }
-
-            return default;
+            
+            adapter.adapterId = id;
+            adapter.adapterVersion = version;
+            GDKUtils.RegisterUnityCallbacks(adapter);
+            adapterMap.Add(id, adapter);
+            return true;
         }
-
-        public static List<AdapterContext> FindAll<T>()
+        
+        // PUBLIC STATIC APIs
+        public static Adapter2 GetAdapterById(string id)
         {
-            var result = new List<AdapterContext>();
-            for (var i = 0; i < listAdapters.Count; i++)
-            {
-                AdapterContext item = listAdapters[i];
-                Type itemType = item.GetType();
-                if (!typeof(T).IsAssignableFrom(itemType)) continue;
-                result.Add(item);
-            }
-
-            return result;
+            return GetAdapterById<Adapter2>(id);
         }
-
-        public static T GetSingleAdapter<T>() where T : class
+        public static TAdapter GetAdapterById<TAdapter>(string id) where TAdapter: Adapter2
         {
-            List<AdapterContext> adapters = FindAll<T>();
-
-            if (adapters == null || adapters.Count < 1)
-            {
-                Log($"Not found adapter for <{typeof(T)}>!");
-                return null;
-            }
-
-            if (adapters.Count > 1)
-            {
-                LogError($"Multiple adapters detected. <{typeof(T)}> supports only one adapter!");
-                return null;
-            }
-
-            return adapters[0].GetAdapterApi<T>();
+            return adapterMap.TryGetValue(id, out var result) ? (TAdapter)result : null;
         }
-
-        public static T GetConfig<T>() where T : ConfigAsset
+        
+        public static TAdapter GetAdapter<TAdapter>() where TAdapter: Adapter2
+        {
+            var result = adapterMap.Values
+                .FirstOrDefault(value => value is TAdapter);
+            
+            return (TAdapter)result;
+        }
+        
+        public static List<TAdapter> GetAllAdapter<TAdapter>() where TAdapter: Adapter2
         {
-            return (T)AmaGDK.Config;
+            return adapterMap.Values
+                .OfType<TAdapter>()
+                .ToList();
         }
     }
 }