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

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

@@ -182,13 +182,14 @@ public class FgtPersonalCenter extends BaseCompatFragment {
      * @return 是否显示红包
      */
     private void isShowRedPackage() {
+      //  DataUtil.getInstance().是官方包吗();
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
-        if (((userEntity.getNewbie_task_status() & (1 << 4)) == 0) && (userEntity.getParent_code().equals("")) && (userEntity.getIs_new() == 1)) {
-            ivRedpackage.setVisibility(View.VISIBLE);
-        } else {
+        if ((userEntity.getParent_code().equals("") || (userEntity.getCreate_time_line() < 2) || (userEntity.getPackage_cate() != 1))) {
             ivRedpackage.setVisibility(View.GONE);
+        } else {
+            ivRedpackage.setVisibility(View.VISIBLE);
         }
     }
 
@@ -213,9 +214,9 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         showRedPackageAfterInvitation(getActivity(), getView(), baseMessage);
-                      if (popupWindow.isShowing()){
-                          popupWindow.dismiss();
-                      }
+                        if (popupWindow.isShowing()) {
+                            popupWindow.dismiss();
+                        }
 
                     }
                 });
@@ -245,11 +246,11 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
         popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
         RedPackageMoney redPackageMoney = baseMessage.getData(RedPackageMoney.class);
-        tvMoney.setText("" + redPackageMoney.getData());
+        tvMoney.setText("" + 1);
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-             //   CommonUtil.getInstance().updateUserInfo(null);
+                //   CommonUtil.getInstance().updateUserInfo(null);
                 updateUserInfo(null);
                 popupWindow.dismiss();
                 ivRedpackage.setVisibility(View.GONE);
@@ -308,7 +309,6 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         switch (view.getId()) {
             case R.id.iv_redpackage://邀请成功后有可领红包
                 ViewUtil.changeRedPackage(getActivity(), getView(), FgtPersonalCenter.this);
-                ivRedpackage.setVisibility(View.GONE);
                 break;
             case R.id.icon_img_iv://图片
                 if (TestUtil.isTest()) {

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

@@ -212,7 +212,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private static final int LIST_COUNT = 2;//tryMakeMoneyAdp 总共有2条数据
     private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
-    Handler mHanderl = new Handler(Looper.getMainLooper()) {
+    public Handler mHanderl = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
@@ -239,11 +239,24 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding_20));
                     mViewPager.setLayoutParams(params);
                     break;
+                case 7:
+                    isShowRedPackages((Context)msg.obj);
+                    LogUtil.logI("handle message");
+                    break;
             }
 
         }
     };
 
+    public void isShowRedPackages(Context obj) {
+        if (userEntity == null) {
+            userEntity = DataUtil.getInstance().getUserEntity();
+        }
+        if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
+            showRedPackage(obj);
+        }
+    }
+
     /**
      * @return 是否显示红包
      */
@@ -255,7 +268,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             userEntity = DataUtil.getInstance().getUserEntity();
         }
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
-            showRedPackage(getActivity(), LayoutInflater.from(getContext()).inflate(R.layout.homepage_act_layout, null));
+            showRedPackage(getContext());
         }
     }
 
@@ -326,6 +339,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         });
         CommonUtil.getInstance().reflex(tabLayout, activity);
     }
+
     private int curPosition = 0;
 
 
@@ -567,6 +581,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         isFirst = false;
     }
+
     private boolean isFirst = true;
 
     /**
@@ -608,6 +623,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             }
         });
     }
+
     private void refreshTaskList() {
         DataUtil.getInstance().isTaskListChange(getClass());
         tryMakeMoneyPresenter.returnTask(is_succession, show_game_task);
@@ -696,8 +712,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void giveUpTaskFailView(Object o) {
 
     }
+
     private int is_succession = 3;//所有
     private int show_game_task = 1;//包含游戏任务
+
     @Override
     public void returnTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.new_run_task(is_succession, show_game_task));
@@ -867,7 +885,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_layout.setVisibility(View.GONE);
 
     }
+
     private int onResumeCount = 0;
+
     @Override
     public void onResume() {
         super.onResume();
@@ -1203,13 +1223,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
 
     }
+
     /**
      * 邀请成功后在个人资料显示领红包弹窗
-     *
-     * @param mActivity 当前Activity
      */
-    public void showRedPackage(final Activity mActivity, View viewAnchor) {
-        View view = LayoutInflater.from(mActivity).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
+    public void showRedPackage(Context context) {
+        Activity mActivity = (Activity)context;
+        View viewAnchor = LayoutInflater.from(context).inflate(R.layout.homepage_act_layout, null, false);
+        View view = LayoutInflater.from(context).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
         TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
         TextView tvMoney = view.findViewById(R.id.tv_money);
         ImageView ivClose = view.findViewById(R.id.iv_close);
@@ -1244,6 +1265,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         });
 
     }
+
     /**
      * 兑换红包
      *
@@ -1303,15 +1325,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         if(homeListEntitysGridview.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
+            homeListEntity.setTitle("查看更多");
+            homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
             if (flag) {
-                homeListEntity.setTitle("收起模块");
-                homeListEntity.setDesc("收起模块");
                 homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
             } else {
-                homeListEntity.setTitle("查看更多");
-                homeListEntity.setDesc("查看更多");
                 homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             }
             homeListEntitysGridview.set(7, homeListEntity);

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

@@ -77,6 +77,26 @@ public class UserEntity implements Serializable {
     private int gender;
     @Column(name = "birthday")
     private String birthday;
+    @Column(name = "package_cate")
+    private int package_cate;
+    @Column(name = "create_time_line")
+    private int create_time_line;
+
+    public int getPackage_cate() {
+        return package_cate;
+    }
+
+    public void setPackage_cate(int package_cate) {
+        this.package_cate = package_cate;
+    }
+
+    public int getCreate_time_line() {
+        return create_time_line;
+    }
+
+    public void setCreate_time_line(int create_time_line) {
+        this.create_time_line = create_time_line;
+    }
 
     public int getGender() {
         return gender;

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.adapter;
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.Message;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,7 +12,10 @@ import android.widget.TextView;
 
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -129,7 +133,7 @@ public class NewbieTaskAdp extends BaseAdapter {
                     if (BuildConfig.DEBUG) {
                         G.showToast("测试：服务器返回数据错误，这个任务可能没有完成？");
                     }
-                    new FgtSmallSheep().isShowRedPackage();
+                    isShow(context);
                     break;
                 case 6://加入官方QQ群
                     doActionByTaskQQ(context, task);
@@ -141,6 +145,17 @@ public class NewbieTaskAdp extends BaseAdapter {
         }
     }
 
+    private static void isShow(Context context) {
+        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
+        if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
+            Message message = Message.obtain();
+            message.obj = context;
+            message.what = 7;
+            new FgtSmallSheep().mHanderl.sendMessage(message);
+            LogUtil.logI("sendmessage");
+        }
+    }
+
     private static void doActionByTaskQQ(Context context, NewbieTask task) {
 
         switch (task.getStatus()) {