messagecenter & newbie task

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

@@ -6,7 +6,7 @@ import java.io.Serializable;
  * Created by realicing on 2018/4/18.
  * realicing@sina.com
  */
-public class NewbieTask implements Serializable{
+public class NewbieTask implements Serializable {
     private double amount;
 
     private int status;//0 初始状态 1 提交审核 2 成功 3审核失败
@@ -25,10 +25,11 @@ public class NewbieTask implements Serializable{
 
     private int user_task_id;
 
-    public void setAmount(double amount){
+    public void setAmount(double amount) {
         this.amount = amount;
     }
-    public double getAmount(){
+
+    public double getAmount() {
         return this.amount;
     }
 
@@ -56,34 +57,43 @@ public class NewbieTask implements Serializable{
         this.user_task_id = user_task_id;
     }
 
-    public void setId(int id){
+    public void setId(int id) {
         this.id = id;
     }
-    public int getId(){
+
+    public int getId() {
         return this.id;
     }
-    public void setDesc(String desc){
+
+    public void setDesc(String desc) {
         this.desc = desc;
     }
-    public String getDesc(){
+
+    public String getDesc() {
         return this.desc;
     }
-    public void setName(String name){
+
+    public void setName(String name) {
         this.name = name;
     }
-    public String getName(){
+
+    public String getName() {
         return this.name;
     }
-    public void setUpdate_time(int update_time){
+
+    public void setUpdate_time(int update_time) {
         this.update_time = update_time;
     }
-    public int getUpdate_time(){
+
+    public int getUpdate_time() {
         return this.update_time;
     }
-    public void setCreate_time(int create_time){
+
+    public void setCreate_time(int create_time) {
         this.create_time = create_time;
     }
-    public int getCreate_time(){
+
+    public int getCreate_time() {
         return this.create_time;
     }
 
@@ -92,6 +102,6 @@ public class NewbieTask implements Serializable{
     }
 
     public boolean getEnabled() {
-        return status == 0 || status == 3 ;
+        return status == 0 || status == 3 || status == 4;
     }
 }

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtMainHeader.java

@@ -13,6 +13,7 @@ import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.MessageUnReadEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.qrcode.QRCodeActivity;
 import com.sheep.gamegroup.module.qrcode.ScanQRCodeActivity;
@@ -27,6 +28,7 @@ import com.sheep.gamegroup.view.activity.ActMsg;
 import com.sheep.gamegroup.view.activity.ActWebShareImage;
 import com.sheep.gamegroup.view.dialog.DialogNotificationOfArrival;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -161,7 +163,8 @@ public class FgtMainHeader extends BaseFragment {
 
     @OnClick(R.id.iv_msg)
     public void onMsgClick() {
-        startActivity(new Intent(getActivity(), ActMsg.class));
+//        startActivity(new Intent(getActivity(), ActMsg.class));
+        Jump2View.getInstance().goWeb(getActivity(), new WebParams(Config.getUrlByPath(Config.PATH_MESSAGE_HOME)).setTitle("消息中心").hideProgress());
     }
 
     @OnClick(R.id.iv_download)

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

@@ -26,6 +26,7 @@ import android.view.ViewTreeObserver;
 import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -2490,6 +2491,26 @@ public class CommonUtil {
         }
     }
 
+    public void getRedPackage(Action1<Boolean> action) {
+        SheepApp.getInstance().getNetComponent().getApiService().getNewRedPackage()
+                .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);
+                        }
+                        CommonUtil.getInstance().updateUserInfo(null);
+                    }
+                });
+    }
+
     /**
      * 设置游戏标识文本，如：现金，福利
      *

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

@@ -15,6 +15,7 @@ import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
@@ -89,7 +90,7 @@ public class NewbieTaskAdp extends BaseAdapter {
         holder.newbie_task_tv.setOnClickListener((view) -> {
             if (onClickListener != null)
                 onClickListener.onClick(view);
-            doActionByTask(context, ety);
+            doActionByTask(context, this, ety);
         });
         switch (ety.getStatus()) {
             case 0:
@@ -104,6 +105,9 @@ public class NewbieTaskAdp extends BaseAdapter {
             case 3:
                 holder.newbie_task_tv.setText("去完成");
                 break;
+            case 4:
+                holder.newbie_task_tv.setText("立即领取");
+                break;
         }
         holder.newbie_task_tv.setEnabled(ety.getEnabled());
         return convertView;
@@ -115,6 +119,10 @@ public class NewbieTaskAdp extends BaseAdapter {
     }
 
     public static void doActionByTask(Context context, NewbieTask task) {
+        doActionByTask(context, null, task);
+    }
+
+    public static void doActionByTask(Context context, NewbieTaskAdp adp, NewbieTask task) {
         if (context instanceof Activity) {
             NEWBIE_TASK_ITEM.onEvent("id", task.getId(), "name", task.getName());
             switch (task.getId()) {
@@ -122,7 +130,7 @@ public class NewbieTaskAdp extends BaseAdapter {
                     Jump2View.getInstance().goUnderstandSheep(context, null);
                     break;
                 case 2://完成首次提现
-                    Jump2View.getInstance().tryGoWithdrawal(context, (UserEntity)null);
+                    Jump2View.getInstance().tryGoWithdrawal(context, (UserEntity) null);
                     break;
                 case 3://成功邀请好友
                     Intent intent = new Intent(context, ActMain.class);
@@ -133,6 +141,15 @@ public class NewbieTaskAdp extends BaseAdapter {
                     Jump2View.getInstance().goTryplayView(context, null);
                     break;
                 case 5://注册账号并登录
+                    if (task.getStatus() == 4) {
+                        CommonUtil.getInstance().getRedPackage((ret) -> {
+                            task.setStatus(2);
+                            if (adp != null) {
+                                adp.notifyDataSetChanged();
+                            }
+                            G.showToast("领取成功");
+                        });
+                    }
                     break;
                 case 6://加入官方QQ群
                     doActionByTaskQQ(context, task);

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -101,6 +101,7 @@ public class Config {
     public static final String PATH_APP_HOME = STATION_APP + "/home";
     public static final String PATH_WELFARE_HOME = STATION_APP + "/welfare-center";
     public static final String PATH_GAME_HOME = STATION_APP + "/game-center";
+    public static final String PATH_MESSAGE_HOME = STATION_APP + "/message-center";
     public static final String PATH_ARTICLE_LIST = STATION_APP + "/article-list";
     public static final String PATH_WELFARE_DETAIL = STATION_APP + "/detail";
     public static final String PATH_DISCOUNT_DESC = STATION_APP + "/discount";