newbie task receive reward

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

@@ -383,6 +383,9 @@ public interface ApiService {
     @POST("app/newbie_task/login_red_packet")
     Observable<BaseMessage> getNewRedPackage();
 
+    @POST("app/newbie_task/receive/money/{id}")
+    Observable<BaseMessage> getNewbieTaskReward(@Path("id") Integer id);
+
     /**
      * 更换手机号
      */

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

@@ -2516,6 +2516,25 @@ public class CommonUtil {
                 });
     }
 
+    public void getNewbieTaskReward(int id, Action1<Boolean> action){
+        SheepApp.getInstance().getNetComponent().getApiService().getNewbieTaskReward(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if (action != null) {
+                            action.call(true);
+                        }
+                    }
+                });
+    }
+
     /**
      * 设置游戏标识文本，如：现金，福利
      *

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

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.WithdrawalAdapter;
@@ -175,8 +176,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
             G.showToast("请输入支付宝账号");
             return;
         }
-        if (TextUtils.isEmpty(account)) {
-            G.showToast("请输入支付宝真实姓名");
+        if (cash_account_tv.isEnabled() && !StringUtils.isMobile(account)) {
+            G.shortToast("请输入支付宝账号绑定的手机号");
             return;
         }
         UMConfigUtils.Event.SHEEP_TIXIAN_COMMIT.onEvent();
@@ -267,7 +268,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
             ViewUtil.setEnabled(cash_account_tv, false);
             ViewUtil.setText(withdraw_tip_tv, "已绑定支付宝账号");
         } else {
-            ViewUtil.setText(withdraw_tip_tv, "注意：提现请先绑定支付，且支付宝账号的真实姓名必须小绵羊实名认证的姓名一致，否则无法绑定成功。");
+            ViewUtil.setText(withdraw_tip_tv, "注意：提现请先绑定支付，且支付宝账号的真实姓名必须与小绵羊实名认证的姓名一致，否则无法绑定成功。");
         }
         if (!TextUtils.isEmpty(realname)) {
             ViewUtil.setEnabled(cash_realname_tv, false);

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

@@ -124,6 +124,16 @@ public class NewbieTaskAdp extends BaseAdapter {
 
     public static void doActionByTask(Context context, NewbieTaskAdp adp, NewbieTask task) {
         if (context instanceof Activity) {
+            if (task.getStatus() == 4) {
+                CommonUtil.getInstance().getNewbieTaskReward(task.getId(), (ret) -> {
+                    task.setStatus(2);
+                    if (adp != null) {
+                        adp.notifyDataSetChanged();
+                    }
+                    G.showToast("领取成功");
+                });
+                return;
+            }
             NEWBIE_TASK_ITEM.onEvent("id", task.getId(), "name", task.getName());
             switch (task.getId()) {
                 case 1://了解小绵羊
@@ -152,7 +162,9 @@ public class NewbieTaskAdp extends BaseAdapter {
                     }
                     break;
                 case 6://加入官方QQ群
-                    doActionByTaskQQ(context, task);
+                    if (task.getStatus() == 0 || task.getStatus() == 3) {
+                        Jump2View.getInstance().goAddQQTaskDetail(context, task);
+                    }
                     break;
                 case 7://试玩游戏
                     Intent in = new Intent(context, ActMain.class);
@@ -183,20 +195,4 @@ public class NewbieTaskAdp extends BaseAdapter {
         }
     }
 
-    private static void doActionByTaskQQ(Context context, NewbieTask task) {
-
-        switch (task.getStatus()) {
-            case 0://"去完成");
-                Jump2View.getInstance().goAddQQTaskDetail(context, task);
-                break;
-            case 1://"审核中");
-                break;
-            case 2://"已完成");
-                break;
-            case 3://"去完成");
-                Jump2View.getInstance().goAddQQTaskDetail(context, task);
-                break;
-        }
-    }
-
 }

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

@@ -36,7 +36,7 @@
                     android:layout_marginLeft="20dp"
                     android:layout_marginRight="20dp"
                     android:gravity="center"
-                    android:text="注意：提现请先绑定支付，且支付宝账号的真实姓名必须小绵羊实名认证的姓名一致，否则无法绑定成功。"
+                    android:text="注意：提现请先绑定支付，且支付宝账号的真实姓名必须与小绵羊实名认证的姓名一致，否则无法绑定成功。"
                     android:textColor="#ff333333"
                     android:textSize="13sp" />