1.0.6代码测试

highgold/app/build.gradle

@@ -247,7 +247,7 @@ dependencies {
     implementation files("libs/qq_x5.jar")   // x5版本：20190429_175122
 
     // 鱼丸盒子
-    implementation(name: 'xzzq_ywsdk_1.0.4', ext: 'aar')
+    implementation(name: 'xzzq_ywsdk_1.0.6', ext: 'aar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
     implementation 'com.liulishuo.filedownloader:library:1.6.8'
     implementation "org.greenrobot:eventbus:3.1.0-RC"

highgold/app/src/main/java/com/mints/highgold/MintsApplication.java

@@ -10,9 +10,11 @@ import android.support.annotation.RequiresApi;
 import android.support.multidex.MultiDex;
 import android.support.multidex.MultiDexApplication;
 import android.support.v4.content.LocalBroadcastManager;
+import android.text.TextUtils;
 import android.webkit.WebView;
 
 import com.bun.miitmdid.core.JLibrary;
+import com.component.dly.xzzq_ywsdk.YwSDK;
 import com.downloader.PRDownloader;
 import com.downloader.PRDownloaderConfig;
 import com.lechuan.midunovel.view.FoxSDK;
@@ -23,9 +25,13 @@ import com.mints.highgold.common.Constant;
 import com.mints.highgold.manager.LiebaoManager;
 import com.mints.highgold.manager.MiitHelper;
 import com.mints.highgold.manager.TTAdManagerHolder;
+import com.mints.highgold.manager.UserManager;
 import com.mints.highgold.net.LoanService;
+import com.mints.highgold.utils.DevicesUtil;
 import com.mints.highgold.utils.ForegroundOrBackground;
 import com.mints.highgold.utils.RudenessScreenHelper;
+import com.mints.highgold.utils.rxutil.CommonRxTask;
+import com.mints.highgold.utils.rxutil.RxjavaUtil;
 import com.mints.library.utils.CommonUtils;
 import com.mints.library.utils.SmartBarUtils;
 import com.mob.MobSDK;
@@ -172,7 +178,7 @@ public class MintsApplication extends MultiDexApplication {
         // 一览视频
         initYL();
 
-        // 鱼丸盒子
+//        // 鱼丸盒子
 //        if (UserManager.getInstance().userIsLogin()) {
 //            if (Build.VERSION.SDK_INT > 28) {
 //
@@ -277,50 +283,49 @@ public class MintsApplication extends MultiDexApplication {
         JPushInterface.setDefaultPushNotificationBuilder(builder);
     }
 
-//    /**
-//     * 鱼丸盒子
-//     */
-//    public void initYwSdk() {
-//        UserManager userManager = UserManager.getInstance();
-//        String userID = userManager.getUserID();
-//        if (!userManager.userIsLogin() || TextUtils.isEmpty(userID)) {
-//            // 用户id为空 或 未登录 = 游客
-//            userID = "0";
-//        }
-//
-//        String appid = "";
-//        String appSecret = "";
-//        if (BuildConfig.DEBUG) {
-//            appid = "1066";
-//            appSecret = "nfgpxq2x1svo50m8eicv38erc9ugsx6a";
-//        } else {
-//            appid = "1050";
-//            appSecret = "ngvbamk7h3i1psj4q4cb2vzst9ts6fml";
-//        }
-//
-//        String oaid = "";
-//        try {
-//            oaid = DevicesUtil.getOaid();
-//            if (oaid == null) {
-//                oaid = "";
-//            }
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//
-//        }
-//
-//        System.out.println("mcg __ oaid:" + oaid);
-//
-//        YwSDK.Companion.init(this, appSecret, appid, userID, "1", oaid);
-//    }
+    /**
+     * 鱼丸盒子
+     */
+    public void initYwSdk() {
+        UserManager userManager = UserManager.getInstance();
+        String userID = userManager.getUserID();
+        if (!userManager.userIsLogin() || TextUtils.isEmpty(userID)) {
+            // 用户id为空 或 未登录 = 游客
+            userID = "0";
+        }
+
+        String appid = "";
+        String appSecret = "";
+        if (BuildConfig.DEBUG) {
+            appid = "1110";
+            appSecret = "4u8ainvdvlno0t6myvx47x163jehilw9";
+        } else {
+            appid = "1167";
+            appSecret = "h2mgozualsakzq65ch1snwibm4tqul6r";
+        }
+
+        String oaid = "";
+        try {
+            oaid = DevicesUtil.getOaid();
+            if (oaid == null) {
+                oaid = "";
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+
+        }
+
+        System.out.println("mcg __ oaid:" + oaid);
+
+        YwSDK.Companion.init(this, appSecret, appid, userID, "1", oaid);
+    }
 
     /**
      * 百度视频
      */
     private void initBaiduVedio() {
 //        BDVSDK.init(this, "124", "jd1DH9mVCt4XdgtAg77O", "Ejid*1CDZHI9umgV+C(tv4BXzdqgOt9Akg4797xO");
-
     }
 
     /**

highgold/app/src/main/java/com/mints/highgold/common/AppConfig.java

@@ -75,7 +75,7 @@ public class AppConfig {
     public static int interactionAdType = 0;
 
     /**
-     * banner显示类型  0-推啊
+     * banner显示类型  0-推啊 1-nice推
      */
     public static int bannerAdType = 0;
 

highgold/app/src/main/java/com/mints/highgold/ui/activitys/AwardActivity.java

 package com.mints.highgold.ui.activitys;
 
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -59,7 +56,6 @@ import java.util.Calendar;
 import java.util.HashMap;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -125,7 +121,6 @@ public class AwardActivity extends BaseActivity implements AwardView {
     private boolean isClickScreen = true; // 是否点击屏幕跳转广告
 
     private int netCoin = -1;
-    private ObjectAnimator animator;
     private UserTaskMsgBean userConfig;
     private BannerAdmanager bannerAdManager;
 
@@ -151,12 +146,6 @@ public class AwardActivity extends BaseActivity implements AwardView {
             ivBanner.setVisibility(View.GONE);
         } else {
             tvAwardHint.setVisibility(View.GONE);
-
-            ivBanner.setVisibility(View.GONE);
-            fsvAward.setVisibility(View.VISIBLE);
-            bannerAdManager = new BannerAdmanager(AwardActivity.this);
-            bannerAdManager.showBannerAd("", fsvAward);
-
             if (AppConfig.bannerAdType == 0) {
                 ivBanner.setVisibility(View.GONE);
                 fsvAward.setVisibility(View.VISIBLE);
@@ -170,7 +159,6 @@ public class AwardActivity extends BaseActivity implements AwardView {
                 ivBanner.setImageResource(R.mipmap.ic_award_banner);
                 AppConfig.bannerAdType = 0;
             }
-
         }
 
         initDataView();
@@ -251,11 +239,6 @@ public class AwardActivity extends BaseActivity implements AwardView {
             mTimer = null;
         }
 
-        if (animator != null) {
-            animator.cancel();
-            animator = null;
-        }
-
 //        ttNativeExpressManager.onTTAdDestroy();
 
         awardPresenter.detachView();
@@ -538,8 +521,6 @@ public class AwardActivity extends BaseActivity implements AwardView {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        // 背景光动画
-//        animator = loadAnim(ivAwardGuang);
         // 获取按键栏
         Utils.hideBottomUIMenu(this);
         // 开启3秒倒计时
@@ -770,17 +751,6 @@ public class AwardActivity extends BaseActivity implements AwardView {
 
     }
 
-
-    private ObjectAnimator loadAnim(ImageView view) {
-        ObjectAnimator mAnimator = ObjectAnimator.ofFloat(view, "rotation", 0f, 360f);
-        mAnimator.setDuration(1500);
-        mAnimator.setInterpolator(new LinearInterpolator());
-        mAnimator.setRepeatMode(ValueAnimator.RESTART);
-        mAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        mAnimator.start();
-        return mAnimator;
-    }
-
     /**
      * 加载优量汇激励视频
      */

highgold/app/src/main/java/com/mints/highgold/ui/fragment/MainFragment.java

@@ -20,6 +20,7 @@ import com.cmcm.cmgame.IAppCallback;
 import com.cmcm.cmgame.IGameAdCallback;
 import com.cmcm.cmgame.IGameExitInfoCallback;
 import com.cmcm.cmgame.IGamePlayTimeCallback;
+import com.component.dly.xzzq_ywsdk.YwSDK_WebActivity;
 import com.daimajia.androidanimations.library.Techniques;
 import com.daimajia.androidanimations.library.YoYo;
 import com.google.gson.JsonObject;
@@ -708,8 +709,6 @@ public class MainFragment extends BaseFragment
             }
         }
 
-        System.out.println("mcg __ 喝水 isMintegralInscreenFlag:" + AppConfig.isMintegralInscreenFlag);
-
         // 喝水时间
         if (data.getNextGetCoinTime() > 0) {
             wvWater.setTvDrinkBtnText("喝水打卡");