home page refact

app/src/main/java/com/kfzs/duanduan/utils/NumberFormatUtils.java

@@ -130,22 +130,26 @@ public class NumberFormatUtils {
      * @return
      */
     public static String retainMost2W(float bonus) {
+        return retainMost2W((double) bonus);
+    }
+
+    public static String retainMost2W(double bonus) {
         if (bonus < 1_0000f) {
             return NumberFormatUtils.retainMost2(bonus);
         } else if (bonus < 100_0000f) {
-            float number = bonus / 1_0000f;
+            double number = bonus / 1_0000f;
             return NumberFormatUtils.retainMost2(number) + "万";
         } else if (bonus < 10000_0000f) {
-            float number = bonus / 100_0000f;
+            double number = bonus / 100_0000f;
             return NumberFormatUtils.retainMost2(number) + "百万";
         } else if (bonus < 100_0000_0000f) {
-            float number = bonus / 10000_0000f;
+            double number = bonus / 10000_0000f;
             return NumberFormatUtils.retainMost2(number) + "亿";
         } else if (bonus < 10000_0000_0000f) {
-            float number = bonus / 100_0000_0000f;
+            double number = bonus / 100_0000_0000f;
             return NumberFormatUtils.retainMost2(number) + "百亿";
         } else {
-            float number = bonus / 10000_0000_0000f;
+            double number = bonus / 10000_0000_0000f;
             return NumberFormatUtils.retainMost2(number) + "万亿";
         }
     }

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

@@ -94,6 +94,7 @@ public class Release_task implements Serializable, MultiItemEntity {
     private int is_shop = 2;
     private int video_award = 2;  //完成看视频
     private double shop_amount = 0d;
+    private double vip_shop_amount = 0d;
     private double video_amount = 0d;
     private boolean auto_progress = false; //充值完成
 
@@ -117,6 +118,14 @@ public class Release_task implements Serializable, MultiItemEntity {
         this.is_shop = is_shop;
     }
 
+    public double getVip_shop_amount() {
+        return vip_shop_amount;
+    }
+
+    public void setVip_shop_amount(double vip_shop_amount) {
+        this.vip_shop_amount = vip_shop_amount;
+    }
+
     public int getVideo_award() {
         return video_award;
     }
@@ -420,7 +429,7 @@ public class Release_task implements Serializable, MultiItemEntity {
     }
 
     public String getCashOrWelfare() {
-        if(isShop()){
+        if (isShop()) {
             return "回报";
         } else {
             switch (cash_task) {
@@ -495,7 +504,11 @@ public class Release_task implements Serializable, MultiItemEntity {
 
     //所有的奖励金额展示内容
     public CharSequence getVipBonusText() {
-        return String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2W(getVip_bonus()));
+        if (isShop()) {
+            return String.format(Locale.CHINA, "会员：+%s经验值", NumberFormatUtils.retainMost2W(getVip_shop_amount() * 10000));
+        } else {
+            return String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2W(getVip_bonus()));
+        }
 //        return new SpannableSb().append(String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2(bonus+0.1)), R.dimen.text_size_10).checkAndBr()
 //                .append(String.format(Locale.CHINA, "+%s元", NumberFormatUtils.retainMost2(bonus)), R.dimen.text_size_1)
 //                .getSsb();
@@ -528,7 +541,11 @@ public class Release_task implements Serializable, MultiItemEntity {
      * @return
      */
     public String getRewardMsg() {
-        return String.format(Locale.CHINA, "+%s元%s", getBonusText(), getRewardTypeNameMsg());
+        if (isShop()) {
+            return String.format(Locale.CHINA, "+%s经验值", NumberFormatUtils.retainMost2W(getShop_amount() * 10000));
+        } else {
+            return String.format(Locale.CHINA, "+%s元%s", getBonusText(), getRewardTypeNameMsg());
+        }
     }
 
     /**
@@ -586,7 +603,11 @@ public class Release_task implements Serializable, MultiItemEntity {
 
     //获取福利的价值
     public CharSequence getWelfareValue() {
-        return new SpannableSb().append("价值：").append(String.format(Locale.CHINA, "¥%s", bonus), "#FD2D54").getSsb();
+        if (isShop()) {
+            return String.format(Locale.CHINA, "+%s经验值", shop_amount * 10000);
+        } else {
+            return String.format(Locale.CHINA, "+%s元", bonus);
+        }
     }
 
     //获取福利剩余时间

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

@@ -400,8 +400,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             task_detail_reward.setVisibility(View.VISIBLE);
             task_detail_cancel.setVisibility(View.GONE);
         }
-        ViewUtil.setVisibility(priceTv, !taskReleaseEty.isShop());
-        ViewUtil.setVisibility(item_money_vip_tv, !taskReleaseEty.isShop());
+//        ViewUtil.setVisibility(priceTv, !taskReleaseEty.isShop());
+//        ViewUtil.setVisibility(item_money_vip_tv, !taskReleaseEty.isShop());
         ViewUtil.setVisibility(task_detail_reward, !taskReleaseEty.isShop());
         ViewUtil.setVisibility(watch_video_bar, taskReleaseEty.getVideo_amount() > 0);
         ViewUtil.setVisibility(recharge_game_bar, taskEty.getBenchmark() == 4);

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

@@ -50,11 +50,11 @@ public class TryMakeMoneyact extends BaseActivity {
         is_succession = getIntent()
                 .getIntExtra(
                         "is_succession", 0);
-        if (is_succession == 1) {
-            title = "连续奖励";
-        } else {
+//        if (is_succession == 1) {
+//            title = "连续奖励";
+//        } else {
             title = "试玩赚钱";
-        }
+//        }
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, title).setTitleFinish(activity)
@@ -64,12 +64,12 @@ public class TryMakeMoneyact extends BaseActivity {
                 .setRightImgBotton(activity, R.drawable.index_download, view -> Jump2View.getInstance().goActDownloadManager(this));
 
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
-        mAdapter.add(FgtTryMakeMoney.newInstance(0), "");
-//        mAdapter.add(FgtTryMakeMoney.newInstance(2), titles[1]);
+        mAdapter.add(FgtTryMakeMoney.newInstance(0, 0), "普通任务");
+        mAdapter.add(FgtTryMakeMoney.newInstance(0, 1), "连续任务");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
 
-        indicator.setVisibility(View.GONE);
+//        indicator.setVisibility(View.GONE);
     }
 
     @Override
@@ -84,7 +84,7 @@ public class TryMakeMoneyact extends BaseActivity {
      * 获取is_succession，是否是连续任务
      */
     public int getIsSuccession() {
-        return is_succession;
+        return pager.getCurrentItem();
     }
 
     @Override

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

@@ -141,6 +141,15 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         return fgtTryMakeMoney;
     }
 
+    public static FgtTryMakeMoney newInstance(int type, int is_succession) {
+        FgtTryMakeMoney fgtTryMakeMoney = new FgtTryMakeMoney();
+        Bundle bundle = new Bundle();
+        bundle.putInt("type", type);
+        bundle.putInt("is_succession", is_succession);
+        fgtTryMakeMoney.setArguments(bundle);
+        return fgtTryMakeMoney;
+    }
+
     public static FgtTryMakeMoney newInstance(int type, String show_type) {
         FgtTryMakeMoney fgtTryMakeMoney = new FgtTryMakeMoney();
         Bundle bundle = new Bundle();
@@ -160,6 +169,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if (bundle != null) {
             about_to_begin = bundle.getInt("type", 0);
             show_type = bundle.getString("show_type", "");
+            is_succession = bundle.getInt("is_succession", 0);
             isFromHome = !TextUtils.isEmpty(show_type);
             per_page = isFromHome ? 100 : per_page;//主页直接加载100条数据，不然会卡，待解决卡的问题后修改回去
             switch (show_type){
@@ -200,7 +210,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             return;
         }
         if (activity instanceof TryMakeMoneyact) {//试玩任务、连续任务
-            is_succession = ((TryMakeMoneyact) activity).getIsSuccession();
+//            is_succession = ((TryMakeMoneyact) activity).getIsSuccession();
             task_type = "-1";
             isGameTask = false;
         } else if (activity instanceof GamemakeMoneyAct) {//游戏任务

app/src/main/res/layout/item_hp_refresh_welfare.xml

@@ -62,7 +62,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="17dp"
         android:text="价值：￥566"
-        android:textColor="#ff333333"
+        android:textColor="#FF2D4B"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/item_song_iv"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/try_makemoney_act_layout.xml

@@ -18,20 +18,23 @@
             app:tabGravity="fill"
             app:tabIndicatorColor="#4bc1fe"
             app:tabMode="fixed"
+            app:tabIndicatorHeight="4dp"
+            app:tabIndicatorFullWidth="false"
             app:tabSelectedTextColor="#4bc1fe"
             app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
             app:tabTextColor="#444444" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/pager"
+            android:layout_below="@+id/show_flow_layout"
             android:layout_width="match_parent"
-            android:layout_marginTop="40dp"
             android:layout_height="match_parent"/>
         <LinearLayout
             android:id="@+id/show_flow_layout"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_gravity="center_horizontal"
+            android:layout_below="@id/indicator"
             android:gravity="center"
             android:orientation="horizontal"
             android:paddingEnd="@dimen/content_padding_10"