加入oaid

Assets/AdSDK/AD/ZXHC/ZXHCDemo/Example.cs

@@ -66,6 +66,14 @@ namespace ZXHC
             }
         }
 
+        public  void OnClickOaid()
+        {
+           OaidUtil.GetOaid(new Action<string>((oaid)=> {
+               Debug.unityLogger.Log("Test oaid" + oaid);
+           }));
+
+        }
+
     }
 }
 

Assets/AdSDK/AD/ZXHC/ZXHCDemo/ZXHCDemo.unity

@@ -282,6 +282,84 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 130740052}
   m_CullTransparentMesh: 0
+--- !u!1 &467396071
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 467396072}
+  - component: {fileID: 467396074}
+  - component: {fileID: 467396073}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &467396072
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 467396071}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1285899838}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &467396073
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 467396071}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Oaid
+--- !u!222 &467396074
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 467396071}
+  m_CullTransparentMesh: 0
 --- !u!1 &718195566
 GameObject:
   m_ObjectHideFlags: 0
@@ -490,6 +568,136 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1256318123}
   m_CullTransparentMesh: 0
+--- !u!1 &1285899837
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1285899838}
+  - component: {fileID: 1285899841}
+  - component: {fileID: 1285899840}
+  - component: {fileID: 1285899839}
+  m_Layer: 5
+  m_Name: Oaid
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1285899838
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1285899837}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 467396072}
+  m_Father: {fileID: 2103191286}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -173, y: 286}
+  m_SizeDelta: {x: 221.93564, y: 66.367256}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1285899839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1285899837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1285899840}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 2103191287}
+        m_MethodName: OnClickOaid
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &1285899840
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1285899837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1285899841
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1285899837}
+  m_CullTransparentMesh: 0
 --- !u!1 &1433212422
 GameObject:
   m_ObjectHideFlags: 0
@@ -779,6 +987,7 @@ RectTransform:
   m_Children:
   - {fileID: 1728463833}
   - {fileID: 1256318124}
+  - {fileID: 1285899838}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/AdSDK/AD/ZXHC/ZxHCSDK/common/ZXHCADManager.cs

-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using Tencent.GDT;
 using UnityEngine;
@@ -7,13 +8,15 @@ namespace ZXHC
 {
     public class ZXHCADManager
     {
-        private static string appId;
         private static bool hasInit = false;
         public static bool Init(string appId)
         {
 #if UNITY_ANDROID
             AndroidJavaObject hcAdManager = new AndroidJavaClass("com.ym.zxhcsdk.manager.ZXHCADManager").CallStatic<AndroidJavaObject>("getInstance");
             hasInit = hcAdManager.Call<bool>("InitAd",ZXHCUtils.GetActivity(),appId);
+            OaidUtil.GetOaid(new Action<string>((oaid) => {
+                ZXHCUtils.SetDeviceOaid(oaid);
+            }));
             return hasInit;
 #elif UNITY_IOS
             return hasInit;

Assets/AdSDK/Oaid/IOaidListener.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public interface IOaidListener
-{
-    void getOaid(string oaid);
-}

Assets/AdSDK/Oaid/IOaidListener.cs.meta

-fileFormatVersion: 2
-guid: fee1cce6e89682442805dedaea6048d5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AdSDK/Oaid/OaidListenerProxy.cs

-using System.Collections;
-using System.Collections.Generic;
+using System;
 using UnityEngine;
 
 public class OaidListenerProxy : AndroidJavaProxy
 {
-    internal IOaidListener listener = null;
-
-    public OaidListenerProxy() : base("com.ym.zxhcsdkaar.IOaidListener")
+    private Action<string> oaidCallback;
+    public OaidListenerProxy(Action<string> oaidCallback) : base("com.ym.zxhcsdkaar.IOaidListener")
     {
-
+        this.oaidCallback = oaidCallback;
     }
 
     void getOaid(string oaid)
     {
-        if (listener == null)
-        {
-            return;
-        }
-        listener.getOaid(oaid);
+        oaidCallback(oaid);
     }
 }

Assets/AdSDK/Oaid/OaidUtil.cs

-using System.Collections;
-using System.Collections.Generic;
+using System;
 using UnityEngine;
 using ZXHC;
 public class OaidUtil
 {
-    
-    public void GetOaid()
-    {
-        AndroidJavaObject util = new AndroidJavaClass("com.ym.zxhcsdkaar.OaidUtils");
-        util.Call("GetOaid", ZXHCUtils.GetActivity(), new OaidListener());
-    }
-
-
-
-
 
-
-    private class OaidListener : IOaidListener
+    public static void GetOaid(Action<string> callback)
     {
-        public void getOaid(string oaid)
-        {
-
-        }
+#if UNITY_ANDROID
+        AndroidJavaObject util = new AndroidJavaObject("com.ym.zxhcsdkaar.OaidUtils");
+        util.Call("GetOaid", ZXHCUtils.GetActivity(), new OaidListenerProxy(callback));
+#else
+        callback("不支持");
+#endif
     }
-
-
-
-
 }

Assets/AdSDK/Oaid/StreamingAssets.meta → Assets/Plugins/Android/assets.meta

 fileFormatVersion: 2
-guid: e3180a7cc4f188f428267651fe4618ae
+guid: dc1413c8e5380364f91be1f9a0f0f95b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

ProjectSettings/EditorBuildSettings.asset

@@ -14,13 +14,13 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/AdSDK/SplashDemo/Splash.unity
     guid: 37af8cf3fb373478ab04e3ee2f3b700a
-  - enabled: 1
+  - enabled: 0
     path: Assets/AdSDK/AD/Demo/AdDemo.unity
     guid: ef80a35d44f809e4a8957d1ed9571fd2
   - enabled: 0
     path: Assets/AdSDK/NetWork/Demo/HttpDemo.unity
     guid: 1d254830c8b62484bb74d303cbb2cc3d
-  - enabled: 0
+  - enabled: 1
     path: Assets/AdSDK/AD/ZXHC/ZXHCDemo/ZXHCDemo.unity
     guid: cb50b98bfef171a4ea884c941dd43fa3
   m_configObjects: {}