任务列表界面修改

app/src/main/java/com/sheep/gamegroup/helper/TaskHelper.java

@@ -376,37 +376,38 @@ public class TaskHelper {
      * @param taskReleaseEty
      */
     public static void setTaskTypeText(TextView textView, TaskReleaseEty taskReleaseEty) {
+        textView.setVisibility(View.VISIBLE);
         String[] textColor = getTaskTypeTextColor(taskReleaseEty.getTask());
         ViewUtil.setColorMapText(textView, String.format(Locale.CHINA, "%s", textColor[0]), textColor[0], textColor[1]);
-        textView.setBackgroundResource(getTaskTypeTextBg(taskReleaseEty.getTask()));
+        textView.setBackgroundResource(R.drawable.shape_blue_stroke_rectangle_no_lb);
         textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9);
         int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
         textView.setPadding(4*padding, padding, 4*padding, padding);
     }
-    //    private int task_type = 1;// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1002平台游戏，1003 腾讯游戏，1004 小米游戏
-    private static String[] getTaskTypeTextColor(TaskEty task) {
-        switch (task.getTask_type()){
-            case 1002:
-            case 1003:
-            case 1004:
-                return new String[]{"游戏任务", "#F81B5F"};
-            case 1000:
-                return new String[]{"连续任务", "#2FA255"};
-            default:
-                return new String[]{"试玩任务", "#FFA21C"};
-        }
+    /**
+     * 设置游戏标识文本，如：现金，福利
+     * @param textView
+     * @param taskReleaseEty
+     */
+    public static void setTaskTagText(TextView textView, TaskReleaseEty taskReleaseEty) {
+        textView.setVisibility(View.VISIBLE);
+        ViewUtil.setColorMapText(textView, String.format(Locale.CHINA, "%s", taskReleaseEty.getCashOrWelfare()), taskReleaseEty.getCashOrWelfare(), "#FD2D54");
+        textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9);
+        int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
+        textView.setPadding(4*padding, padding, 4*padding, padding);
     }
     //    private int task_type = 1;// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1002平台游戏，1003 腾讯游戏，1004 小米游戏
-    private static int getTaskTypeTextBg(TaskEty task) {
+    private static String[] getTaskTypeTextColor(TaskEty task) {
         switch (task.getTask_type()){
             case 1002:
             case 1003:
             case 1004:
-                return R.drawable.shape_green_stroke_rectangle;
+                return new String[]{"游戏任务", "#4889FF"};//已经修改为一种颜色了
             case 1000:
-                return R.drawable.shape_red_stroke_rectangle;
+                return new String[]{"连续任务", "#4889FF"};
             default:
-                return R.drawable.shape_yellow_stroke_rectangle;
+                return new String[]{"试玩任务", "#4889FF"};
         }
     }
 

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

@@ -17,6 +17,7 @@ public class TaskReleaseEty implements Serializable{
     private String deadline;// 0,
     private String duration;// 0,
     private int id;// 0,
+    private int cash_task;// 0,
     private String last_num;// 0,
     private String name;//private String string",
     private String online_time;// 0,
@@ -243,12 +244,30 @@ public class TaskReleaseEty implements Serializable{
         this.task = task;
     }
 
+    public int getCash_task() {
+        return cash_task;
+    }
+
+    public void setCash_task(int cash_task) {
+        this.cash_task = cash_task;
+    }
 
     @Override
     public boolean equals(Object obj) {
         return obj instanceof TaskReleaseEty && ((TaskReleaseEty) obj).getId() == id;
     }
 
+
+
+    public String getCashOrWelfare(){
+        switch (cash_task){
+            case 2:
+                return "福利";
+            case 1:
+            default:
+                return "现金";
+        }
+    }
     /**
      * 任务是否下线
      * @return

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

@@ -1,8 +1,10 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.app.Activity;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
+import android.view.View;
 
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.fragment.FgtCreditCardProgressQuery;
@@ -10,8 +12,10 @@ import com.kfzs.duanduan.fragment.FgtCreditCardTaskList;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.CreditCardProgressQuery;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
@@ -43,9 +47,17 @@ public class ActCreditCardTaskList extends AbsChooseImageActivity {
 
     @Override
     public void initView() {
+        final Activity activity = this;
         TitleBarUtils.getInstance()
                 .setTitle(this,"办卡赚钱")
-                .setTitleFinish(this);
+                .setTitleFinish(this)
+                .setRightImgBotton(activity, R.mipmap.question_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
+                                .setMsg("该栏目为现金任务，参与好友提成。"));
+                    }
+                });
 
         mAdapter = new GiftpackListAdapter(getSupportFragmentManager(), getApplicationContext());
         mAdapter.add(new FgtCreditCardTaskList(), "任务列表");

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

@@ -65,22 +65,19 @@ public class ActGameAgencyRecharge extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setTitleFinish(activity)
                 .setTitle(activity, "游戏充值")
-                .setShowRightTwoBtn(activity,
-                        R.mipmap.question_black_img,
-                        R.mipmap.search_black_img,
-                        new View.OnClickListener() {//问号
-                            @Override
-                            public void onClick(View v) {
-                                GAME_INSTEAD_OF_RECHARGE_HELP.onEvent();
-                                ViewUtil.showMsgDialog(activity, "充值请填写正确的游戏充值账号，角色信息，其他充值问题请联系客服。","充值帮助");
-                            }
-                        },
-                        new View.OnClickListener() {//搜索
-                            @Override
-                            public void onClick(View v) {
-                                Jump2View.getInstance().goGameSearch(activity, null);
-                            }
-                        });
+                .setRightSecondBtn(activity, R.mipmap.search_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Jump2View.getInstance().goGameSearch(activity, null);
+                    }
+                })
+                .setRightImgBotton(activity, R.mipmap.question_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        GAME_INSTEAD_OF_RECHARGE_HELP.onEvent();
+                        ViewUtil.showMsgDialog(activity, "充值请填写正确的游戏充值账号，角色信息，其他充值问题请联系客服。","充值帮助");
+                    }
+                });
         setValue();//gridview data
         gridviewV();
     }

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.view.View;
 
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
@@ -13,9 +14,11 @@ import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.AppDownloadListener;
 import com.mdad.sdk.mdsdk.RewardListener;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -54,7 +57,14 @@ public class ActMiDong extends BaseActivity {
         activity = this;
         TitleBarUtils.getInstance()
                 .setTitle(activity, "幂动任务")
-                .setTitleFinish(activity);
+                .setTitleFinish(activity)
+                .setRightImgBotton(activity, R.mipmap.question_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
+                                .setMsg("该栏目为现金任务，不参与好友提成。"));
+                    }
+                });
     }
 
     @Override

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

@@ -12,10 +12,12 @@ import android.webkit.WebViewClient;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DeviceIDUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.WebviewJs;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -65,6 +67,13 @@ public class ActXinwanWeb extends BaseCompatActivity {
                             activity.finish();
                         }
                     }
+                })
+                .setRightImgBotton(activity, R.mipmap.question_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
+                                .setMsg("该栏目为现金任务，不参与好友提成。"));
+                    }
                 });
         tv_next.setVisibility(View.GONE);
         if(xianWanEntity == null){

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

@@ -14,10 +14,12 @@ import android.widget.LinearLayout;
 import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.AdpTrymakemoneyTabGridview;
 import com.sheep.gamegroup.view.fragment.FgtMyGame;
@@ -76,6 +78,13 @@ public class GamemakeMoneyAct extends BaseActivity {
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, title).setTitleFinish(activity)
+                .setRightSecondBtn(activity, R.mipmap.question_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
+                                .setMsg("该栏目为日常福利，不可提现，不参与好友提成。"));
+                    }
+                })
                 .setRightImgBotton(activity, R.drawable.index_download, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {

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

@@ -82,6 +82,13 @@ public class SignCardAct extends BaseActivity implements SignCardContract.View {
                 .getInstance()
                 .setTitle(activity, "每日打卡")
                 .setTitleFinish(activity)
+                .setRightSecondBtn(activity, R.mipmap.question_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
+                                .setMsg("该栏目为现金任务，不参与好友提成。"));
+                    }
+                })
                 .setRightBotton(activity, "战绩", 0, new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

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

@@ -10,7 +10,9 @@ import android.view.View;
 import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
@@ -60,6 +62,13 @@ public class TryMakeMoneyact extends BaseActivity {
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, title).setTitleFinish(activity)
+                .setRightSecondBtn(activity, R.mipmap.question_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("温馨提示").setBtnLeftText("我知道了")
+                                .setMsg("该栏目为现金任务，参与好友提成。"));
+                    }
+                })
                 .setRightImgBotton(activity, R.drawable.index_download, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {

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

@@ -570,15 +570,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }
                 viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName() + "");
-                switch (from) {
-                    case 1://来自主页
-                        TaskHelper.setTaskTypeText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
-                        TaskHelper.setNumText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
-                        break;
-                    default:
-                        TaskHelper.setNumText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
-                        break;
-                }
+                setCommonViewData(viewHolder.itemView, taskReleaseEty);
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setText("+" + taskReleaseEty.getBonus() + "元");
 
                 GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
@@ -709,6 +701,25 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     }
 
     /**
+     * 一样相同组件与数据的设置
+     * @param itemView
+     * @param taskReleaseEty
+     */
+    private void setCommonViewData(View itemView, TaskReleaseEty taskReleaseEty) {
+        switch (from) {
+            case 1://来自主页
+                TaskHelper.setTaskTypeText((TextView) itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
+                TaskHelper.setTaskTagText((TextView) itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
+                TaskHelper.setNumText((TextView) itemView.findViewById(R.id.item_num_tv2), taskReleaseEty);
+                break;
+            default:
+                TaskHelper.setTaskTagText((TextView) itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
+                TaskHelper.setNumText((TextView) itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
+                break;
+        }
+    }
+
+    /**
      * 暂时这么处理，也许以后也是列表了
      * @param holder
      * @param etyList
@@ -756,15 +767,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName()+"");
-                switch (from) {
-                    case 1://来自主页
-                        TaskHelper.setTaskTypeText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
-                        TaskHelper.setNumText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
-                        break;
-                    default:
-                        TaskHelper.setNumText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
-                        break;
-                }
+                setCommonViewData(viewHolder.itemView, taskReleaseEty);
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ taskReleaseEty.getBonus() +"元");
                 if(!taskReleaseEty.getDeadline().equals("永久")){
                     ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -2,6 +2,7 @@ package com.sheep.jiuyan.samllsheep.utils;
 
 import android.app.Activity;
 import android.graphics.drawable.ColorDrawable;
+import android.support.annotation.DrawableRes;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -206,7 +207,7 @@ public class TitleBarUtils {
      * @param backgroundImgResId 设置背景的ResID,为零透明，-1不变,-2为Gone，其它是资源
      * @param onClickListener    点击时的操作。
      */
-    public void setRightImgBotton(Activity activity, int backgroundImgResId, View.OnClickListener onClickListener) {
+    public TitleBarUtils setRightImgBotton(Activity activity, int backgroundImgResId, View.OnClickListener onClickListener) {
         Button button = activity.findViewById(R.id.btn_baseactivity_right);
         ImageButton imageButton = activity.findViewById(R.id.ibtn_baseactivity_right);
         if(button != null)
@@ -216,13 +217,14 @@ public class TitleBarUtils {
             imageButton.setImageDrawable(new ColorDrawable(0x00000000));
         } else if (backgroundImgResId == -2) {
             imageButton.setVisibility(View.GONE);
-            return;
+            return this;
         } else if (backgroundImgResId != -1) {
             imageButton.setImageResource(backgroundImgResId);
         }
         if (onClickListener != null) {
             imageButton.setOnClickListener(onClickListener);
         }
+        return this;
     }
     /**
      * 设置最右边的普通按钮状态
@@ -346,19 +348,15 @@ public class TitleBarUtils {
     }
 
     /**
-     * 右边两个按钮的情况
+     * 设置 从右边数，第两个按钮
      */
-    public TitleBarUtils setShowRightTwoBtn(Activity activity, int oneRes, int secondeRes, View.OnClickListener oneOnclick, View.OnClickListener twoOnclick){
-        ImageButton ibtn_two_right = activity.findViewById(R.id.ibtn_two_right);
-        ImageButton ibtn_baseactivity_right = activity.findViewById(R.id.ibtn_baseactivity_right);
+    public TitleBarUtils setRightSecondBtn(Activity activity, @DrawableRes int secondRes, View.OnClickListener secondOnclick){
+        ImageButton secondImageButton = activity.findViewById(R.id.ibtn_two_right);
 
-        ibtn_two_right.setVisibility(View.VISIBLE);
-        ibtn_baseactivity_right.setVisibility(View.VISIBLE);
-        ibtn_two_right.setImageResource(secondeRes);
-        ibtn_baseactivity_right.setImageResource(oneRes);
+        secondImageButton.setVisibility(View.VISIBLE);
+        secondImageButton.setImageResource(secondRes);
 
-        ibtn_two_right.setOnClickListener(twoOnclick);
-        ibtn_baseactivity_right.setOnClickListener(oneOnclick);
-        return mTitleBarUtils;
+        secondImageButton.setOnClickListener(secondOnclick);
+        return this;
     }
 }

app/src/main/res/drawable/shape_green_stroke_rectangle.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="10dp" />
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"/>
     <stroke
         android:width="1dp"
-        android:color="#F81B5F" />
+        android:color="#4889FF" />
 </shape>

app/src/main/res/drawable/shape_red_stroke_rectangle.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="10dp" />
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"/>
     <stroke
         android:width="1dp"
-        android:color="#2FA255" />
+        android:color="#FD2D54" />
 </shape>

app/src/main/res/drawable/shape_yellow_stroke_rectangle.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <stroke
-        android:width="1dp"
-        android:color="#FFA21C" />
-</shape>

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

@@ -132,6 +132,15 @@
                     android:textColor="#cc8e8e8e"
                     android:textSize="10sp"
                     android:visibility="gone" />
+                <TextView
+                    android:id="@+id/item_num_tv2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/content_padding"
+                    android:text=""
+                    android:textColor="#cc8e8e8e"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
             </LinearLayout>
 
             <View