Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

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

@@ -15,10 +15,10 @@ public class GameEntity implements Serializable{
     private int accepted_task_id;//integer($int64)领取福利时使用
 
     private PlayGameEntity app;
-    private int can_download;//boolean
+    private boolean can_download;//boolean
     private int is_reservation;//integer($int64)0 不是 1是预约
 
-    private int received_voucher;//boolean是否已经领取了福利
+    private boolean received_voucher;//boolean是否已经领取了福利
 
     private int release_task_id;//integer($int64)发布任务id
 
@@ -60,11 +60,11 @@ public class GameEntity implements Serializable{
         this.app = app;
     }
 
-    public int getCan_download() {
+    public boolean getCan_download() {
         return can_download;
     }
 
-    public void setCan_download(int can_download) {
+    public void setCan_download(boolean can_download) {
         this.can_download = can_download;
     }
 
@@ -76,11 +76,11 @@ public class GameEntity implements Serializable{
         this.is_reservation = is_reservation;
     }
 
-    public int getReceived_voucher() {
+    public boolean getReceived_voucher() {
         return received_voucher;
     }
 
-    public void setReceived_voucher(int received_voucher) {
+    public void setReceived_voucher(boolean received_voucher) {
         this.received_voucher = received_voucher;
     }
 

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

@@ -1,10 +1,15 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.content.Intent;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
+import com.kfzs.duanduan.ActDownloadMgr;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.fragment.FgtPlayGame;
 import com.sheep.gamegroup.view.fragment.FgtWelfareCenter;
 import com.sheep.jiuyan.samllsheep.R;
@@ -35,6 +40,21 @@ public class ActGameCenter extends BaseActivity {
                         Jump2View.getInstance().goGameSearch(activity, null);
                     }
                 })
+                .setRightSecondBtn(activity, R.mipmap.search_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Jump2View.getInstance().goGameSearch(activity, null);
+                    }
+                })
+                .setRightImgBotton(activity, R.drawable.index_download, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        TitleBarUtils.getInstance()
+                                .setRightRedPoint(activity, View.GONE);
+                        startActivity(new Intent(activity, ActDownloadMgr.class));
+                        UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
+                    }
+                })
                 .addTabs(activity, act_game_center_vp,"玩转游戏", new FgtPlayGame(), "福利中心", new FgtWelfareCenter());
 
     }

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

@@ -24,6 +24,8 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameEntity;
 import com.sheep.gamegroup.model.entity.PlayGameEntity;
+import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
@@ -290,12 +292,53 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
     }
 
     //更新按钮状态与添加点击事件
-    private void updateView(Activity activity, PlayGameEntity playGameEntity, TextView textView) {
-//        if(playGameEntity.getAvailable_receive() == 0 && playGameEntity.getReceive_account() == 0){//未领取账号
-//
-//            CommonUtil.getInstance()
-//                    .xiaomiRevieceAcctoun(find_game_down_tv, playGameEntity, activity);
-//        }else
+    private void updateView(final Activity activity, PlayGameEntity playGameEntity, TextView textView) {
+        final TaskReleaseEty releaseEty = gameEntity.getRelease_task();
+        final TaskEty taskEty = releaseEty != null?releaseEty.getTask():null;
+        if(releaseEty != null && taskEty != null){
+
+            if(taskEty.isGameReservationCantDownload()){//游戏任务中的预约任务，且不能下载情况下
+                textView.setText("预约下载");
+                textView.setEnabled(true);
+                textView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        CommonUtil.getInstance().reservationGameTask(activity, releaseEty, new Action1<Integer>() {
+                            @Override
+                            public void call(Integer integer) {
+
+                            }
+                        });
+                    }
+                });
+            } else {
+                if (gameEntity.getReceived_voucher()) {//已领取
+                    if (gameEntity.getCan_download()) {
+                        downLoadTextViewMap.put(playGameEntity.getDownload_url(), textView);
+                        downLoadTextViewMap.put(playGameEntity.getPackage_name(), textView);
+                        releaseEty.getDownloadHelper().updateDownloadTaskView((Activity) activity, taskEty, textView);
+                    } else {
+                        textView.setEnabled(false);
+                        textView.setText("已经预约");
+                    }
+
+                } else {
+                    textView.setText("领取任务");
+                    textView.setEnabled(true);
+                    textView.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            CommonUtil.getInstance().receiveAward(activity, releaseEty, new Action1<Integer>() {
+                                @Override
+                                public void call(Integer integer) {
+
+                                }
+                            });
+                        }
+                    });
+                }
+            }
+        }else
         if (playGameEntity.isCanDonload()) {//可下载
             downLoadTextViewMap.put(playGameEntity.getDownload_url(), textView);
             downLoadTextViewMap.put(playGameEntity.getPackage_name(), textView);

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

@@ -8,8 +8,11 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.services.DownloadTaskService;
 import com.sheep.gamegroup.model.entity.GameEntity;
 import com.sheep.gamegroup.model.entity.PlayGameEntity;
+import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
@@ -19,6 +22,10 @@ import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.List;
 
+import rx.functions.Action1;
+
+import static com.sheep.gamegroup.view.adapter.WelfareAdapter.TO_REFRESH;
+
 /**
  * Created by ljy on 2018/9/3.
  */
@@ -52,10 +59,57 @@ public class PlayGameItemAdapter extends AdbCommonRecycler<GameEntity>{
         ViewUtil.setText(item_name_tv, gameEntity.getApp().getName());
         ViewUtil.setText(item_date_tv, gameEntity.getApp().getPackage_size()+"M");
         GlideImageLoader.setGameImage((ImageView) holder.itemView.findViewById(R.id.item_icon_iv), gameEntity.getApp().getIcon());
+        final TaskReleaseEty releaseEty = gameEntity.getRelease_task();
+        final TaskEty taskEty = releaseEty != null?releaseEty.getTask():null;
+        if(releaseEty != null && taskEty != null){
+
+            if(taskEty.isGameReservationCantDownload()){//游戏任务中的预约任务，且不能下载情况下
+                detail_task_tv_center.setText("预约下载");
+                detail_task_tv_center.setEnabled(true);
+                detail_task_tv_center.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        CommonUtil.getInstance().reservationGameTask(context, releaseEty, new Action1<Integer>() {
+                            @Override
+                            public void call(Integer integer) {
+
+                            }
+                        });
+                    }
+                });
+            } else {
+                if (gameEntity.getReceived_voucher()) {//已领取
+                    if (gameEntity.getCan_download()) {
+                        releaseEty.getDownloadHelper().updateDownloadTaskView((Activity) context, taskEty, detail_task_tv_center);
+                        detail_task_tv_center.setTag("PUBLIC_TAG_PREFIX_TEXTVIEW_LIST" + taskEty.getDownload_link());
+                    } else {
+                        detail_task_tv_center.setEnabled(false);
+                        detail_task_tv_center.setText("已经预约");
+                    }
+
+                } else {
+                    detail_task_tv_center.setText("领取任务");
+                    detail_task_tv_center.setEnabled(true);
+                    detail_task_tv_center.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            CommonUtil.getInstance().receiveAward(context, releaseEty, new Action1<Integer>() {
+                                @Override
+                                public void call(Integer integer) {
+
+                                }
+                            });
+                        }
+                    });
+                }
+            }
+        }else
         if (gameEntity.getApp().isCanDonload()) {//可下载
             gameEntity.getApp().getFindAppHelper().updateDownloadTaskView((Activity) activity, gameEntity.getApp(), detail_task_tv_center);
+            detail_task_tv_center.setTag("PUBLIC_TAG_PREFIX_TEXTVIEW_LIST" + gameEntity.getApp().getDownload_link());
         } else {//预约下载
             gameEntity.getApp().getFindAppHelper().updateReservationView((Activity) activity, gameEntity.getApp(), detail_task_tv_center);
+            detail_task_tv_center.setTag("PUBLIC_TAG_PREFIX_TEXTVIEW_LIST" + gameEntity.getApp().getDownload_link());
         }
         item_download_welfare_line.setVisibility(holder.getAdapterPosition() + 1 == getItemCount() ? View.GONE : View.VISIBLE);
 

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPlayGameSon.java

@@ -11,9 +11,11 @@ import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameEntity;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.view.adapter.PlayGameItemAdapter;
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 
 import java.util.Locale;
 
@@ -44,6 +46,7 @@ public class FgtPlayGameSon extends BaseListFragment<GameEntity> {
         if(bundle != null){
             type = bundle.getInt("type", 1002);
         }
+        EventBus.getDefault().register(this);
         return rootView;
     }
 
@@ -72,4 +75,14 @@ public class FgtPlayGameSon extends BaseListFragment<GameEntity> {
         EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_PLAYGAME_REFRESH_H));
     }
 
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        CommonUtil.getInstance().setEventResultViewStatus(event, view_list);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.sheep.jiuyan.samllsheep.utils;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.support.annotation.DrawableRes;
 import android.support.design.widget.TabLayout;
@@ -12,10 +13,12 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.gamegroup.view.fragment.FgtWelfareCenter;
@@ -407,12 +410,21 @@ public class TitleBarUtils {
             @Override
             public void onPageSelected(int position) {
                 if(position == 0){
-                    setRightImgBotton(activity,  R.mipmap.search_black_img, new View.OnClickListener() {
+                    setRightSecondBtn(activity, R.mipmap.search_black_img, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
                             Jump2View.getInstance().goGameSearch(activity, null);
                         }
-                    });
+                    })
+                            .setRightImgBotton(activity, R.drawable.index_download, new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    TitleBarUtils.getInstance()
+                                            .setRightRedPoint(activity, View.GONE);
+                                    activity.startActivity(new Intent(activity, ActDownloadMgr.class));
+                                    UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
+                                }
+                            });
                 }else {
                     setRightBotton(activity, "我的福利", 0, new View.OnClickListener() {
                         @Override