商城跳转

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

@@ -172,4 +172,13 @@ public class Advertising implements Serializable{
     public boolean isImage() {
         return display_type == 1;
     }
+
+
+
+    //    //默认类型，服务器数据无此类型，只作为客户端自己直接添加使用，只包含内容
+    public static final int TYPE_MSG = 0;
+    //标题与文本与视频
+    public static final int TYPE_VIDEO = 2;
+    //标题与文本与图片
+    public static final int TYPE_IMG = 1;
 }

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

@@ -417,4 +417,14 @@ public class UserEntity implements Serializable {
     public boolean isKfzsPackageUser() {
         return !TextUtils.isEmpty(parent_code) || (create_time_line < 2) || (package_cate == 1);
     }
+
+    //该用户已经完成了所有的新手任务
+    public boolean alreadyFinishAllNewTask() {
+        return getIs_new() == 2;
+    }
+
+    //已经兑换过商城做事券
+    public boolean alreadyExchangeCoupon() {
+        return false;
+    }
 }

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

@@ -2112,7 +2112,7 @@ public class CommonUtil {
         if (userEntity == null) {
             return false;
         }
-        if (userEntity.getIs_new() == 2) { //1新用户 2老用户
+        if (userEntity.alreadyFinishAllNewTask()) { //1新用户 2老用户
             return false;
         } else {
             return true;

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

@@ -53,4 +53,5 @@ public class IDConstant {
 
     //TODO 这里移动积分兑换的id需要替换
     public static final int JUMP_EXCHANGE_CMCC = 1000025;//移动积分兑换
+    public static final int JUMP_EXCHANGE_COUPON = 1000026;//绵羊币兑换商城优惠券
 }

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

@@ -1496,21 +1496,36 @@ public class Jump2View {
         if (SysAppUtil.isNewSmallSheep()) {//新版本只显示引导页面，不展示弹窗和开屏广告
             return;
         }
-        SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(2)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        Advertising advertising = baseMessage.getData(Advertising.class);
-                        ViewUtil.showHalfScreenAd(activity, advertising, container);
-                    }
+        CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
+            @Override
+            public void call(UserEntity userEntity) {
+                if(userEntity.alreadyFinishAllNewTask() && !userEntity.alreadyExchangeCoupon()){//已经完成所有新手任务且没有兑换过优惠券时，显示商城优惠券
+                    Advertising advertising = new Advertising();
+                    advertising.setName("兑换商城优惠券，优惠多多");
+//                    advertising.setDesc("点击兑换商城优惠券，优惠多多");
+                    advertising.setDisplay_type(Advertising.TYPE_IMG);
+                    advertising.setDisplay_src(ViewUtil.getNetImgByName("homepage_xinshourw"));
+                    advertising.setLinkType(IDConstant.JUMP_EXCHANGE_COUPON);
+                    ViewUtil.showHalfScreenAd(activity, advertising, container);
+                } else {
+                    SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(2)
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                                @Override
+                                public void onNext(BaseMessage baseMessage) {
+                                    Advertising advertising = baseMessage.getData(Advertising.class);
+                                    ViewUtil.showHalfScreenAd(activity, advertising, container);
+                                }
 
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        tryShowReservation(activity);
-                    }
-                });
+                                @Override
+                                public void onError(BaseMessage baseMessage) {
+                                    tryShowReservation(activity);
+                                }
+                            });
+                }
+            }
+        });
     }
 
     public void tryShowReservation(final Activity activity) {

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

@@ -234,7 +234,7 @@ public class TestUtil {
     }
 
     public static boolean isSheep() {
-        return TextUtils.equals("sheep", BuildConfig.FLAVOR) && !BuildConfig.DEBUG;
+        return TextUtils.equals("sheep", BuildConfig.FLAVOR) && !isDev();
     }
 
     public static boolean isTest() {

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -28,6 +28,7 @@ import com.sheep.gamegroup.model.entity.RouserArticlesEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.IDConstant;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
@@ -432,6 +433,10 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                 case JUMP_WATCH_FOCUS://看点
                     Jump2View.getInstance().goWatchFocus(activity, advertising.getLink_id());
                     break;
+                case IDConstant.JUMP_EXCHANGE_COUPON://绵羊币兑换商城优惠券
+                    //TODO 调用接口兑换商城优惠券， 然后跳转到对应的商城h5界面
+                    Jump2View.getInstance().goWeb(activity, "http://www.17xmy.com/", advertising.getName());
+                    break;
             }
         }
     }

app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java

@@ -136,7 +136,7 @@ public class NewbieTaskAdp extends BaseAdapter {
                     if (BuildConfig.DEBUG) {
                         G.showToast("测试：服务器返回数据错误，这个任务可能没有完成？");
                     }
-                    if(TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
+//                    if(TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
                         isShow(context);
                     break;
                 case 6://加入官方QQ群

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -1597,7 +1597,9 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             }
             SpUtils.saveFirst("first_invitation" + userEntity.getId(), true);//第一次登录成功后保存起来，下次进来就不再弹新人红包
             if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
-                isShowRedPackageWithCode();//邀请红包
+                if(TestUtil.isLTVersion3_4_5()) {//新版本中不显示填写邀请码的界面
+                    isShowRedPackageWithCode();//邀请红包
+                }
             }
 
         }