修复掌心汇川关闭回调

Assets/AdSDK/AD/AD_Manager/AdManager.cs

@@ -69,7 +69,7 @@ public class AdManager
                     case ZXADConfig.PLANTFORM_AD_TT:
 #if UNITY_ANDROID
                         AndroidJavaClass jc = new AndroidJavaClass("com.unity.adcommon.unity.TTADManager");
-                        jc.CallStatic("init", id.codeAppId);
+                        jc.CallStatic("init", GetActivity(), id.codeAppId);
                         //获取穿山甲权限
                         SDK.RequestPermissionIfNecessary();
 #elif UNITY_IOS
@@ -87,7 +87,7 @@ public class AdManager
                         if (id.codeAppId != null && id.codeAppId != "")
                         {
                             AndroidJavaClass jc2 = new AndroidJavaClass("com.unity.adcommon.unity.TTADManager");
-                            jc2.CallStatic("initYLB", id.codeAppId);
+                            jc2.CallStatic("initYLB", GetActivity(), id.codeAppId);
                         }
 #endif
                         break;
@@ -105,12 +105,12 @@ public class AdManager
                         break;
                 }
             }
-            callback(true);
             IsInitAd = true;
+            callback(true);
         }), new Action<string, string>((code, errMsg) =>
         {
-            callback(false);
             Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, code + "AdInit 请求失败" + errMsg);
+            callback(false);
         }));
 
     }
@@ -131,27 +131,29 @@ public class AdManager
         HttpTool.Instance._GetAD(AdLoadUrl, paras, new Action<List<AdEntity>>((AdConfigList) =>
         {
             Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "Splash 请求成功");
-
             if (AdConfigList != null && AdConfigList.Count > 0)
             {
                 //Splash数据
-                List<AdEntity> bannerAdList = new List<AdEntity>();
-                bannerAdList.Add(AdConfigList[0]);
+                List<AdEntity> splashAdList = new List<AdEntity>();
+                splashAdList.Add(AdConfigList[0]);
                 if (AdConfigList[0].backups != null && AdConfigList[0].backups.Count > 0)
                 {
-                    bannerAdList.AddRange(AdConfigList[0].backups);
+                    splashAdList.AddRange(AdConfigList[0].backups);
                 }
+                Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "Splash成功 数量"+ splashAdList.Count);
                 //加载Splash广告
-                mLoadSplashAd("splash", listener, bannerAdList);
+                mLoadSplashAd("splash", listener, splashAdList);
             }
             else
             {
                 listener.onError("Splash数据null");
+                listener.onLastError();
             }
 
         }), new Action<string, string>((code, errMsg) =>
         {
             listener.onError("code" + code + "errMsg" + errMsg);
+            listener.onLastError();
             Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "Splash 请求失败" + errMsg);
         }));
     }
@@ -183,6 +185,7 @@ public class AdManager
             else
             {
                 Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "Splash失败 " + entity.adPlatform + " CodeID " + entity.codeId);
+                Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "Splash失败 数量" + totalEntityList.Count);
                 if (totalEntityList.Count > 0)
                 {
                     entity = totalEntityList[0];
@@ -208,6 +211,7 @@ public class AdManager
     /// <param name="callback"></param>
     private void mLoadSplashPlatform(AdEntity entity, ZXADSplashListener listener, Action<bool> callback)
     {
+        Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "Splash加载 " + entity.adPlatform);
         switch (entity.adPlatform)
         {
             case ZXADConfig.PLANTFORM_AD_TT:

Assets/AdSDK/AD/AD_Manager/ZXADConfig.cs

@@ -14,11 +14,10 @@ public class ZXADConfig
         }
     }
 
+    public const int ZXAD_VC = 129;
+    public const string ZXAD_VN = "1.2.9";
 
     public const string ADManagerTAG = "AdManager";
-
-
-
     public const string PLANTFORM_AD_TT = "chuanshanjia"; //穿山甲
     public const string PLANTFORM_AD_GDT = "guangdiantong"; //广点通
     public const string PLANTFORM_AD_KUS = "kuaishou"; //快手

Assets/AdSDK/AD/CSJ/CSJSplshADUtils.cs

@@ -120,9 +120,9 @@ public class CSJSplshADUtils
         public void OnError(int code, string message)
         {
             EventUtils.onEventPullFail(entity, code.ToString(), message);
-            callback(false);
             listener.onError("CSJ SplshAd code" + code + "message" + message);
             Debug.Log("splash load Onerror:" + code + ":" + message);
+            callback(false);
         }
 
         public void OnSplashAdLoad(BUSplashAd ad)

Assets/AdSDK/AD/CSJ/TTADManager.java

 package com.unity.adcommon.unity;
 
+import android.app.Activity;
+import android.content.Context;
+
 import com.bytedance.sdk.openadsdk.TTAdConfig;
 import com.bytedance.sdk.openadsdk.TTAdConstant;
 import com.bytedance.sdk.openadsdk.TTAdSdk;
@@ -11,33 +14,42 @@ import com.wannuosili.sdk.WNAdSdk;
  */
 public class TTADManager {
 
-    public static void init(String codeId){
-
-        TTAdSdk.init(
-                AppliContext.get(),
-                new TTAdConfig.Builder()
-                        .appId(codeId)
-                        .useTextureView(true) //使用TextureView控件播放视频,默认为SurfaceView,当有SurfaceView冲突的场景，可以使用TextureView
-                        .appName("test")
-                        .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
-                        .allowShowNotify(true) //是否允许sdk展示通知栏提示
-                        .allowShowPageWhenScreenLock(true) //是否在锁屏场景支持展示广告落地页
-                        .debug(false) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
-                        .directDownloadNetworkType(
-                                TTAdConstant.NETWORK_STATE_WIFI,
-                                TTAdConstant.NETWORK_STATE_4G
-                        ) //允许直接下载的网络状态集合
-                        .supportMultiProcess(false) //是否支持多进程，true支持
-                        //.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
-                        .build());
+    public static void init(Activity context, String codeId){
+
+        context.runOnUiThread(() -> {
+            TTAdSdk.init(
+                    AppliContext.get(),
+                    new TTAdConfig.Builder()
+                            .appId(codeId)
+                            .useTextureView(true) //使用TextureView控件播放视频,默认为SurfaceView,当有SurfaceView冲突的场景，可以使用TextureView
+                            .appName("test")
+                            .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
+                            .allowShowNotify(true) //是否允许sdk展示通知栏提示
+                            .allowShowPageWhenScreenLock(true) //是否在锁屏场景支持展示广告落地页
+                            .debug(false) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
+                            .directDownloadNetworkType(
+                                    TTAdConstant.NETWORK_STATE_WIFI,
+                                    TTAdConstant.NETWORK_STATE_4G
+                            ) //允许直接下载的网络状态集合
+                            .supportMultiProcess(false) //是否支持多进程，true支持
+                            //.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
+                            .build());
+
+
+
+        });
+
     }
 
-    public static void initYLB(String appId){
-        WNAdSdk.initialize(new WNAdConfig.Builder()
-                .setAppId(appId) // 平台申请的appId
-                .setDebug(false) // 是否是debug模式， 默认为false
-                .setContext(AppliContext.get())
-                .build());
+    public static void initYLB(Activity context, String appId){
+        context.runOnUiThread(() -> {
+            WNAdSdk.initialize(new WNAdConfig.Builder()
+                    .setAppId(appId) // 平台申请的appId
+                    .setDebug(false) // 是否是debug模式， 默认为false
+                    .setContext(AppliContext.get())
+                    .build());
+        });
+
     }
 
 }

Assets/AdSDK/AD/Demo/AdDemo.cs

@@ -15,6 +15,18 @@ public class AdDemo : MonoBehaviour
     private string FullVideo = "fullvideo";
     private string Reward = "video";
     private string Interstitial = "Interstitial";
+
+    private void Awake()
+    {  //AdManager.Instance.LoadSplshAd(new SplshAdListener(this));
+      
+    }
+    private void Start()
+    {
+        AdManager.Instance.InitAd(new System.Action<bool>((cb) => {
+
+            OnClickPlaySplshAd();
+        }));
+    }
     public void OnClickLoadRewardAd()
     {
         AdManager.Instance.LoadCacheRewardVideoAd("video");
@@ -31,7 +43,6 @@ public class AdDemo : MonoBehaviour
     //private Thread loadThread = new Thread(new LoadNextVideo());
     private void LoadNextVideo()
     {
-        Debug.unityLogger.Log("开启子线程");
         AdManager.Instance.LoadCacheRewardVideoAd("video");
     }
     public sealed class RewardAdListener : ZXADRewardVideoListener
@@ -112,11 +123,12 @@ public class AdDemo : MonoBehaviour
         public void onError(string errorMsg)
         {
             this.demo.RewardAdResult.text = "开屏错误" + errorMsg;
+            Debug.unityLogger.Log("开屏1Error"+ errorMsg);
         }
 
         public void onLastError()
         {
-
+            Debug.unityLogger.Log("开屏2Error");
         }
     }
 

Assets/AdSDK/AD/Demo/AdDemo.unity

@@ -3028,7 +3028,7 @@ PrefabInstance:
     - target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
         type: 3}
       propertyPath: IS_TEST
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
         type: 3}

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

@@ -31,7 +31,8 @@ namespace ZXHC
         public void OnClickFeed()
         {
             AdEntity entity = new AdEntity();
-            entity.codeId = "1100023";
+            //entity.codeId = "1100437";
+            entity.codeId = "2100156";
             ZXHCFeedUtil.Instance.LoadCacheFeedAd(entity, new Action<bool>((cb) =>
             {
                 Debug.unityLogger.Log("LoadCacheFeedAd" + cb);
@@ -42,9 +43,13 @@ namespace ZXHC
                         Debug.unityLogger.Log("ShowCacheFeedAd" + cb);
                     }));
                 }
-
             }));
         }
+        public void OnClickCloseFeed()
+        {
+            ZXHCFeedUtil.Instance.CloseFeedAd();
+        }
+
 
 
         private sealed class SplshAdListener : ZXADSplashListener

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

@@ -202,7 +202,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &130740052
 GameObject:
@@ -360,6 +360,136 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 467396071}
   m_CullTransparentMesh: 0
+--- !u!1 &568385589
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 568385590}
+  - component: {fileID: 568385593}
+  - component: {fileID: 568385592}
+  - component: {fileID: 568385591}
+  m_Layer: 5
+  m_Name: CloseFeed
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &568385590
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 568385589}
+  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: 1319697699}
+  m_Father: {fileID: 2103191286}
+  m_RootOrder: 3
+  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: 132, y: 286}
+  m_SizeDelta: {x: 221.93564, y: 66.367256}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &568385591
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 568385589}
+  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: 568385592}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 2103191287}
+        m_MethodName: OnClickCloseFeed
+        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 &568385592
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 568385589}
+  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 &568385593
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 568385589}
+  m_CullTransparentMesh: 0
 --- !u!1 &718195566
 GameObject:
   m_ObjectHideFlags: 0
@@ -438,6 +568,75 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 718195566}
   m_CullTransparentMesh: 0
+--- !u!1001 &734889873
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2853166085728200632, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_Name
+      value: HTTP
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1053be02c113a7a45adf322c929b0cb6, type: 3}
 --- !u!1 &1256318123
 GameObject:
   m_ObjectHideFlags: 0
@@ -698,6 +897,84 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1285899837}
   m_CullTransparentMesh: 0
+--- !u!1 &1319697698
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1319697699}
+  - component: {fileID: 1319697701}
+  - component: {fileID: 1319697700}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1319697699
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1319697698}
+  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: 568385590}
+  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 &1319697700
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1319697698}
+  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: CloseFeed
+--- !u!222 &1319697701
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1319697698}
+  m_CullTransparentMesh: 0
 --- !u!1 &1433212422
 GameObject:
   m_ObjectHideFlags: 0
@@ -762,7 +1039,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1728463832
 GameObject:
@@ -988,8 +1265,9 @@ RectTransform:
   - {fileID: 1728463833}
   - {fileID: 1256318124}
   - {fileID: 1285899838}
+  - {fileID: 568385590}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}

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

@@ -43,10 +43,18 @@ public class ZXHCFeedUtil
     /// </summary>
     public void CloseFeedAd()
     {
-        if (feedAd != null)
-        {
-            feedAd.CLoseAD();
-        }
+        Debug.unityLogger.Log("CloseFeed1");
+        //if (feedAd != null)
+        //{
+        //    Debug.unityLogger.Log("CloseFeed2");
+           
+        //}
+        //else
+        //{
+        //    Debug.unityLogger.Log("CloseFeed3");
+        //    feedAd.CLoseAD();
+        //}
+        feedAd.CLoseAD();
     }
 
     /// <summary>
@@ -55,7 +63,7 @@ public class ZXHCFeedUtil
     /// <param name="entity"></param>
     public void ShowCacheFeedAd(AdEntity entity, Action<bool> callback)
     {
-        CloseFeedAd();
+        //CloseFeedAd();
         if (feedAdCacheList.Count > 0)
         {
             feedAd = feedAdCacheList.Dequeue();

Assets/AdSDK/AD/ZXHC/ZxHCSDK/Feed/ZXHCFeedAd.cs

@@ -5,7 +5,7 @@ namespace ZXHC
 {
     public class ZXHCFeedAd : MonoBehaviour
     {
-        private AndroidJavaObject splashAd;
+        private AndroidJavaObject feedAd;
         internal AndroidJavaObject container;
         private string posId;
         private int width;
@@ -24,9 +24,9 @@ namespace ZXHC
 
         private void init()
         {
-            if (splashAd == null)
+            if (feedAd == null)
             {
-                splashAd = new AndroidJavaObject("com.ym.zxhcsdk.view.ZXHCFeedAD", ZXHCUtils.GetActivity(), posId, width, height, listenerProxy);
+                feedAd = new AndroidJavaObject("com.ym.zxhcsdk.view.ZXHCFeedAD", ZXHCUtils.GetActivity(), posId, width, height, listenerProxy);
             }
         }
 
@@ -43,18 +43,18 @@ namespace ZXHC
             }
             // 由于 Android 的 fetchDelay 和 skipView 不允许动态设置，故只能延迟初始化
             init();
-            this.splashAd.Call("loadAD");
+            this.feedAd.Call("loadAD");
         }
 
         public void Show(object container)
         {
-            AndroidJavaObject splashContainer = (AndroidJavaObject)container;
+            AndroidJavaObject feedContainer = (AndroidJavaObject)container;
             if (CheckNotReady())
             {
                 return;
             }
-            this.splashAd.Call("showAd", splashContainer);
-            this.container = splashContainer;
+            this.feedAd.Call("showAd", feedContainer);
+            this.container = feedContainer;
         }
 
         public void CLoseAD()
@@ -63,7 +63,13 @@ namespace ZXHC
             {
                 return;
             }
-            this.splashAd.Call("destroyFeedAd", container);
+            if (container != null)
+            {
+                this.feedAd.Call("destroyFeedAd", container);
+                container = null;
+            }
+
+
         }
 
         /* 检查是否未准备好 */
@@ -73,7 +79,7 @@ namespace ZXHC
             {
                 return true;
             }
-            if (splashAd == null)
+            if (feedAd == null)
             {
                 Debug.Log("请先加载广告");
                 return true;

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

@@ -10,7 +10,7 @@ namespace ZXHC
         private static AndroidJavaObject activity;
         public static AndroidJavaObject GetActivity()
         {
-#if UNITY_ANDROID
+#if UNITY_ANDROID&&!UNITY_EDITOR
             if (activity == null)
             {
                 var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
@@ -43,8 +43,11 @@ namespace ZXHC
 
         public static string GetDeviceOaid()
         {
+#if UNITY_ANDROID&&!UNITY_EDITOR
             AndroidJavaObject phoneUtil = new AndroidJavaClass("com.ym.zxhcsdk.PhoneUtils").CallStatic<AndroidJavaObject>("getInstance");
             return phoneUtil.Call<string>("getoaid");
+#endif
+            return "";
         }
     }
 }

Assets/AdSDK/NetWork/Demo/AndroidPhoneUtils.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using ZXHC;
+
+public class AndroidPhoneUtils
+{
+
+    public static string GetAppVC()
+    {
+#if !UNITY_EDITOR && UNITY_ANDROID
+        AndroidJavaObject util = new AndroidJavaClass("com.unity.adcommon.unity.AndroidPhoneUtils").CallStatic<AndroidJavaObject>("getInstance");
+        return util.Call<int>("getAppVersionCode", ZXHCUtils.GetActivity())+"";
+#endif
+        return "";
+    }
+
+    public static string GetAppVN()
+    {
+#if !UNITY_EDITOR && UNITY_ANDROID
+        AndroidJavaObject util = new AndroidJavaClass("com.unity.adcommon.unity.AndroidPhoneUtils").CallStatic<AndroidJavaObject>("getInstance");
+        return util.Call<string>("getAppVersionName", ZXHCUtils.GetActivity());
+#endif
+        return "";
+    }
+
+
+
+
+
+
+}

Assets/AdSDK/NetWork/Demo/AndroidPhoneUtils.cs.meta

+fileFormatVersion: 2
+guid: 305391ce50409ce4ba054c8a1e7c45b4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AdSDK/NetWork/HTTP/HttpTool.cs

@@ -10,7 +10,7 @@ using System.Net.Http;
 using System.Net;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-
+using ZXHC;
 
 public class HttpTool : MonoBehaviour
 {
@@ -370,15 +370,17 @@ public class HttpTool : MonoBehaviour
         paragrams["device_uuid"] = PrefenceUtils.GetInstance().getUUid();
         paragrams["vendor"] = SystemInfo.deviceModel;
         paragrams["model"] = SystemInfo.deviceName;
-        paragrams["oaid"] = PrefenceUtils.GetInstance().getOaid();
+        paragrams["oaid"] = ZXHCUtils.GetDeviceOaid();
         paragrams["ip"] = PrefenceUtils.GetInstance().getIp();
         paragrams["h"] = Screen.height;
         paragrams["svn"] = PrefenceUtils.GetInstance().getSVN();
         paragrams["ntt"] = PrefenceUtils.GetInstance().getNTT();
         paragrams["carrier"] = PrefenceUtils.GetInstance().getCarrier();
         paragrams["w"] = Screen.width;
-        paragrams["vc"] = PrefenceUtils.GetInstance().getVC();
-        paragrams["vn"] = PrefenceUtils.GetInstance().getVN();
+        paragrams["vc"] = AndroidPhoneUtils.GetAppVC();
+        paragrams["vn"] = AndroidPhoneUtils.GetAppVN();
+        paragrams["adsdk_vc"] = ZXADConfig.ZXAD_VC;
+        paragrams["adsdk_vn"] = ZXADConfig.ZXAD_VN;
         paragrams["imei"] = PrefenceUtils.GetInstance().getImei();
         paragrams["aid"] = PrefenceUtils.GetInstance().getAid();
 #if UNITY_EDITOR

Assets/AdSDK/NetWork/HTTP/unity/AndroidPhoneUtils.java.meta

+fileFormatVersion: 2
+guid: be6033d9795d4d14f88e76c80f27f2a6
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AdSDK/NetWork/HTTP/unity/LitJson.dll.meta

 fileFormatVersion: 2
-guid: 08abcf21e7d2d224596f1ce2fd2178d4
+guid: 88ddd43a224c76940ba78451fceeabe9
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/AdSDK/Oaid/OaidUtil.cs

@@ -6,7 +6,7 @@ public class OaidUtil
 
     public static void GetOaid(Action<string> callback)
     {
-#if UNITY_ANDROID
+#if UNITY_ANDROID&&!UNITY_EDITOR
         AndroidJavaObject util = new AndroidJavaObject("com.ym.zxhcsdkaar.OaidUtils");
         util.Call("GetOaid", ZXHCUtils.GetActivity(), new OaidListenerProxy(callback));
 #else

ProjectSettings/ProjectSettings.asset

@@ -131,7 +131,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.2
+  bundleVersion: 1.0.3
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -184,7 +184,7 @@ PlayerSettings:
     Standalone: 0
     iPhone: 0
     tvOS: 0
-  AndroidBundleVersionCode: 1
+  AndroidBundleVersionCode: 4
   AndroidMinSdkVersion: 21
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1