新手任务界面与功能基本成型，还需要测试及美化界面

app/src/main/AndroidManifest.xml

@@ -383,6 +383,8 @@
         <activity android:name="com.sheep.groups.creditcard.ms.MinShengCreditActivity" android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActMingShengWeb" android:screenOrientation="portrait"/>
         <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"/>
         <!--友盟start-->
 
 

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

@@ -35,17 +35,21 @@ import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.MoreDataEntity;
+import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 import com.sheep.gamegroup.util.AppUtil;
+import com.sheep.gamegroup.util.BinaryUtil;
 import com.sheep.gamegroup.util.ImageGlarryDrawable;
 import com.sheep.gamegroup.util.Jump2View;
 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.DialogNewbieTaskRegistSuccess;
+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;
@@ -229,7 +233,20 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_LIE);
                 break;
             case R.id.newbie_task://新手任务
-                DialogNewbieTask1.showDialog(getActivity());
+                SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                Jump2View.getInstance().goNewbieTaskList(activity, baseMessage);
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                            }
+                        });
                 break;
         }
     }
@@ -268,17 +285,33 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                             .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
                                 @Override
                                 public void onNext(BaseMessage baseMessage) {
-                                    System.out.println(JSON.toJSONString(baseMessage));
+                                    List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                                    if(BinaryUtil.isInt(userEntity.getNewbie_task_status(),0, 0)){//第一个任务未完成
+                                        DialogNewbieTaskRegistSuccess.showDialog(getActivity());
+                                    } else if(newbieTaskList != null && !newbieTaskList.isEmpty()){
+                                        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 {
+                                                task = newbieTask;
+                                            }
+                                        }
+                                        DialogNewbieTask1.showDialog(getActivity(), taskList, task);
+                                    } else {
+                                        if(BuildConfig.DEBUG)
+                                            G.showToast("测试：服务器数据错误,新手任务数据为空");
+                                    }
                                 }
 
                                 @Override
                                 public void onError(BaseMessage baseMessage) {
-                                    System.out.println(JSON.toJSONString(baseMessage));
+                                    System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 }
                             });
 
         }
-
     }
 
     @Override

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

@@ -251,5 +251,5 @@ public interface ApiService {
     @GET("app/newbie_task")
     Observable<BaseMessage> getNewbieTask();
     @POST("app/newbie_task/learn_finish")
-    Observable<BaseMessage> appNewbieTaskLearnFinish(@Body JSONObject jsonObject);
+    Observable<BaseMessage> appNewbieTaskLearnFinish();
 }

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

@@ -3,13 +3,14 @@ package com.sheep.gamegroup.model.entity;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * Created by ljy on 2018/3/16.
  */
 
-public class BaseMessage {
+public class BaseMessage implements Serializable{
 
     private String msg;
     private Integer code = 0;

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

@@ -0,0 +1,67 @@
+package com.sheep.gamegroup.model.entity;
+
+import java.io.Serializable;
+
+/**
+ * Created by realicing on 2018/4/18.
+ * realicing@sina.com
+ */
+public class NewbieTask implements Serializable{
+    private double amount;
+
+    private boolean finished;
+
+    private int id;
+
+    private String desc;
+
+    private String name;
+
+    private int update_time;
+
+    private int create_time;
+
+    public void setAmount(double amount){
+        this.amount = amount;
+    }
+    public double getAmount(){
+        return this.amount;
+    }
+    public void setFinished(boolean finished){
+        this.finished = finished;
+    }
+    public boolean getFinished(){
+        return this.finished;
+    }
+    public void setId(int id){
+        this.id = id;
+    }
+    public int getId(){
+        return this.id;
+    }
+    public void setDesc(String desc){
+        this.desc = desc;
+    }
+    public String getDesc(){
+        return this.desc;
+    }
+    public void setName(String name){
+        this.name = name;
+    }
+    public String getName(){
+        return this.name;
+    }
+    public void setUpdate_time(int update_time){
+        this.update_time = update_time;
+    }
+    public int getUpdate_time(){
+        return this.update_time;
+    }
+    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/util/BinaryUtil.java

@@ -0,0 +1,15 @@
+package com.sheep.gamegroup.util;
+
+/**
+ * Created by realicing on 2018/4/18.
+ * realicing@sina.com
+ */
+public class BinaryUtil {
+    public static boolean isInt(int number, int wei, int thsInt){
+        String binaryString = Integer.toBinaryString(number);
+        if(binaryString.length() > wei){
+            return Integer.parseInt(binaryString.substring(wei, wei+1)) == thsInt;
+        }
+        return 0 == thsInt;
+    }
+}

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

@@ -7,14 +7,16 @@ import android.text.TextUtils;
 
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.bean.KFIntentKeys;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
-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.ActGuideDeblocked;
 import com.sheep.gamegroup.view.activity.ActGuideOnHook;
 import com.sheep.gamegroup.view.activity.ActMingShengWeb;
+import com.sheep.gamegroup.view.activity.ActNewbieTaskList;
+import com.sheep.gamegroup.view.activity.ActUnderstandSheep;
 import com.sheep.gamegroup.view.activity.ActZhongXinWeb;
 import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
 import com.sheep.gamegroup.view.activity.AuthenticationAct;
@@ -408,7 +410,21 @@ public class Jump2View {
         Intent intent = new Intent(context, WebviewAct.class);
         context.startActivity(intent);
     }
+    /**
+     * 跳转到 一分钟快速了解小绵羊 界面
+     */
+    public void goUnderstandSheep(Context context, Object o){
+        Intent intent = new Intent(context, ActUnderstandSheep.class);
+        context.startActivity(intent);
+    }
 
-
+    /**
+     * 跳转到 一分钟快速了解小绵羊 界面
+     */
+    public void goNewbieTaskList(Context context, BaseMessage baseMessage){
+        Intent intent = new Intent(context, ActNewbieTaskList.class);
+        intent.putExtra(BaseMessage.class.getSimpleName(), baseMessage);
+        context.startActivity(intent);
+    }
 
 }

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

@@ -0,0 +1,87 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.widget.ListView;
+
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.view.adapter.NewbieTaskAdp;
+import com.sheep.gamegroup.view.customview.RefreshLayout;
+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/18.
+ */
+
+public class ActNewbieTaskList extends BaseActivity {
+    @BindView(R.id.withdrawal_listview)
+    ListView withdrawalListview;
+    @BindView(R.id.swipe_container)
+    RefreshLayout swipe_container;
+
+    private Activity activity;
+    private NewbieTaskAdp adp;
+    private List<NewbieTask> etyList;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.withdrawal_list;
+    }
+
+    @Override
+    public void initView() {
+        activity = this;
+        BaseMessage baseMessage = (BaseMessage) getIntent().getSerializableExtra(BaseMessage.class.getSimpleName());
+        etyList = baseMessage.getDatas(NewbieTask.class);
+        TitleBarUtils.getInstance()
+                .setTitle(this, "新手任务")
+                .setTitleFinish(this);
+        swipe_container.setFooterView(this, withdrawalListview, R.layout.listview_footer);
+        adp = new NewbieTaskAdp(activity, etyList);
+        withdrawalListview.setAdapter(adp);
+        adp.notifyDataSetChanged();
+
+        swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+
+                etyList.clear();
+                initData();
+            }
+        });
+
+        swipe_container.setOnLoadListener(new RefreshLayout.OnLoadListener() {
+            @Override
+            public void onLoad() {
+                swipe_container.setLoading(false);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        swipe_container.setRefreshing(false);
+                    }
+                }, 1000);
+
+            }
+        });
+
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+    }
+
+}

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

@@ -0,0 +1,115 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.RxjavaCountDownTimer;
+import com.sheep.gamegroup.view.adapter.NewbieTaskAdp;
+import com.sheep.gamegroup.view.customview.RefreshLayout;
+import com.sheep.gamegroup.view.dialog.DialogNewbieTask1;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import static com.umeng.socialize.utils.ContextUtil.getContext;
+
+/**
+ * 一分钟快速了解小绵羊
+ * Created by realicing on 2018/4/18.
+ */
+
+public class ActUnderstandSheep extends BaseActivity {
+
+    private Activity activity;
+
+    @BindView(R.id.i_understand_tv)
+    TextView i_understand_tv;
+
+    private RxjavaCountDownTimer timer;
+    @Override
+    protected int getLayoutId() {
+        return R.layout.act_understand_sheep;
+    }
+
+    @Override
+    public void initView() {
+        activity = this;
+        TitleBarUtils.getInstance()
+                .setTitle(this, "一分钟快速了解小绵羊")
+                .setTitleFinish(this);
+        final int count = BuildConfig.DEBUG ? 10 : 60;
+        timer = RxjavaCountDownTimer.getInstance(count)
+                .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
+                    @Override
+                    public void onFinish() {
+                        i_understand_tv.setEnabled(true);
+                        i_understand_tv.setText("我知道了");
+                    }
+
+                    @Override
+                    public void onTicker(long time) {
+                        i_understand_tv.setEnabled(false);
+                        i_understand_tv.setText(activity.getString(R.string.tip_newbie_task_1, time));
+                    }
+                }).start();
+    }
+
+    @Override
+    public void initListener() {
+        i_understand_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                SheepApp.getInstance().getNetComponent().getApiService().appNewbieTaskLearnFinish()
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                                    @Override
+                                    public void onNext(BaseMessage baseMessage) {
+                                        if(BuildConfig.DEBUG)
+                                            System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
+                                        finish();
+                                    }
+
+                                    @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());
+                                    }
+                                });
+            }
+        });
+    }
+
+    @Override
+    public void initData() {
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if(timer != null)
+            timer.clear();
+    }
+}

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

@@ -191,7 +191,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 开始任务或者下载游戏、试玩
      */
     private void startStask() {
-        if(TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http")){
+        if(task_entity.getTask_type() == 1 && (TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http"))){
             G.showToast("下载地址错误!");
             return;
         }

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

@@ -0,0 +1,108 @@
+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 NewbieTaskAdp extends BaseAdapter {
+    private Context context;
+    private List<NewbieTask> etyList;
+
+    public NewbieTaskAdp(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;
+    }
+    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};
+    @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.newbie_task, null);
+            holder.newbie_task_iv = convertView.findViewById(R.id.newbie_task_iv);
+            holder.newbie_task_name_tv = convertView.findViewById(R.id.newbie_task_name_tv);
+            holder.newbie_task_money_tv = convertView.findViewById(R.id.newbie_task_money_tv);
+            holder.newbie_task_tv = convertView.findViewById(R.id.newbie_task_tv);
+            convertView.setTag(holder);
+        }
+
+        final NewbieTask ety = (NewbieTask) getItem(position);
+        holder.newbie_task_iv.setImageResource(ids[ety.getId()]);
+        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) {
+                doActionByTask(context, ety);
+            }
+        });
+        return convertView;
+    }
+
+    class ViewHolder{
+        ImageView newbie_task_iv;
+        TextView newbie_task_name_tv, newbie_task_money_tv, newbie_task_tv;
+    }
+    public static void doActionByTask(Context context, NewbieTask task){
+        if(context instanceof Activity){
+            switch (task.getId()){
+                case 1://了解小绵羊
+                    Jump2View.getInstance().goUnderstandSheep(context, null);
+                    break;
+                case 2://完成首次提现
+                    Jump2View.getInstance().goWithdrawal(context, null);
+                    UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TIXIAN);
+                    break;
+                case 3://成功邀请好友
+                    Jump2View.getInstance().goAskGetMoney(context, null);
+                    UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_INVITE);
+                    break;
+                case 4://首次完成任务
+                    Jump2View.getInstance().goTryplayView(context, null);
+                    UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_TRY);
+                    break;
+            }
+        } else {
+            if(BuildConfig.DEBUG)
+                G.showToast("测试：context必须继续Activity");
+        }
+    }
+
+}

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

@@ -6,64 +6,73 @@ import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.TextView;
 
-import com.arialyy.aria.core.Aria;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
+import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 
-import java.io.File;
+import java.util.List;
 
-import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
+import static com.sheep.gamegroup.view.adapter.NewbieTaskAdp.doActionByTask;
 
 
 public class DialogNewbieTask1 {
 
-
-    public static AlertDialog showDialog(final Activity activity) {
+    public static AlertDialog showDialog(final Activity activity, List<NewbieTask> newbieTaskList, NewbieTask task) {
         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_i_understand_bt = ViewFindUtils.find(view, R.id.dialog_i_understand_bt);
-        final int count = BuildConfig.DEBUG ? 3 : 60;
-        final RxjavaCountDownTimer timer = RxjavaCountDownTimer.getInstance(count)
-                .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
-                    @Override
-                    public void onFinish() {
-                        dialog_i_understand_bt.setEnabled(true);
-                        dialog_i_understand_bt.setText("点击我了解");
-                    }
-
-                    @Override
-                    public void onTicker(long time) {
-                        dialog_i_understand_bt.setEnabled(false);
-                        dialog_i_understand_bt.setText(activity.getString(R.string.tip_newbie_task_1, time));
-                    }
-                }).start();
-        dialog_i_understand_bt.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mAlertDialog.dismiss();
-//                        Aria.download(activity).loadFtp("ftp://ygdy8:ygdy8@yg72.dydytt.net:8189/阳光电影www.ygdy8.com.深海狂鲨2.BD.720p.中英双字幕.mkv")
-//                                .setFilePath(DIR+ File.separator+"深海狂鲨.mkv").start();
-                    }
-                });
-        mAlertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+        final TextView dialog_tip = ViewFindUtils.find(view, R.id.dialog_tip);
+        if(task != null){
+            switch (task.getId()){
+                case 1://了解小绵羊奖励
+                    dialog_tip.setText("获得小绵羊阅读奖励"+task.getAmount()+"元");
+                    break;
+                case 2://首次提现
+                    dialog_tip.setText("获得首次提现奖励"+task.getAmount()+"元");
+                    break;
+                case 3://成功邀请好友注册
+                    dialog_tip.setText("获得邀请好友注册奖励"+task.getAmount()+"元");
+                    break;
+                case 4://首次做任务赚钱
+                    dialog_tip.setText("获得首次做任务赚钱额外奖励"+task.getAmount()+"元");
+                    break;
+            }
+        }
+        View.OnClickListener onClickListener = new View.OnClickListener() {
             @Override
-            public void onDismiss(DialogInterface dialogInterface) {
-                timer.clear();
+            public void onClick(View view) {
+                NewbieTask task1 = (NewbieTask) view.getTag();
+                doActionByTask(activity, task1);
+                mAlertDialog.dismiss();
+            }
+        };
+        final TextView dialog_sure = ViewFindUtils.find(view, R.id.dialog_sure);
+        setText(dialog_sure, newbieTaskList.get(0), 0);
+        dialog_sure.setOnClickListener(onClickListener);
+        final TextView dialog_sure_2 = ViewFindUtils.find(view, R.id.dialog_sure_2);
+        if(newbieTaskList.size() > 1) {
+            setText(dialog_sure_2, newbieTaskList.get(1), 1);
+            dialog_sure_2.setVisibility(View.VISIBLE);
+            dialog_sure_2.setOnClickListener(onClickListener);
+        }
+        final TextView dialog_sure_3 = ViewFindUtils.find(view, R.id.dialog_sure_3);
+        if(newbieTaskList.size() > 2){
+            setText(dialog_sure_3, newbieTaskList.get(2), 2);
+            dialog_sure_3.setVisibility(View.VISIBLE);
+            dialog_sure_3.setOnClickListener(onClickListener);
+        }
+        final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
+        dialog_close.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mAlertDialog.dismiss();
             }
         });
-//        Window window = mAlertDialog.getWindow();
-//        if(window != null) {
-//            WindowManager.LayoutParams params = window.getAttributes();
-//            if(params != null){
-//                params.gravity = Gravity.BOTTOM;
-//                window.setAttributes(params);
-//            }
-//        }
         try {
             mAlertDialog.show();
         } catch (Exception e) {
@@ -71,4 +80,19 @@ public class DialogNewbieTask1 {
         }
         return mAlertDialog;
     }
+
+    private static void setText(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/DialogNewbieTaskRegistSuccess.java

@@ -0,0 +1,42 @@
+package com.sheep.gamegroup.view.dialog;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+import android.view.View;
+import android.widget.TextView;
+
+import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.jiuyan.samllsheep.R;
+
+
+public class DialogNewbieTaskRegistSuccess {
+
+    public static AlertDialog showDialog(final Activity activity) {
+        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_sure = ViewFindUtils.find(view, R.id.dialog_sure);
+        dialog_sure.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Jump2View.getInstance().goUnderstandSheep(activity, null);
+            }
+        });
+        final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
+        dialog_close.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mAlertDialog.dismiss();
+            }
+        });
+        try {
+            mAlertDialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mAlertDialog;
+    }
+}

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_focused="true" android:drawable="@drawable/shape_newbie_task_bt" />
+  <item android:state_checked="true" android:drawable="@drawable/shape_newbie_task_bt"/>
+  <item android:state_selected="true" android:drawable="@drawable/shape_newbie_task_bt"/>
+  <item android:state_pressed="true" android:drawable="@drawable/shape_newbie_task_bt"/>
+  <item android:drawable="@drawable/shape_newbie_task_bt_normal"/>
+</selector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="5dp" />
+    <solid android:color="@color/theme_app_highlight_transparent"/>
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="5dp" />
+    <solid android:color="@color/blue_start"/>
+</shape>

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

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

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

@@ -0,0 +1,38 @@
+<?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:background="@color/bg_gray"
+    android:orientation="vertical">
+
+    <include layout="@layout/title" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:id="@+id/i_understand_iv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="fitXY"
+                android:adjustViewBounds="true"
+                android:src="@drawable/understand_small_bg"/>
+            <TextView
+                android:id="@+id/i_understand_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#259FEC"
+                android:layout_centerHorizontal="true"
+                android:layout_alignBottom="@+id/i_understand_iv"
+                android:layout_marginBottom="@dimen/content_padding_40"
+                android:paddingTop="@dimen/content_padding_10"
+                android:paddingBottom="@dimen/content_padding_10"
+                android:paddingLeft="@dimen/content_padding_30"
+                android:paddingRight="@dimen/content_padding_30"
+                android:background="@drawable/sp_appointment_bg"
+                android:text="我知道了"/>
+        </RelativeLayout>
+    </ScrollView>
+</LinearLayout>

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

@@ -1,53 +1,89 @@
 <?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"
-    android:layout_gravity="bottom">
+    android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/content_padding_10"
-        android:padding="@dimen/content_padding_10"
-        android:gravity="center"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:orientation="vertical">
+        android:layout_margin="@dimen/content_padding_10">
 
-        <TextView
+        <LinearLayout
+            android:id="@+id/dialog_center_ll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="65dp"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:gravity="center"
-            android:padding="@dimen/content_padding_10"
-            android:text="一分钟快速了解小绵羊"
-            android:textColor="@color/selector_color_choose_head"
-            android:textSize="14sp" />
+            android:orientation="vertical"
+            android:padding="@dimen/content_padding_10">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_marginTop="@dimen/content_padding_10"
-            android:layout_marginLeft="@dimen/content_padding_20"
-            android:layout_marginRight="@dimen/content_padding_20"
-            android:background="#DFDFDF" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="70dp"
+                android:padding="@dimen/content_padding_10"
+                android:gravity="center"
+                android:text="恭喜您"
+                android:textColor="@color/selector_color_choose_head"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/dialog_tip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="获得新人注册奖励1.8元"
+                android:textColor="@color/selector_color_choose_head"
+                android:textSize="14sp" />
 
-        <RelativeLayout
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/content_padding_20"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <Button
+                    android:id="@+id/dialog_sure"
+                    style="@style/style_button_newbie_task"
+                    android:text="了解小绵羊，领取更多资金" />
+                <Button
+                    android:id="@+id/dialog_sure_2"
+                    style="@style/style_button_newbie_task"
+                    android:visibility="gone"
+                    android:text="2.成功邀请好友注册（+2元）" />
+                <Button
+                    android:id="@+id/dialog_sure_3"
+                    style="@style/style_button_newbie_task"
+                    android:visibility="gone"
+                    android:text="3.首次做任务赚钱（+1元）" />
+
+            </LinearLayout>
+        </LinearLayout>
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/content_padding_20"
-            android:gravity="center">
-            <Button
-                android:id="@+id/dialog_i_understand_bt"
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                android:paddingStart="@dimen/content_padding_40"
-                android:paddingEnd="@dimen/content_padding_40"
-                android:enabled="false"
-                android:text="点击我了解"
-                android:background="@drawable/selector_drawable_newbie_task_1"
-                android:textColor="@color/selector_color_choose_head"
-                android:textSize="14sp" />
+            android:layout_centerHorizontal="true"
+            android:gravity="center"
+            android:weightSum="10"
+            android:orientation="horizontal">
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_weight="8"
+                android:layout_height="wrap_content"
+                android:scaleType="fitXY"
+                android:adjustViewBounds="true"
+                android:src="@drawable/newbie_task_coin" />
+        </LinearLayout>
 
-        </RelativeLayout>
-    </LinearLayout>
+        <ImageView
+            android:id="@+id/dialog_close"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginTop="@dimen/content_padding_10"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@+id/dialog_center_ll"
+            android:src="@drawable/newbie_task_close" />
+    </RelativeLayout>
 </FrameLayout>

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

@@ -125,8 +125,13 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="@dimen/content_padding_10"
                         android:layout_marginBottom="@dimen/content_padding_10"
-                        android:padding="@dimen/content_padding_small"
-                        android:background="@color/green"
+                        android:paddingTop="@dimen/content_padding_small"
+                        android:paddingBottom="@dimen/content_padding_small"
+                        android:paddingStart="@dimen/content_padding_10"
+                        android:paddingEnd="@dimen/content_padding_10"
+                        android:background="@drawable/shape_newbie_task_tv"
+                        android:textSize="14sp"
+                        android:textColor="#ffffff"
                         android:text="新手任务"/>
                 </RelativeLayout>
 

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

@@ -0,0 +1,46 @@
+<?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="90dp"
+    android:layout_margin="@dimen/content_padding_10"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:padding="@dimen/content_padding_20">
+    <ImageView
+        android:id="@+id/newbie_task_iv"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/newbie_task_1"
+        android:layout_centerVertical="true"
+        android:layout_alignParentStart="true"/>
+    <TextView
+        android:id="@+id/newbie_task_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="了解小绵羊"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_toEndOf="@+id/newbie_task_iv"
+        android:layout_alignParentTop="true"/>
+    <ImageView
+        android:id="@+id/newbie_task_money_iv"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:src="@drawable/newbie_task_moeny"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_toEndOf="@+id/newbie_task_iv"
+        android:layout_alignParentBottom="true"/>
+    <TextView
+        android:id="@+id/newbie_task_money_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="+0.6元"
+        android:layout_marginStart="@dimen/content_padding_3"
+        android:layout_toEndOf="@+id/newbie_task_money_iv"
+        android:layout_alignParentBottom="true"/>
+    <TextView
+        android:id="@+id/newbie_task_tv"
+        style="@style/style_button_small"
+        android:text="领取"
+        android:layout_centerVertical="true"
+        android:layout_alignParentEnd="true"/>
+
+</RelativeLayout>

app/src/main/res/values/dd_styles.xml

@@ -55,6 +55,15 @@
         <item name="android:progressDrawable">@drawable/process_default</item>
         <!--<item name="android:indeterminateDrawable">@color/W</item>-->
     </style>
+    <style name="style_button_newbie_task" parent="button">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/selector_button_newbie_task</item>
+        <item name="android:textColor">@color/btn_color_main</item>
+        <item name="android:layout_margin">@dimen/content_padding_10</item>
+        <item name="android:textSize">@dimen/text_size_15</item>
+    </style>
     <style name="style_button" parent="button">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>
@@ -64,6 +73,14 @@
         <item name="android:layout_margin">@dimen/content_padding_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
+    <style name="style_button_small" parent="button">
+        <item name="android:layout_width">70dp</item>
+        <item name="android:layout_height">30dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/selector_button_full_main</item>
+        <item name="android:textColor">@color/btn_color_main</item>
+        <item name="android:textSize">@dimen/text_size_15</item>
+    </style>
     <style name="full.button_main" parent="button">
         <item name="android:background">@drawable/selector_button_full_main</item>
         <item name="android:textColor">@color/btn_color_main</item>

app/src/main/res/values/gamegroup_string.xml

@@ -25,5 +25,5 @@
     <string name="sheep_id">绵羊号</string>
     <string name="my_qr">我的二维码</string>
 
-    <string name="tip_newbie_task_1">我了解了（%1$4d秒）</string>
+    <string name="tip_newbie_task_1">我知道了（%1$4d秒）</string>
 </resources>