版本更新为3.3.2；

3.3.2中新功能中代码与界面优化

app/src/main/java/com/sheep/gamegroup/model/entity/CommendApp.java

@@ -110,7 +110,7 @@ public class CommendApp {
 
     //可以切换到抢任务弹出框
     public boolean needChange() {
-        return need && !hasNextShow();
+        return !need && !hasNextShow();
     }
     public static final int SHOW_NONE = 0;//初始状态
     public static final int SHOW_GAME = 1;//显示游戏

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -2264,13 +2264,19 @@ public class CommonUtil {
         }
         UMConfigUtils.onEvent(UMConfigUtils.Event.BANNER_CLICK_HORIZONTAL);
         UMConfigUtils.IdEvent.BANNER.commit(clickedGameObj.getId());
+        Ext ext;
         switch (clickedGameObj.getType()) {// 0,类型 1跳转试玩赚钱、2单个任务详情、3信用卡办理、4 H5页面、5 微信二维码任务
             case 1:
                 Jump2View.getInstance()
                         .goTryplayView(activity, null);
                 break;
             case 2:
-                Jump2View.getInstance().goTaskDetailView(activity, EntityUtils.getExtInfo(clickedGameObj.getExt()).getId());
+                ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
+                if(ext == null){
+                    G.showToast(R.string.error_data);
+                    return;
+                }
+                Jump2View.getInstance().goTaskDetailView(activity, ext.getId());
                 break;
             case 3:
                 Jump2View.getInstance()
@@ -2278,23 +2284,21 @@ public class CommonUtil {
                 break;
             case 4:
                 if (!TextUtils.isEmpty(clickedGameObj.getObjects())) {
-                    Ext ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
+                    ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
+                    if(ext == null){
+                        G.showToast(R.string.error_data);
+                        return;
+                    }
                     if (ext.getTitle() == null)//外部浏览器加载H5
                         Jump2View.getInstance().goWeb(activity, ext.getUrl());
                     else//内部WebView加载H5
                         Jump2View.getInstance().goWeb(activity, ext.getUrl(), ext.getTitle());
-
                 }
 
                 break;
             case 5:
                 if (!TextUtils.isEmpty(clickedGameObj.getObjects())) {
-
-                    Jump2View.getInstance()
-                            .goWeb(
-                                    activity,
-                                    clickedGameObj.getObjects(),
-                                    "微信二维码辅助好友注册任务");
+                    Jump2View.getInstance().goWeb(activity, clickedGameObj.getObjects(), "微信二维码辅助好友注册任务");
                 }
 
                 break;
@@ -2306,12 +2310,10 @@ public class CommonUtil {
                 Jump2View.getInstance().goSignCardAct(activity, null);
                 break;
             case 7://玩转游戏
-                Jump2View.getInstance()
-                        .goMainGame(activity);
+                Jump2View.getInstance().goMainGame(activity);
                 break;
             case 11://游戏任务
-                Jump2View.getInstance()
-                        .goGameMakeMoney(activity, 0);
+                Jump2View.getInstance().goGameMakeMoney(activity, 0);
                 break;
             case 12://闲玩任务
                 Jump2View.getInstance().goXianwanWeb(activity, null, null);
@@ -2326,16 +2328,31 @@ public class CommonUtil {
                 Jump2View.getInstance().goXiaomiGameList(activity, null);
                 break;
             case JUMP_GMAE://游戏详情
-                Jump2View.getInstance().goPlayGameDetail(activity, EntityUtils.getExtInfo(clickedGameObj.getExt()).getId());
+                ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
+                if(ext == null){
+                    G.showToast(R.string.error_data);
+                    return;
+                }
+                Jump2View.getInstance().goPlayGameDetail(activity, ext.getId());
                 break;
             case JUMP_FIND_RECOMMEND://发现--推荐
             case JUMP_FIND_ACT://发现--活动
             case JUMP_FIND_INFORMATION://webView资讯
             case JUMP_FIND_GMAE://发现中的游戏详情
-                Jump2View.getInstance().goFindItem(activity, EntityUtils.getExtInfo(clickedGameObj.getExt()).getId());
+                ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
+                if(ext == null){
+                    G.showToast(R.string.error_data);
+                    return;
+                }
+                Jump2View.getInstance().goFindItem(activity, ext.getId());
                 break;
             case JUMP_WATCH_FOCUS://看点
-                Jump2View.getInstance().goWatchFocus(activity, EntityUtils.getExtInfo(clickedGameObj.getExt()).getId());
+                ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
+                if(ext == null){
+                    G.showToast(R.string.error_data);
+                    return;
+                }
+                Jump2View.getInstance().goWatchFocus(activity, ext.getId());
                 break;
             default:
                 G.showToast(R.string.coming_soon);

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -214,7 +214,7 @@ public class TestUtil {
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
                             case "会长推广游戏":
-                                new DialogGameOrTaskOrGift(activity, "1385").showDialog();
+                                new DialogGameOrTaskOrGift(activity, "1106204266").showDialog();
                                 break;
                             case "移动积分兑换":
                                 Jump2View.getInstance().goActExchangeCMCC(activity);

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogGameOrTaskOrGift.java

@@ -54,10 +54,12 @@ public class DialogGameOrTaskOrGift {
     private TextView dialog_tip;
     private View dialog_amount_container;
     private TextView dialog_amount_tv;
+    private View dialog_line;
     private TextView dialog_gift_tv;
     private TextView dialog_gift_code_tv;
     private TextView dialog_gift_info_tv;
     private TextView dialog_btn_left;
+    private View dialog_btn_center;
     private TextView dialog_btn_right;
 
     // End Of Content View Elements
@@ -67,6 +69,7 @@ public class DialogGameOrTaskOrGift {
         ViewUtil.setDefaultText(dialog_name_tv);
         ViewUtil.setDefaultText(dialog_gift_tv);
         ViewUtil.setVisibility(dialog_amount_tv, false);
+        ViewUtil.setVisibility(dialog_line, false);
         ViewUtil.setVisibility2(dialog_gift_code_tv, false);
         ViewUtil.setVisibility2(dialog_gift_info_tv, false);
         dialog_btn_left.setText("换一个");
@@ -88,6 +91,7 @@ public class DialogGameOrTaskOrGift {
                 final GiftBagApp giftBagApp = commendApp.getHas_gift_bag().get(0);
                 final GiftBag giftBag = giftBagApp.getGift_bag();
                 ViewUtil.setVisibility(dialog_amount_tv, false);
+                ViewUtil.setVisibility(dialog_line, false);
                 ViewUtil.setVisibility2(dialog_gift_code_tv, giftBagApp.isReceived());
                 ViewUtil.setVisibility2(dialog_gift_info_tv, true);
                 GlideImageLoader.setGameImage(dialog_iv, commendApp.getApp().getIcon());
@@ -133,6 +137,7 @@ public class DialogGameOrTaskOrGift {
                 }
             } else if (commendApp.isShow(CommendApp.SHOW_TASK)) {
                 ViewUtil.setVisibility(dialog_amount_tv, true);
+                ViewUtil.setVisibility(dialog_line, true);
                 ViewUtil.setVisibility2(dialog_gift_code_tv, false);
                 ViewUtil.setVisibility2(dialog_gift_info_tv, false);
                 GlideImageLoader.setGameImage(dialog_iv, commendApp.getRelease_task().getTask().getIcon());
@@ -148,6 +153,7 @@ public class DialogGameOrTaskOrGift {
                 });
             } else if (commendApp.isShow(CommendApp.SHOW_GAME)) {
                 ViewUtil.setVisibility(dialog_amount_tv, false);
+                ViewUtil.setVisibility(dialog_line, false);
                 ViewUtil.setVisibility2(dialog_gift_code_tv, false);
                 ViewUtil.setVisibility2(dialog_gift_info_tv, false);
                 GlideImageLoader.setGameImage(dialog_iv, commendApp.getApp().getIcon());
@@ -177,10 +183,12 @@ public class DialogGameOrTaskOrGift {
         dialog_tip = (TextView) view.findViewById(R.id.dialog_tip);
         dialog_amount_container = view.findViewById(R.id.dialog_amount_container);
         dialog_amount_tv = (TextView) view.findViewById(R.id.dialog_amount_tv);
+        dialog_line =  view.findViewById(R.id.dialog_line);
         dialog_gift_tv = (TextView) view.findViewById(R.id.dialog_gift_tv);
         dialog_gift_code_tv = (TextView) view.findViewById(R.id.dialog_gift_code_tv);
         dialog_gift_info_tv = (TextView) view.findViewById(R.id.dialog_gift_info_tv);
         dialog_btn_left = (TextView) view.findViewById(R.id.dialog_btn_left);
+        dialog_btn_center = view.findViewById(R.id.dialog_btn_center);
         dialog_btn_right = (TextView) view.findViewById(R.id.dialog_btn_right);
     }
 
@@ -222,6 +230,7 @@ public class DialogGameOrTaskOrGift {
             ViewUtil.setVisibility(dialog_tip, true);//显示文字【当前现金任务剩余%s元】
             ViewUtil.setVisibility(dialog_iv, false);//隐藏应用图标
             ViewUtil.setVisibility(dialog_btn_left, false);//隐藏应用图标
+            ViewUtil.setVisibility(dialog_btn_center, false);//隐藏应用图标
             ViewUtil.setVisibility(dialog_name_tv, false);//隐藏应用名字
             ViewUtil.setVisibility2(dialog_amount_container, false);//不显示礼包和现金的父控件
             ViewUtil.setVisibility2(dialog_gift_code_tv, false);//不显示礼包码

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.2.7
-VERSION_CODE=3002007
+VERSION_NAME=3.3.2
+VERSION_CODE=3003002
 ANDROID_COMPILE_SDK_VERSION=28
 ANDROID_BUILD_TOOLS_VERSION=28.0.3
 ANDROID_MIN_SDK_VERSION=18