1.1.7版本发布

highgold/app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.mints.highgold"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 17
-        versionName "1.1.6"
+        versionCode 18
+        versionName "1.1.7"
         flavorDimensions "default"
 
         // dex突破65535的限制
@@ -26,20 +26,11 @@ android {
         //语言资源，只支持中文
         resConfigs "zh"
 
-//        ndk {
-//            //选择要添加的对应cpu类型的.so库。
-//            abiFilters 'armeabi', 'armeabi-v8a', 'x86'
-//            // 还可以添加 'x86', 'x86_64', 'mips', 'mips64', 'armeabi-v7a'
-//        }
-
         //配置so文件
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
         }
 
-        // 猎豹游戏 由于项目内针对5.1以下机型做了x5优化，x5在64位手机上需要让AP以32位模式运行，所以需要指定abi
-//        ndk { abiFilters "armeabi-v7a" }
-
         manifestPlaceholders = [CHANNEL_NAME_VALUE: "mints",
                                 JPUSH_PKGNAME     : applicationId,
                                 JPUSH_APPKEY      : RELEASE_JPUSH_KEY,
@@ -47,7 +38,6 @@ android {
                                 JPUSH_CHANNEL     : "mints",
                                 SHARE_KEY         : RELEASE_SHARESDK_KEY,
                                 SHARE_SECRET      : RELEASE_SHARESDK_SECRET]
-
     }
 
     compileOptions {
@@ -239,9 +229,9 @@ dependencies {
     // 移动安全联盟
     implementation(name: 'msa_mdid_1.0.13', ext: 'aar')
     // 猎豹游戏
-    implementation(name: 'cmgame-sdk-tt2203-1.2.2', ext: 'aar')
-    implementation(name: 'x5fit-1.2.2', ext: 'aar')
-    implementation(name: 'gdtfit-1.2.2', ext: 'aar')
+    implementation(name: 'cmgame-sdk-tt2203-2.0.3', ext: 'aar')
+    implementation(name: 'x5fit-2.0.3', ext: 'aar')
+    implementation(name: 'gdtfit-2.0.3', ext: 'aar')
     implementation files("libs/qq_x5.jar")
 
     // 鱼丸盒子

highgold/app/src/main/java/com/mints/highgold/manager/LiebaoManager.java

@@ -10,9 +10,7 @@ import com.cmcm.cmgame.CmGameSdk;
 import com.cmcm.cmgame.gamedata.CmGameAppInfo;
 import com.mints.highgold.BuildConfig;
 import com.mints.highgold.MintsApplication;
-import com.mints.highgold.common.Constant;
 import com.mints.highgold.utils.CmGameImageLoader;
-import com.mints.highgold.utils.SPUtil;
 
 /**
  * 描述：猎豹游戏
@@ -34,7 +32,6 @@ public class LiebaoManager {
 
     private static LiebaoManager _inst;
     private Context context;
-    private SPUtil spUtil;
 
     public static LiebaoManager getInstance() {
         if (_inst != null) {
@@ -51,7 +48,6 @@ public class LiebaoManager {
 
     private void init() {
         context = MintsApplication.getContext();
-        spUtil = SPUtil.getInstance(context);
     }
 
 
@@ -100,7 +96,12 @@ public class LiebaoManager {
         gdtAdInfo.setAppId(YlhAdManager.YLH_AD_VEDIO_APPID);               // 广点通的APPID
         // 游戏内广告场景；
         gdtAdInfo.setRewardVideoId(YlhAdManager.YLH_AD_VEDIO_GAME_POSTID); // 激励视频
+        gdtAdInfo.setGameLoadInterId(YlhAdManager.YLH_AD_INTERSTITIALAD_LIEBAO);//游戏加载中的插屏
+        gdtAdInfo.setBannerId(YlhAdManager.YLH_AD_BANNER_LIEBAO); // banner广告
+        gdtAdInfo.setPlayGameInterId(YlhAdManager.YLH_AD_INTERSTITIALAD_LIEBAO);//游戏进行中关卡插屏
         cmGameAppInfo.setGdtAdInfo(gdtAdInfo);
+
+
         // 【设置广点通和穿山甲广告占比】
         // 概率设置规则，如下：
         // 0： 全部使用穿山甲广告
@@ -108,20 +109,19 @@ public class LiebaoManager {
         // 40：穿山甲广告命中概率是60%，广点通是40%，如果一方没广告，则用另一方补量。
         cmGameAppInfo.setRewardAdProbability(80);        // 默认值为0，全部采用穿山甲激励视频广告
 
+
+        // 戏关卡间插屏广告概率设置建议，代码默认值为20
+        // 1)80%流量给穿山甲，20%给优量汇，原因:穿山甲全屏视频广告收益更高，优量汇收益低但体验 好
+        // 2)概率云端控制，媒体自行下发2种广告源占比
+        cmGameAppInfo.setExpressInterAdProbability(20);
+
         // 功能默认开启，可使用如下方法来关闭
 //        cmGameAppInfo.setShowLogin(false);
 
-        // 开启游戏挑战和福利功能，默认开启
-        try {
-            cmGameAppInfo.setRewarded(spUtil.getBoolean(Constant.LIEBAO_GAME_GIFT, false));
-        } catch (Exception e) {
-            cmGameAppInfo.setRewarded(false);
-        }
         // 退出弹窗确认窗口，但不需要游戏推荐内容，该场景使用于网赚场景，因为需要退出后立即给用户奖励。
         cmGameAppInfo.setQuitGameConfirmRecommand(false);
         // 游戏退出确认弹窗，增加自定义文案，颜色也可以根据自己需要调整
         cmGameAppInfo.setQuitGameConfirmTip("<font color=\"#ef0d12\">主人，下次可在“首页”最底部“游戏赚”找到我哦~</font>");
-
         CmGameSdk.initCmGameSdk((MintsApplication) this.context, cmGameAppInfo, new CmGameImageLoader(), BuildConfig.DEBUG);
     }
 
@@ -153,16 +153,6 @@ public class LiebaoManager {
         CmGameSdk.clearCmGameAccount();
     }
 
-    /**
-     * 游戏是否存在，true为存在
-     *
-     * @param gameId
-     * @return
-     */
-    public boolean hasGame(String gameId) {
-        return CmGameSdk.hasGame(gameId);
-    }
-
     /**
      * 调起指定游戏
      *

highgold/app/src/main/java/com/mints/highgold/manager/YlhAdManager.java

@@ -23,4 +23,8 @@ public class YlhAdManager {
     public static final String YLH_AD_INTERSTITIALAD_REDBOX = "4081004968252005";//抢红包
     public static final String YLH_AD_INTERSTITIALAD_FRIENDS = "4051600998851098";//邀请好友
     public static final String YLH_AD_INTERSTITIALAD_GAME = "3021005957922121";//游戏赚
+    public static final String YLH_AD_INTERSTITIALAD_LIEBAO = "4091610929319085";//猎豹
+
+    /* banner */
+    public static final String YLH_AD_BANNER_LIEBAO = "1091518939518038";//猎豹
 }

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

@@ -3,7 +3,6 @@ package com.mints.highgold.ui.fragment;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.widget.TextView;
 
 import com.cmcm.cmgame.CmGameSdk;
@@ -13,7 +12,6 @@ import com.cmcm.cmgame.IGameAdCallback;
 import com.cmcm.cmgame.IGameExitInfoCallback;
 import com.cmcm.cmgame.IGameListReadyCallback;
 import com.cmcm.cmgame.IGamePlayTimeCallback;
-import com.cmcm.cmgame.IGameStateCallback;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.mints.highgold.R;
@@ -21,9 +19,7 @@ import com.mints.highgold.ad.inscreen.InsertScreenAdManager;
 import com.mints.highgold.common.AppConfig;
 import com.mints.highgold.common.Constant;
 import com.mints.highgold.manager.UserManager;
-import com.mints.highgold.mvp.model.DrawcashBean;
 import com.mints.highgold.mvp.model.MyInfo;
-import com.mints.highgold.mvp.model.UserTaskMsgBean;
 import com.mints.highgold.mvp.presenters.GamePresenter;
 import com.mints.highgold.mvp.views.GameView;
 import com.mints.highgold.ui.activitys.AwardActivity;
@@ -49,7 +45,6 @@ public class GameFragment extends BaseFragment
         IGameAdCallback,
         IGameAccountCallback,
         IGameExitInfoCallback,
-        IGameStateCallback,
         IGameListReadyCallback {
 
     private static final String TAG = GameFragment.class.getSimpleName();
@@ -155,7 +150,6 @@ public class GameFragment extends BaseFragment
         CmGameSdk.removeGamePlayTimeCallback();
         CmGameSdk.removeGameAdCallback();
         CmGameSdk.removeGameAccountCallback();
-        CmGameSdk.removeGameStateCallback();
         CmGameSdk.removeGameExitInfoCallback();
         CmGameSdk.removeGameListReadyCallback();
 
@@ -197,9 +191,6 @@ public class GameFragment extends BaseFragment
         // 该功能使用场景：媒体利用游戏数据，和app的功能结合做运营活动，比如：某每天前50名，得到某些奖励
         CmGameSdk.setGameExitInfoCallback(this);
 
-        // 游戏界面的状态信息回调，1 onPause; 2 onResume
-        CmGameSdk.setGameStateCallback(this);
-
         // 游戏列表渲染完成的回调：可以在游戏列表加载完成加一个自定义的loading，收到加载完成回调后loading消失
         CmGameSdk.setGameListReadyCallback(this);
     }
@@ -390,13 +381,6 @@ public class GameFragment extends BaseFragment
 //        }
     }
 
-    /**
-     * 游戏界面的状态信息回调，1 onPause; 2 onResume   finish
-     */
-    @Override
-    public void gameStateCallback(int nState) {
-    }
-
     /**
      * 游戏列表渲染完成的回调：可以在游戏列表加载完成加一个自定义的loading，收到加载完成回调后loading消失   finish
      */

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

@@ -383,7 +383,7 @@ public class MainFragment extends BaseFragment
                             .subscribe(granted -> {
                                 if (granted) {
                                     String gameId = userConfig.getGameHomeId();
-                                    if (!TextUtils.isEmpty(gameId) && liebaoManager.hasGame(gameId)) {
+                                    if (!TextUtils.isEmpty(gameId) ) {
                                         liebaoManager.startH5Game(gameId);
                                     } else {
                                         boolean main = getActivity() instanceof MainActivity;
@@ -1068,7 +1068,7 @@ public class MainFragment extends BaseFragment
                         switch (status) {
                             case 0:
                             case 2:
-                                if (!TextUtils.isEmpty(gameId) && liebaoManager.hasGame(gameId)) {
+                                if (!TextUtils.isEmpty(gameId) ) {
                                     liebaoManager.startH5Game(gameId);
                                 } else {
                                     boolean main = getActivity() instanceof MainActivity;
@@ -1092,7 +1092,7 @@ public class MainFragment extends BaseFragment
                                 readyGo(AwardActivity.class, bundle);
                                 break;
                             default:
-                                if (!TextUtils.isEmpty(gameId) && liebaoManager.hasGame(gameId)) {
+                                if (!TextUtils.isEmpty(gameId) ) {
                                     liebaoManager.startH5Game(gameId);
                                 } else {
                                     boolean main = getActivity() instanceof MainActivity;

highgold/app/src/main/res/layout/activity_wx_login.xml

@@ -39,6 +39,7 @@
         android:textSize="14sp" />
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/tv_jpush_login"
         android:layout_width="match_parent"
         android:layout_height="86pt"