Browse Source

[FC]GroMore 修复信息流出现不关闭问题

fengcong 4 years ago
parent
commit
9bcd3d747d

+ 1 - 2
assets/script/mk/system/AdSystem.ts

@@ -96,7 +96,7 @@ export default class AdSystem {
      * @param placementId 广告位id
      */
     public wacthAdSuccess(placementId = '') {
-        mk.console.log("=== wacthAdSuccess");
+        mk.console.log("===[Cocoscreator wacthAdSuccess");
         //累计视频次数
         mk.data.setTAEventUser(1, 'video_time', 1);
         //广告过后,渲染会有问题,统一下一帧再处理逻辑
@@ -111,7 +111,6 @@ export default class AdSystem {
     /** 显示原生广告 */
     public showNative(type = 4) {
       
-   
         if (!this.ifShowAd) {
             return;
         }

+ 1 - 0
assets/script/mk/system/JsbSystem.ts

@@ -564,6 +564,7 @@ export default class JsbSystem {
 
     /** 激励视频成功 */
     public static gMoreRewardAdSuccess() {
+        console.log("===[JsbSystem gMoreRewardAdSuccess");
         mk.ad.wacthAdSuccess();
     }
 

BIN
build/jsb-link/assets/main/index.jsc


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/config.json


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk


+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/jsb/wxapi/WXEntryActivity.java

@@ -46,7 +46,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
     private String AppId_WX = "wx28356dc7c541ea76";
 
     //日志Tag
-    private  String _tag = "[WXEntryActivity] :";
+    private  String _tag = "==[WXEntryActivity] :";
 
     private IWXAPI iwxapi;
     private String unionid;

+ 10 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -1247,14 +1247,22 @@ public class AppActivity extends Cocos2dxActivity {
         if(this.isNativeLoadSuccess)
         {
             Log.d(TAG_NativeAD, "onResume show:--------------------------------------------------"+(this.mAds != null) +"++"+(this.mAds));
-            nativeAdView = this.getView(0,null,(ViewGroup)this.getWindow().getDecorView());
-            FrameLayout container = getWindow().getDecorView().findViewById(android.R.id.content);
+            nativeAdView = this.getView(0,nativeAdView,(ViewGroup)this.getWindow().getDecorView());
+            if(ifShowNativeAd)
+            {
+                nativeAdView.setX(0);
+            }
+            else
+            {
 
+            }
+            FrameLayout container = getWindow().getDecorView().findViewById(android.R.id.content);
             if(nativeAdView !=null && nativeAdView.getParent() == null)
             {
                 Log.d("onResume show","添加进主要的activity");
                 container.addView(nativeAdView);
             }
+
             Log.d(TAG_NativeAD,"nativeAdView.getX()" + nativeAdView.getX());
         }
         else

+ 2 - 1
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2088,7 +2088,7 @@ this.videoAdcallBack(!1);
 t.prototype.wacthAdSuccess = function(t) {
 var e = this;
 void 0 === t && (t = "");
-mk.console.log("=== wacthAdSuccess");
+mk.console.log("===[Cocoscreator wacthAdSuccess");
 mk.data.setTAEventUser(1, "video_time", 1);
 mk.ui.scheduleOnce(function() {
 gData.adData.checkAdMax() || e.videoAdcallBack(!0);
@@ -11463,6 +11463,7 @@ t.gMoreRewardAdFail = function() {
 mk.ad.watchAdFail();
 };
 t.gMoreRewardAdSuccess = function() {
+console.log("===[JsbSystem gMoreRewardAdSuccess");
 mk.ad.wacthAdSuccess();
 };
 t.gMoreRewardAdCancel = function() {

+ 2 - 2
packages-hot-update/cfg.json

@@ -18,7 +18,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/"
     ],
-    "buildTime": 1632447467306,
-    "genTime": 1632447467306,
+    "buildTime": 1632723152910,
+    "genTime": 1632723152910,
     "genVersion": null
 }

Some files were not shown because too many files changed in this diff