新手任务与信用卡功能成型

app/src/main/AndroidManifest.xml

@@ -385,6 +385,7 @@
         <activity android:name="com.sheep.gamegroup.view.activity.ActZhongXinWeb"  android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActNewbieTaskList"  android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActUnderstandSheep"  android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActCreditCardTaskList" android:screenOrientation="portrait" />
         <!--友盟start-->
 
 

app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardProgressQuery.java

@@ -0,0 +1,86 @@
+package com.kfzs.duanduan.fragment;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ListView;
+
+import com.alibaba.fastjson.JSON;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.view.adapter.CreditCardProgressQueryAdp;
+import com.sheep.gamegroup.view.customview.RefreshLayout;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by realicing on 2018/4/24.
+ * realicing@sina.com
+ */
+public class FgtCreditCardProgressQuery extends BaseFragment {
+    @BindView(R.id.credit_card_task_list)
+    ListView credit_card_task_list;
+    @BindView(R.id.swipe_container)
+    RefreshLayout swipe_container;
+    @BindView(R.id.task_progress_iv)
+    ImageView task_progress_iv;
+    @Override
+    public int getLayoutId() {
+        return R.layout.fgt_credit_card_task_list;
+    }
+
+    private List<TaskReleaseEty> list = new ArrayList<>();
+    private CreditCardProgressQueryAdp adapter;
+    @Override
+    public void onViewCreated() {
+        ButterKnife.bind(this, mView);
+        task_progress_iv.setVisibility(View.GONE);
+        swipe_container.setFooterView(getActivity(), credit_card_task_list, R.layout.listview_footer);
+        adapter = new CreditCardProgressQueryAdp(getActivity(), list);
+        credit_card_task_list.setAdapter(adapter);
+        swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                initData();
+            }
+        });
+        initData();
+    }
+
+    private void initData() {
+        list.clear();
+        SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCard()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        List<TaskReleaseEty> newList = baseMessage.getDatas(TaskReleaseEty.class);
+                        list.addAll(newList);
+                        adapter.notifyDataSetChanged();
+                        swipe_container.setRefreshing(false);
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+//                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                        adapter.notifyDataSetChanged();
+                        swipe_container.setRefreshing(false);
+                    }
+                });
+    }
+}

app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardTaskList.java

@@ -0,0 +1,81 @@
+package com.kfzs.duanduan.fragment;
+
+import android.widget.ListView;
+
+import com.alibaba.fastjson.JSON;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.view.adapter.CreditCardTaskAdp;
+import com.sheep.gamegroup.view.customview.RefreshLayout;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by realicing on 2018/4/24.
+ * realicing@sina.com
+ */
+public class FgtCreditCardTaskList extends BaseFragment {
+    @BindView(R.id.credit_card_task_list)
+    ListView credit_card_task_list;
+    @BindView(R.id.swipe_container)
+    RefreshLayout swipe_container;
+    @Override
+    public int getLayoutId() {
+        return R.layout.fgt_credit_card_task_list;
+    }
+
+    private List<TaskReleaseEty> list = new ArrayList<>();
+    private CreditCardTaskAdp adapter;
+    @Override
+    public void onViewCreated() {
+        ButterKnife.bind(this, mView);
+        swipe_container.setFooterView(getActivity(), credit_card_task_list, R.layout.listview_footer);
+        adapter = new CreditCardTaskAdp(getActivity(), list);
+        credit_card_task_list.setAdapter(adapter);
+        swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                initData();
+            }
+        });
+        initData();
+    }
+
+    private void initData() {
+        list.clear();
+        SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCard()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                List<TaskReleaseEty> newList = baseMessage.getDatas(TaskReleaseEty.class);
+                                list.addAll(newList);
+                                adapter.notifyDataSetChanged();
+                                swipe_container.setRefreshing(false);
+                                if(BuildConfig.DEBUG)
+                                    System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                if(BuildConfig.DEBUG)
+                                    System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+//                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                                adapter.notifyDataSetChanged();
+                                swipe_container.setRefreshing(false);
+                            }
+                        });
+    }
+}

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.view.ViewPager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -50,6 +51,7 @@ import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTask1;
+import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskRegistSuccess;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
@@ -268,6 +270,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 } else if(wechatIsOpen) {
                     Jump2View.getInstance().goLyingView(activity, null);
                     UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_LIE);
+                } else if(BuildConfig.DEBUG){
+                    Jump2View.getInstance().goCreditCardTaskList(activity, null);
                 } else {
                     G.showToast(R.string.coming_soon);
                 }
@@ -277,7 +281,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     G.showToast("网络错误，请重启重试");
                     return;
                 }
-                Jump2View.getInstance().goNewbieTaskList(activity, newbie_task_record);
+                SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                                DialogNewbieTaskList.showDialog(getActivity(), newbieTaskList);
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                G.showToast(!TextUtils.isEmpty(baseMessage.getMsg()) ? baseMessage.getMsg() : "网络错误，请重启重试");
+                            }
+                        });
                 break;
         }
     }
@@ -307,7 +325,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 .load(AppUtil.getQRLink(userEntity.getShare_link(), 800))
                 .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
                 .preload(800, 800);
-        if(userEntity.getNewbie_task_status() < 15){//为15时代表已经完成所有新手任务，不是新手
+        if(userEntity.getIs_new() == 2){//为1时代表老玩家
+
+        } else {
+            newbie_task.setVisibility(View.GONE);
             try {
                 newbie_task_record = MyDbManager.getInstance().dbFindNewbieTaskRecord(userEntity.getInvitation_code());
             } catch (DbException e) {
@@ -319,7 +340,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 MyDbManager.getInstance().saveOrUpdate(newbie_task_record);
             }
             boolean dontShowNewbieTaskDialog = newbie_task_record != null && newbie_task_record.isDontShowNewbieTaskDialog();//默认可以显示对话框
-            if(dontShowNewbieTaskDialog){
+            if(!BuildConfig.DEBUG && dontShowNewbieTaskDialog){
                 newbie_task.setVisibility(View.VISIBLE);
                 return;
             }
@@ -331,18 +352,18 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         public void onNext(BaseMessage baseMessage) {
                             newbie_task.setVisibility(View.VISIBLE);
                             List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
-                            if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),0, 0)){//第一个任务未完成
-                                DialogNewbieTaskRegistSuccess.showDialog(getActivity(), newbie_task_record);
+                            if(newbieTaskList != null && !newbieTaskList.isEmpty() && newbieTaskList.size() > 1 && !newbieTaskList.get(1).getFinished()){//了解小绵羊任务未完成时
+                                DialogNewbieTaskRegistSuccess.showDialog(getActivity(), newbie_task_record, newbieTaskList.get(0));
                             } else if(newbieTaskList != null && !newbieTaskList.isEmpty()){
                                 newbie_task_record.setDontShowNewbieTaskDialog(true);
                                 MyDbManager.getInstance().saveOrUpdate(newbie_task_record);//设置为不再显示新手对话框
                                 List<NewbieTask> taskList = new ArrayList<>();
                                 NewbieTask task = null;
                                 for (NewbieTask newbieTask : newbieTaskList) {
-                                    if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),newbieTask.getId() - 1, 0)) {//未完成
-                                        taskList.add(newbieTask);
-                                    } else {
+                                    if(newbieTask.getFinished()) {//已经完成
                                         task = newbieTask;
+                                    } else {
+                                        taskList.add(newbieTask);
                                     }
                                 }
                                 DialogNewbieTask1.showDialog(getActivity(), taskList, task);
@@ -358,9 +379,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                             System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                         }
                     });
-
-        } else {
-            newbie_task.setVisibility(View.GONE);
         }
         //添加代码请在上面的if else之前，否则出错不要找我 by realicing
     }

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -253,4 +253,11 @@ public interface ApiService {
     Observable<BaseMessage> getNewbieTask();
     @POST("app/newbie_task/learn_finish")
     Observable<BaseMessage> appNewbieTaskLearnFinish();
+
+    @GET("app/user/friend_list")
+    Observable<BaseMessage> getUserFriendList(@Query("page") int page, @Query("per_page") int per_page);
+    @GET("app/release_task/credit_card")
+    Observable<BaseMessage> getReleaseTaskCreditCard();
+    @GET("app/credit")
+    Observable<BaseMessage> getCredit();
 }

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

@@ -0,0 +1,208 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by realicing on 2018/4/24.
+ * realicing@sina.com
+ */
+public class Friend {
+    private int award_amount;
+
+    private String wx_openid;
+
+    private String bank_card;
+
+    private int is_banned;
+
+    private String wx_nickname;
+
+    private String share_link;
+
+    private String id_number;
+
+    private String real_name;
+
+    private String nickname;
+
+    private String mobile;
+
+    private String avatar;
+
+    private double total_asset;
+
+    private int total_withdraw;
+
+    private int update_time;
+
+    private String refresh_token;
+
+    private double balance;
+
+    private String open_id;
+
+    private String device_id;
+
+    private String access_token;
+
+    private int id;
+
+    private String invitation_code;
+
+    private int last_login_time;
+
+    private int newbie_task_status;
+
+    private String parent_code;
+
+    private int create_time;
+
+    public void setAward_amount(int award_amount){
+        this.award_amount = award_amount;
+    }
+    public int getAward_amount(){
+        return this.award_amount;
+    }
+    public void setWx_openid(String wx_openid){
+        this.wx_openid = wx_openid;
+    }
+    public String getWx_openid(){
+        return this.wx_openid;
+    }
+    public void setBank_card(String bank_card){
+        this.bank_card = bank_card;
+    }
+    public String getBank_card(){
+        return this.bank_card;
+    }
+    public void setIs_banned(int is_banned){
+        this.is_banned = is_banned;
+    }
+    public int getIs_banned(){
+        return this.is_banned;
+    }
+    public void setWx_nickname(String wx_nickname){
+        this.wx_nickname = wx_nickname;
+    }
+    public String getWx_nickname(){
+        return this.wx_nickname;
+    }
+    public void setShare_link(String share_link){
+        this.share_link = share_link;
+    }
+    public String getShare_link(){
+        return this.share_link;
+    }
+    public void setId_number(String id_number){
+        this.id_number = id_number;
+    }
+    public String getId_number(){
+        return this.id_number;
+    }
+    public void setReal_name(String real_name){
+        this.real_name = real_name;
+    }
+    public String getReal_name(){
+        return this.real_name;
+    }
+    public void setNickname(String nickname){
+        this.nickname = nickname;
+    }
+    public String getNickname(){
+        return this.nickname;
+    }
+    public void setMobile(String mobile){
+        this.mobile = mobile;
+    }
+    public String getMobile(){
+        return this.mobile;
+    }
+    public void setAvatar(String avatar){
+        this.avatar = avatar;
+    }
+    public String getAvatar(){
+        return this.avatar;
+    }
+    public void setTotal_asset(double total_asset){
+        this.total_asset = total_asset;
+    }
+    public double getTotal_asset(){
+        return this.total_asset;
+    }
+    public void setTotal_withdraw(int total_withdraw){
+        this.total_withdraw = total_withdraw;
+    }
+    public int getTotal_withdraw(){
+        return this.total_withdraw;
+    }
+    public void setUpdate_time(int update_time){
+        this.update_time = update_time;
+    }
+    public int getUpdate_time(){
+        return this.update_time;
+    }
+    public void setRefresh_token(String refresh_token){
+        this.refresh_token = refresh_token;
+    }
+    public String getRefresh_token(){
+        return this.refresh_token;
+    }
+    public void setBalance(double balance){
+        this.balance = balance;
+    }
+    public double getBalance(){
+        return this.balance;
+    }
+    public void setOpen_id(String open_id){
+        this.open_id = open_id;
+    }
+    public String getOpen_id(){
+        return this.open_id;
+    }
+    public void setDevice_id(String device_id){
+        this.device_id = device_id;
+    }
+    public String getDevice_id(){
+        return this.device_id;
+    }
+    public void setAccess_token(String access_token){
+        this.access_token = access_token;
+    }
+    public String getAccess_token(){
+        return this.access_token;
+    }
+    public void setId(int id){
+        this.id = id;
+    }
+    public int getId(){
+        return this.id;
+    }
+    public void setInvitation_code(String invitation_code){
+        this.invitation_code = invitation_code;
+    }
+    public String getInvitation_code(){
+        return this.invitation_code;
+    }
+    public void setLast_login_time(int last_login_time){
+        this.last_login_time = last_login_time;
+    }
+    public int getLast_login_time(){
+        return this.last_login_time;
+    }
+    public void setNewbie_task_status(int newbie_task_status){
+        this.newbie_task_status = newbie_task_status;
+    }
+    public int getNewbie_task_status(){
+        return this.newbie_task_status;
+    }
+    public void setParent_code(String parent_code){
+        this.parent_code = parent_code;
+    }
+    public String getParent_code(){
+        return this.parent_code;
+    }
+    public void setCreate_time(int create_time){
+        this.create_time = create_time;
+    }
+    public int getCreate_time(){
+        return this.create_time;
+    }
+}

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

@@ -57,6 +57,8 @@ public class UserEntity implements Serializable {
     private String share_link;
     @Column(name = "newbie_task_status")
     private int newbie_task_status;
+    @Column(name = "is_new")
+    private int is_new;
 
     public String getWx_nickname() {
         return wx_nickname;
@@ -226,11 +228,19 @@ public class UserEntity implements Serializable {
         this.share_link = share_link;
     }
 
-    public int getNewbie_task_status() {
-        return newbie_task_status;
-    }
+//    public int getNewbie_task_status() {
+//        return newbie_task_status;
+//    }
 
     public void setNewbie_task_status(int newbie_task_status) {
         this.newbie_task_status = newbie_task_status;
     }
+
+    public int getIs_new() {
+        return is_new;
+    }
+
+    public void setIs_new(int is_new) {
+        this.is_new = is_new;
+    }
 }

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

@@ -15,6 +15,7 @@ import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
+import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
 import com.sheep.gamegroup.view.activity.ActGuideOnHook;
 import com.sheep.gamegroup.view.activity.ActMingShengWeb;
@@ -75,17 +76,8 @@ public class Jump2View {
             goBindOrChangeWeixinView(context, false);
             return;
         }
-        try {
-            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-            boolean isFinishFirstWithdrawal = BinaryUtil.isInt(userEntity.getNewbie_task_status(),1, 1);
-            Intent intent = new Intent(context, WithdrawalAct.class);
-            intent.putExtra(Boolean.class.getSimpleName(), isFinishFirstWithdrawal);// 是否完成首次提现任务
-            context.startActivity(intent);
-        } catch (DbException e) {
-            e.printStackTrace();
-            if(BuildConfig.DEBUG)
-                G.showToast("测试：报错了，不能跳转到提现页面啦");
-        }
+        Intent intent = new Intent(context, WithdrawalAct.class);
+        context.startActivity(intent);
     }
 
 
@@ -452,4 +444,13 @@ public class Jump2View {
         context.startActivity(intent);
     }
 
+    /**
+     * 跳到信用卡任务界面界面
+     * @param context
+     * @param o
+     */
+    public void goCreditCardTaskList(Context context, Object o){
+        Intent intent = new Intent(context, ActCreditCardTaskList.class);
+        context.startActivity(intent);
+    }
 }

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

@@ -0,0 +1,62 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
+
+import com.kfzs.duanduan.adp.ViewPagerFragmentAdapter;
+import com.kfzs.duanduan.fragment.FgtCreditCardProgressQuery;
+import com.kfzs.duanduan.fragment.FgtCreditCardTaskList;
+import com.kfzs.duanduan.mine.GiftpackListAdapter;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * Created by realicing on 2018/4/24.
+ */
+
+public class ActCreditCardTaskList extends BaseActivity {
+
+
+    @BindView(R.id.indicator)
+    TabLayout indicator;
+    @BindView(R.id.pager)
+    ViewPager pager;
+
+    private GiftpackListAdapter mAdapter;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.act_credit_card_task_list;
+    }
+
+    @Override
+    public void initView() {
+        TitleBarUtils.getInstance()
+                .setTitle(this,"办卡赚钱")
+                .setTitleFinish(this);
+
+        mAdapter = new GiftpackListAdapter(getSupportFragmentManager(), getApplicationContext());
+        mAdapter.add(new FgtCreditCardTaskList(), "任务列表");
+        mAdapter.add(new FgtCreditCardProgressQuery(), "进度查询");
+        pager.setAdapter(mAdapter);
+        indicator.setupWithViewPager(pager);
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+}

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

@@ -1,25 +1,24 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.AlertDialog;
-import android.graphics.Bitmap;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.RequestOptions;
+import com.alibaba.fastjson.JSON;
 import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponent;
 import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.Friend;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.AskGetMoneyContract;
 import com.sheep.gamegroup.presenter.AskGetMoneyPresenter;
-
-import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -30,10 +29,14 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.umeng.socialize.media.UMWeb;
 
+import java.util.List;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.view.activity.PersionInfoAct.showQR;
 
@@ -75,6 +78,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .build()
                 .inject(this);
+        test();
     }
 
     @Override
@@ -205,4 +209,24 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
                 break;
         }
     }
+    private void test(){
+        SheepApp.getInstance().getNetComponent().getApiService().getUserFriendList(1, 5)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(AskGetMoneyAct.this) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        List<Friend> friendList = baseMessage.getDatas(Friend.class);
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if(BuildConfig.DEBUG)
+                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                        G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                    }
+                });
+    }
 }

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

@@ -75,8 +75,6 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     private String amount;
     private String balanceAmount = "0";//余额
 
-    private boolean isFinishFirstWithdrawal;//是否完成首次提现任务
-
     private  UserEntity userEntity;
     @Override
     protected int getLayoutId() {
@@ -87,10 +85,9 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     public void initView() {
         activity = this;
         EventBus.getDefault().register(this);
-        isFinishFirstWithdrawal = getIntent().getBooleanExtra(Boolean.class.getSimpleName(), true);
         TitleBarUtils
                 .getInstance()
-                .setTitle(activity, isFinishFirstWithdrawal ? "提现" : "首次提现+1.2元")
+                .setTitle(activity, "提现")
                 .setTitleFinish(activity);
         DaggerWithdrawalComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
@@ -177,21 +174,12 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
      */
     private ArrayList<Object> assemblyData(){
         listData.clear();
-        if(isFinishFirstWithdrawal){
-            listData.add(new GridViewEntity(true,10+""));
-            listData.add(new GridViewEntity(false,30+""));
-            listData.add(new GridViewEntity(false,50+""));
-            listData.add(new GridViewEntity(false,100+""));
-            listData.add(new GridViewEntity(false,500+""));
-            listData.add(new GridViewEntity(false,1000+""));
-        } else {
-            listData.add(new GridViewEntity(true,"2"));
-            listData.add(new GridViewEntity(false,10+""));
-            listData.add(new GridViewEntity(false,30+""));
-            listData.add(new GridViewEntity(false,50+""));
-            listData.add(new GridViewEntity(false,100+""));
-            listData.add(new GridViewEntity(false,500+""));
-        }
+        listData.add(new GridViewEntity(true,10+""));
+        listData.add(new GridViewEntity(false,30+""));
+        listData.add(new GridViewEntity(false,50+""));
+        listData.add(new GridViewEntity(false,100+""));
+        listData.add(new GridViewEntity(false,500+""));
+        listData.add(new GridViewEntity(false,1000+""));
         return listData;
     }
 

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

@@ -0,0 +1,77 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+/**
+ * Created by ljy on 2018/3/21.
+ */
+
+public class CreditCardProgressQueryAdp extends BaseAdapter {
+    private Context context;
+    private List<TaskReleaseEty> etyList;
+
+    public CreditCardProgressQueryAdp(Context context, List<TaskReleaseEty> etyList) {
+        this.context = context;
+        this.etyList = etyList;
+    }
+
+    @Override
+    public int getCount() {
+        return etyList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return etyList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+    private final static int[] ids = {R.drawable.ic_gold_credit_card_2, R.drawable.ic_ms_card};
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+        Object tag = convertView == null ? null : convertView.getTag();
+        ViewHolder holder;
+        if(tag instanceof ViewHolder){
+            holder = (ViewHolder) tag;
+        }else {
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.credit_card_progress_query, null);
+            holder.credit_card_task_iv = convertView.findViewById(R.id.credit_card_task_iv);
+            holder.credit_card_task_name_tv = convertView.findViewById(R.id.credit_card_task_name_tv);
+            holder.credit_card_task_tip1_tv = convertView.findViewById(R.id.credit_card_task_tip1_tv);
+            holder.credit_card_task_tip2_tv = convertView.findViewById(R.id.credit_card_task_tip2_tv);
+            convertView.setTag(holder);
+        }
+
+        final TaskReleaseEty ety = (TaskReleaseEty) getItem(position);
+        Glide.with(context).load(ety.getTask().getIcon())
+                .into(holder.credit_card_task_iv);
+        holder.credit_card_task_name_tv.setText(ety.getName());
+        String[] remarks = ety.getTask().getRemarks().split(";");
+        holder.credit_card_task_tip1_tv.setText(remarks.length > 0 ? remarks[0] : "");
+        holder.credit_card_task_tip2_tv.setText("¥"+ety.getBonus());
+        return convertView;
+    }
+
+    class ViewHolder{
+        ImageView credit_card_task_iv;
+        TextView credit_card_task_name_tv;
+        TextView credit_card_task_tip1_tv, credit_card_task_tip2_tv;
+    }
+
+}

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

@@ -0,0 +1,79 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+/**
+ * Created by ljy on 2018/3/21.
+ */
+
+public class CreditCardTaskAdp extends BaseAdapter {
+    private Context context;
+    private List<TaskReleaseEty> etyList;
+
+    public CreditCardTaskAdp(Context context, List<TaskReleaseEty> etyList) {
+        this.context = context;
+        this.etyList = etyList;
+    }
+
+    @Override
+    public int getCount() {
+        return etyList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return etyList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+    private final static int[] ids = {R.drawable.ic_gold_credit_card_2, R.drawable.ic_ms_card};
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+        Object tag = convertView == null ? null : convertView.getTag();
+        ViewHolder holder;
+        if(tag instanceof ViewHolder){
+            holder = (ViewHolder) tag;
+        }else {
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.credit_card_task, null);
+            holder.credit_card_task_iv = convertView.findViewById(R.id.credit_card_task_iv);
+            holder.credit_card_task_name_tv = convertView.findViewById(R.id.credit_card_task_name_tv);
+            holder.credit_card_task_tv = convertView.findViewById(R.id.credit_card_task_tv);
+            holder.credit_card_task_tip1_tv = convertView.findViewById(R.id.credit_card_task_tip1_tv);
+            holder.credit_card_task_tip2_tv = convertView.findViewById(R.id.credit_card_task_tip2_tv);
+            convertView.setTag(holder);
+        }
+
+        final TaskReleaseEty ety = (TaskReleaseEty) getItem(position);
+        Glide.with(context).load(ety.getTask().getIcon())
+                .into(holder.credit_card_task_iv);
+        holder.credit_card_task_tv.setText("+"+ety.getBonus()+"元");
+        holder.credit_card_task_name_tv.setText(ety.getName());
+        String[] remarks = ety.getTask().getRemarks().split(";");
+        holder.credit_card_task_tip1_tv.setText(remarks.length > 0 ? remarks[0] : "");
+        holder.credit_card_task_tip2_tv.setText(remarks.length > 1 ? remarks[1] : "");
+        return convertView;
+    }
+
+    class ViewHolder{
+        ImageView credit_card_task_iv;
+        TextView credit_card_task_name_tv, credit_card_task_tv;
+        TextView credit_card_task_tip1_tv, credit_card_task_tip2_tv;
+    }
+
+}

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

@@ -0,0 +1,88 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Created by ljy on 2018/3/21.
+ */
+
+public class DialogNewbieTaskAdp extends BaseAdapter {
+    private Context context;
+    private List<NewbieTask> etyList;
+
+    public DialogNewbieTaskAdp(Context context, List<NewbieTask> etyList) {
+        this.context = context;
+        this.etyList = etyList;
+    }
+
+    @Override
+    public int getCount() {
+        return etyList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return etyList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+        Object tag = convertView == null ? null : convertView.getTag();
+        ViewHolder holder;
+        if(tag instanceof ViewHolder){
+            holder = (ViewHolder) tag;
+        }else {
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.dialog_newbie_task_item, null);
+            holder.dialog_sure_1 = convertView.findViewById(R.id.dialog_sure_1);
+            convertView.setTag(holder);
+        }
+
+        final NewbieTask ety = (NewbieTask) getItem(position);
+        setTextSure(holder.dialog_sure_1,ety, position);
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView dialog_sure_1;
+    }
+
+
+    private static void setTextSure(TextView dialog_sure, NewbieTask newbieTask, int index) {
+        switch (newbieTask.getId()){
+            case 2:
+                dialog_sure.setText((index+1)+".完成首次提现（+"+newbieTask.getAmount()+"元）");
+                break;
+            case 3:
+                dialog_sure.setText((index+1)+".成功邀请好友注册（+"+newbieTask.getAmount()+"元）");
+                break;
+            case 4:
+                dialog_sure.setText((index+1)+".首次做任务赚钱（额外奖+"+newbieTask.getAmount()+"元）");
+                break;
+            case 6://加入官方QQ群
+                dialog_sure.setText((index+1)+".加入官方QQ群（++"+newbieTask.getAmount()+"元）");
+                break;
+        }
+    }
+}

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

@@ -25,6 +25,7 @@ import java.util.Locale;
 
 public class NewbieTaskAdp extends BaseAdapter {
     private Context context;
+    private View.OnClickListener onClickListener;
     private List<NewbieTask> etyList;
 
     public NewbieTaskAdp(Context context, List<NewbieTask> etyList) {
@@ -32,6 +33,11 @@ public class NewbieTaskAdp extends BaseAdapter {
         this.etyList = etyList;
     }
 
+    public NewbieTaskAdp setOnClickListener(View.OnClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+        return this;
+    }
+
     @Override
     public int getCount() {
         return etyList.size();
@@ -46,7 +52,7 @@ public class NewbieTaskAdp extends BaseAdapter {
     public long getItemId(int position) {
         return 0;
     }
-    private final static int[] ids = {R.drawable.newbie_task_1, R.drawable.newbie_task_1, R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4};
+    private final static int[] ids = {R.drawable.newbie_task_1, R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, R.drawable.newbie_task_6};
     @Override
     public View getView(final int position, View convertView, ViewGroup parent) {
         Object tag = convertView == null ? null : convertView.getTag();
@@ -64,16 +70,19 @@ public class NewbieTaskAdp extends BaseAdapter {
         }
 
         final NewbieTask ety = (NewbieTask) getItem(position);
-        holder.newbie_task_iv.setImageResource(ids[ety.getId()]);
+        holder.newbie_task_iv.setImageResource(ids[(ety.getId()+ids.length-1)%ids.length]);
         holder.newbie_task_name_tv.setText(ety.getName());
         holder.newbie_task_money_tv.setText(String.format(Locale.CHINESE, "+%.1f元", ety.getAmount()));
         holder.newbie_task_tv.setOnClickListener(new View.OnClickListener() {
+
             @Override
             public void onClick(View view) {
+                if(onClickListener != null)
+                    onClickListener.onClick(view);
                 doActionByTask(context, ety);
             }
         });
-        holder.newbie_task_tv.setText(ety.getFinished() ? "已完成" : "去做");
+        holder.newbie_task_tv.setText(ety.getFinished() ? "已完成" : "去完成");
         holder.newbie_task_tv.setEnabled(!ety.getFinished());
         return convertView;
     }
@@ -100,6 +109,14 @@ public class NewbieTaskAdp extends BaseAdapter {
                     Jump2View.getInstance().goTryplayView(context, null);
                     UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_TRY);
                     break;
+                case 5://注册账号并登录
+                    if(BuildConfig.DEBUG){
+                        G.showToast("测试：服务器返回数据错误，这个任务可能没有完成？");
+                    }
+                    break;
+                case 6://加入官方QQ群
+                    G.showToast(R.string.coming_soon);
+                    break;
             }
         } else {
             if(BuildConfig.DEBUG)

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

@@ -4,11 +4,15 @@ import android.app.Activity;
 import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.adapter.DialogNewbieTaskAdp;
+import com.sheep.gamegroup.view.adapter.NewbieTaskAdp;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.List;
@@ -18,7 +22,7 @@ import static com.sheep.gamegroup.view.adapter.NewbieTaskAdp.doActionByTask;
 
 public class DialogNewbieTask1 {
 
-    public static AlertDialog showDialog(final Activity activity, List<NewbieTask> newbieTaskList, NewbieTask task) {
+    public static AlertDialog showDialog(final Activity activity, final List<NewbieTask> newbieTaskList, NewbieTask task) {
         UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST_DIALOG);
         View view = View.inflate(activity, R.layout.dialog_newbie_task_1, null);
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
@@ -46,33 +50,15 @@ public class DialogNewbieTask1 {
             String sr = start+" <font color='#e2271d'><big>" + task.getAmount() + "</big></font> 元";
             dialog_tip.setText(Html.fromHtml(sr));
         }
-        View.OnClickListener onClickListener = new View.OnClickListener() {
+        final ListView dialog_sure_list = ViewFindUtils.find(view, R.id.dialog_sure_list);
+        dialog_sure_list.setAdapter(new DialogNewbieTaskAdp(activity, newbieTaskList));
+        dialog_sure_list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
-            public void onClick(View view) {
-                NewbieTask task1 = (NewbieTask) view.getTag();
-                doActionByTask(activity, task1);
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 mAlertDialog.dismiss();
+                doActionByTask(activity, newbieTaskList.get(i));
             }
-        };
-        final TextView dialog_sure_1 = ViewFindUtils.find(view, R.id.dialog_sure_1);
-        setTextSure(dialog_sure_1, newbieTaskList.get(0), 0);
-        dialog_sure_1.setOnClickListener(onClickListener);
-        final TextView dialog_sure_2 = ViewFindUtils.find(view, R.id.dialog_sure_2);
-        if(newbieTaskList.size() > 1) {
-            setTextSure(dialog_sure_2, newbieTaskList.get(1), 1);
-            dialog_sure_2.setVisibility(View.VISIBLE);
-            dialog_sure_2.setOnClickListener(onClickListener);
-        } else {
-            dialog_sure_2.setVisibility(View.GONE);
-        }
-        final TextView dialog_sure_3 = ViewFindUtils.find(view, R.id.dialog_sure_3);
-        if(newbieTaskList.size() > 2){
-            setTextSure(dialog_sure_3, newbieTaskList.get(2), 2);
-            dialog_sure_3.setVisibility(View.VISIBLE);
-            dialog_sure_3.setOnClickListener(onClickListener);
-        } else {
-            dialog_sure_3.setVisibility(View.GONE);
-        }
+        });
         final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
         dialog_close.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -87,19 +73,4 @@ public class DialogNewbieTask1 {
         }
         return mAlertDialog;
     }
-
-    private static void setTextSure(TextView dialog_sure, NewbieTask newbieTask, int index) {
-        switch (newbieTask.getId()){
-            case 2:
-                dialog_sure.setText((index+1)+".完成首次提现（+"+newbieTask.getAmount()+"元）");
-                break;
-            case 3:
-                dialog_sure.setText((index+1)+".成功邀请好友注册（+"+newbieTask.getAmount()+"元）");
-                break;
-            case 4:
-                dialog_sure.setText((index+1)+".首次做任务赚钱（额外奖+"+newbieTask.getAmount()+"元）");
-                break;
-        }
-        dialog_sure.setTag(newbieTask);
-    }
 }

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

@@ -0,0 +1,46 @@
+package com.sheep.gamegroup.view.dialog;
+
+import android.app.Activity;
+import android.support.v7.app.AlertDialog;
+import android.text.Html;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.adapter.NewbieTaskAdp;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+import static com.sheep.gamegroup.view.adapter.NewbieTaskAdp.doActionByTask;
+
+
+public class DialogNewbieTaskList {
+
+    public static AlertDialog showDialog(final Activity activity, List<NewbieTask> newbieTaskList) {
+        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST_DIALOG);
+        View view = View.inflate(activity, R.layout.dialog_newbie_task_list, null);
+        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                .setView(view)
+                .create();
+        View.OnClickListener onClickListener =  new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mAlertDialog.dismiss();
+            }
+        };
+        final ListView dialog_center_lv = ViewFindUtils.find(view, R.id.dialog_center_lv);
+        dialog_center_lv.setAdapter(new NewbieTaskAdp(activity, newbieTaskList).setOnClickListener(onClickListener));
+        final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
+        dialog_close.setOnClickListener(onClickListener);
+        try {
+            mAlertDialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mAlertDialog;
+    }
+}

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

@@ -9,6 +9,7 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.react.SharedPreferences;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -18,22 +19,21 @@ import com.sheep.jiuyan.samllsheep.R;
 
 public class DialogNewbieTaskRegistSuccess {
 
-    public static AlertDialog showDialog(final Activity activity, final NewbieTaskRecord newbie_task_record) {
+    public static AlertDialog showDialog(final Activity activity, final NewbieTaskRecord newbie_task_record, NewbieTask task) {
         UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_REGIST_SUCCESS_DIALOG);
         View view = View.inflate(activity, R.layout.dialog_newbie_task_1, null);
         final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                 .setView(view)
                 .create();
         final TextView dialog_tip = ViewFindUtils.find(view, R.id.dialog_tip);
-        String sr = "获得新人注册奖励 "+"<font color='#e2271d'><big>" + 1.8 + "</big></font> 元";
+        String sr = "获得新人注册奖励 "+"<font color='#e2271d'><big>" + task.getAmount() + "</big></font> 元";
         dialog_tip.setText(Html.fromHtml(sr));
 
-        ViewFindUtils.find(view, R.id.dialog_sure_3).setVisibility(View.GONE);
-        ViewFindUtils.find(view, R.id.dialog_sure_2).setVisibility(View.GONE);
-
-        final TextView dialog_sure_1 = ViewFindUtils.find(view, R.id.dialog_sure_1);
-        dialog_sure_1.setText("了解小绵羊，领取更多奖励");
-        dialog_sure_1.setOnClickListener(new View.OnClickListener() {
+        ViewFindUtils.find(view, R.id.dialog_sure_list).setVisibility(View.GONE);
+        final TextView dialog_sure = ViewFindUtils.find(view, R.id.dialog_sure);
+        dialog_sure.setVisibility(View.VISIBLE);
+        dialog_sure.setText("了解小绵羊，领取更多奖励");
+        dialog_sure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Jump2View.getInstance().goUnderstandSheep(activity, newbie_task_record);

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:background="@color/white_light">
+
+    <include layout="@layout/title"/>
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/indicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
+        app:tabIndicatorColor="#4bc1fe"
+        app:tabGravity="fill"
+        app:tabSelectedTextColor="#4bc1fe"
+        app:tabTextColor="#444444"
+        app:tabMode="fixed" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+</LinearLayout>

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

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingEnd="@dimen/content_padding_10"
+    android:paddingStart="@dimen/content_padding_10"
+    android:paddingTop="@dimen/content_padding_10">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:paddingStart="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingTop="@dimen/content_padding_20"
+        android:paddingBottom="@dimen/content_padding_20"
+        >
+
+        <ImageView
+            android:id="@+id/credit_card_task_iv"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_gold_credit_card_2" />
+        <LinearLayout
+            android:id="@+id/credit_card_task_ll"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/credit_card_task_find_tv"
+                style="@style/style_button_small"
+                android:layout_width="90dp"
+                android:layout_height="26dp"
+                android:textSize="@dimen/text_size_12"
+                android:text="进度查询" />
+            <TextView
+                android:id="@+id/credit_card_task_upload_tv"
+                style="@style/style_button_small"
+                android:layout_marginTop="@dimen/content_padding_15"
+                android:layout_width="90dp"
+                android:layout_height="26dp"
+                android:textSize="@dimen/text_size_12"
+                android:text="上传截图" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@+id/credit_card_task_iv"
+            android:layout_toStartOf="@+id/credit_card_task_ll"
+            android:layout_marginStart="@dimen/content_padding_10"
+            android:layout_marginEnd="@dimen/content_padding_10"
+            android:layout_centerVertical="true"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/credit_card_task_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="中国民生信用卡"
+                android:singleLine="true"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+
+            <TextView
+                android:id="@+id/credit_card_task_tip1_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding_3"
+                android:layout_marginTop="@dimen/content_padding_3"
+                android:singleLine="true"
+                android:text="享分期消费特权"
+                android:textColor="#797272"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/credit_card_task_tip2_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding_3"
+                android:layout_marginTop="@dimen/content_padding_3"
+                android:singleLine="true"
+                android:text="¥15.00"
+                android:textColor="#ff2d4b"
+                android:textSize="15sp" />
+        </LinearLayout>
+
+
+    </RelativeLayout>
+</RelativeLayout>

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingEnd="@dimen/content_padding_10"
+    android:paddingStart="@dimen/content_padding_10"
+    android:paddingTop="@dimen/content_padding_10">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:paddingStart="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingTop="@dimen/content_padding_20"
+        android:paddingBottom="@dimen/content_padding_20"
+        >
+
+        <ImageView
+            android:id="@+id/credit_card_task_iv"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_gold_credit_card_2" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@+id/credit_card_task_iv"
+            android:layout_marginStart="@dimen/content_padding_10"
+            android:layout_marginEnd="@dimen/content_padding_10"
+            android:layout_centerVertical="true"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/credit_card_task_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="民生银行信用卡"
+                android:singleLine="true"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+
+            <TextView
+                android:id="@+id/credit_card_task_tip1_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding_3"
+                android:layout_marginTop="@dimen/content_padding_3"
+                android:singleLine="true"
+                android:text="首年免年费"
+                android:textColor="#797272"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/credit_card_task_tip2_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding_3"
+                android:text="分期消费特权"
+                android:singleLine="true"
+                android:textColor="#797272"
+                android:textSize="13sp" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/credit_card_task_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:textSize="16sp"
+            android:textColor="#ff2d4b"
+            android:text="+15元" />
+
+    </RelativeLayout>
+</RelativeLayout>

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

@@ -46,27 +46,16 @@
                 android:textColor="#7e7e7e"
                 android:visibility="gone"
                 android:textSize="12sp" />
-
-            <LinearLayout
+            <com.kfzs.duanduan.view.diag.MyListview
+                android:id="@+id/dialog_sure_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:gravity="center">
-
-                <Button
-                    android:id="@+id/dialog_sure_1"
-                    style="@style/style_button_newbie_task"
-                    android:text="1.完成首次提现（+1.2元）" />
-                <Button
-                    android:id="@+id/dialog_sure_2"
-                    style="@style/style_button_newbie_task"
-                    android:text="2.成功邀请好友注册（+2元）" />
-                <Button
-                    android:id="@+id/dialog_sure_3"
-                    style="@style/style_button_newbie_task"
-                    android:text="3.首次做任务赚钱（+1元）" />
-
-            </LinearLayout>
+                android:divider="@null"/>
+            <Button
+                android:id="@+id/dialog_sure"
+                style="@style/style_button_newbie_task"
+                android:text="1.完成首次提现（+1.2元）"
+                android:visibility="gone"/>
         </LinearLayout>
 
         <ImageView

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/dialog_sure_1"
+        style="@style/style_button_newbie_task"
+        android:text="1.完成首次提现（+1.2元）" />
+</LinearLayout>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/content_padding_10">
+
+        <LinearLayout
+            android:id="@+id/dialog_center_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/content_padding_10"
+            android:paddingBottom="@dimen/content_padding_10">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/content_padding_10"
+                android:gravity="center"
+                android:text="新手任务"
+                android:textColor="#232323"
+                android:textSize="17sp" />
+            <com.kfzs.duanduan.view.diag.MyListview
+                android:id="@+id/dialog_center_lv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:divider="@null"/>
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/dialog_close"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_margin="@dimen/content_padding_10"
+            android:layout_alignTop="@+id/dialog_center_ll"
+            android:layout_alignEnd="@+id/dialog_center_ll"
+            android:layout_centerHorizontal="true"
+            android:src="@drawable/ic_credit_card_close" />
+    </RelativeLayout>
+</FrameLayout>

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white_light">
+    <ImageView
+        android:id="@+id/task_progress_iv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:adjustViewBounds="true"
+        android:src="@drawable/credit_card_process"/>
+    <com.sheep.gamegroup.view.customview.RefreshLayout
+        android:id="@+id/swipe_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ListView
+            android:id="@+id/credit_card_task_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:listSelector="@color/transparent"
+            android:divider="@null"
+            android:layout_margin="@dimen/content_padding_13"
+            android:scrollbars="none"/>
+
+    </com.sheep.gamegroup.view.customview.RefreshLayout>
+
+</LinearLayout>

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

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/content_padding_10"
-    android:paddingStart="@dimen/content_padding_10"
-    android:paddingEnd="@dimen/content_padding_10">
-
+    android:orientation="vertical">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#FBFBFB"/>
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:padding="@dimen/content_padding_20">
+        android:layout_height="wrap_content"
+        android:padding="@dimen/content_padding_10">
 
         <ImageView
             android:id="@+id/newbie_task_iv"
@@ -25,7 +25,7 @@
             android:id="@+id/newbie_task_name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+            android:layout_alignTop="@+id/newbie_task_iv"
             android:layout_marginStart="@dimen/content_padding_10"
             android:layout_toEndOf="@+id/newbie_task_iv"
             android:textSize="15sp"
@@ -36,7 +36,7 @@
             android:id="@+id/newbie_task_money_iv"
             android:layout_width="16dp"
             android:layout_height="16dp"
-            android:layout_alignParentBottom="true"
+            android:layout_alignBottom="@+id/newbie_task_iv"
             android:layout_marginStart="@dimen/content_padding_10"
             android:layout_toEndOf="@+id/newbie_task_iv"
             android:src="@drawable/newbie_task_moeny" />
@@ -45,7 +45,7 @@
             android:id="@+id/newbie_task_money_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
+            android:layout_alignBottom="@+id/newbie_task_iv"
             android:layout_marginStart="@dimen/content_padding_3"
             android:layout_toEndOf="@+id/newbie_task_money_iv"
             android:textSize="12sp"
@@ -57,7 +57,7 @@
             style="@style/style_button_small"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:text="去做" />
+            android:text="去完成" />
 
     </RelativeLayout>
-</RelativeLayout>
+</LinearLayout>