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

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

@@ -216,7 +216,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                       if (popupWindow.isShowing()){
                           popupWindow.dismiss();
                       }
-                        ivRedpackage.setVisibility(View.GONE);
+
                     }
                 });
     }
@@ -252,6 +252,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
              //   CommonUtil.getInstance().updateUserInfo(null);
                 updateUserInfo(null);
                 popupWindow.dismiss();
+                ivRedpackage.setVisibility(View.GONE);
             }
         });
         ivClose.setOnClickListener(new View.OnClickListener() {

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

@@ -88,6 +88,7 @@ import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sunfusheng.marqueeview.MarqueeView;
 import com.youth.banner.Banner;
 import com.youth.banner.BannerConfig;
@@ -232,11 +233,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     checkAndInitView();
                     break;
                 case 2:
-                    int count = 0;
-                    for (int i = 0; i < adpViewPagerDetail.getCount(); i++) {
-                        FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(i);
-                        count = Math.max(item.getDataCount(), count);
-                    }
+                    FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
+                    int count = item.getDataCount();
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
                     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);
@@ -250,10 +248,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * @return 是否显示红包
      */
     public void isShowRedPackage() {
+        if (SpUtils.getFirst("first")) {
+            return;
+        }
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
-        if (((userEntity.getNewbie_task_status() & 16) == 0)&&userEntity.getIs_new()==1) {
+        if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
             showRedPackage(getActivity(), LayoutInflater.from(getContext()).inflate(R.layout.homepage_act_layout, null));
         }
     }
@@ -276,6 +277,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         //每次进入主页都刷新一下url配置信息
         CommonUtil.getInstance().initUrlConfigByNet(null, null);
         isShowRedPackage();
+        SpUtils.saveFirst("first", true);
     }
 
 
@@ -305,8 +307,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
         tabLayout.setupWithViewPager(mViewPager);
+        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                curPosition = position;
+                mHanderl.sendEmptyMessage(2);//重新计算viewpager高度
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
         CommonUtil.getInstance().reflex(tabLayout, activity);
     }
+    private int curPosition = 0;
 
 
     private void loadUserInfo() {
@@ -418,11 +438,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             loadUserInfo();
         }
         //任务
-        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
-        if (cacheTaskReleaseEtyList != null) {
-            releaseEtyLists.addAll(cacheTaskReleaseEtyList);
-            mHanderl.sendEmptyMessage(1);
-        }
+//        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
+//        if (cacheTaskReleaseEtyList != null) {
+//            releaseEtyLists.addAll(cacheTaskReleaseEtyList);
+//            mHanderl.sendEmptyMessage(1);
+//        }
 
 
         //实时动态
@@ -668,6 +688,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         G.showToast("取消任务成功");
         CommonUtil.getInstance().setTAskEnty(null);
         refreshTaskList();
+        FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(0);//因为放弃了任务，所以刷新可以接收的任务列表
+        item.refreshData();
     }
 
     @Override
@@ -1204,7 +1226,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         backgroundAlpha(0.7f, mActivity);
         popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
         popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
-        tvMoney.setText("");
+        tvMoney.setText("1.8");
         tvNew.setText("新人红包");
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -1237,6 +1259,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         LogUtil.logI("0------" + new Gson().toJson(baseMessage));
                         G.showToast(baseMessage.getMsg());
                     }
+
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         if (popupWindow.isShowing()){
@@ -1249,16 +1272,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 新手任务
      */
     private void addNewTask(){
-//        if(onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity,userEntity) && homeListEntitysGridview != null)//第一次才调用
-        {
-            HomeListEntity homeListEntity = new HomeListEntity();
-            homeListEntity.setTitle("新手任务");
-            homeListEntity.setDesc("新手任务");
-            homeListEntity.setJump("-1");
-            homeListEntity.setIcon(R.mipmap.homepage_xinshourw+"");
-            homeListEntitys.add(0, homeListEntity);
-
-        }
+        HomeListEntity homeListEntityNewTask = new HomeListEntity();
+        homeListEntityNewTask.setTitle("新手任务");
+        homeListEntityNewTask.setDesc("新手任务");
+        homeListEntityNewTask.setJump("-1");
+        homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw+"");
+        homeListEntitys.add(0, homeListEntityNewTask);
         if(homeListEntitys.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("查看更多");
@@ -1267,7 +1286,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             homeListEntitys.add(7, homeListEntity);
         }
-        onResumeCount++;
         setValueList(false);
     }
 

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

@@ -204,6 +204,9 @@ public interface ApiService {
     @POST("app/user/receive_red_packet")
     Observable<BaseMessage> exchangeRedPackage(@Body JSONObject jsonObject);
 
+    /**新手红包
+     * @return  .
+     */
     @POST("app/newbie_task/login_red_packet")
     Observable<BaseMessage>getNewRedPackage();
     /**

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

@@ -398,6 +398,9 @@ public class DataUtil {
         }
         return null;
     }
+    public static boolean 是官方包吗(){
+        return "kfzs".equals(ChannelContent.getInstance().getChannel_name());
+    }
 //    //正在运行的任务
 //    List<TaskAcceptedEty> taskAcceptedEtyList = ListUtil.emptyList();
 //    public void addTaskAcceptedEtyList(List<TaskAcceptedEty> list) {

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

@@ -1266,6 +1266,7 @@ public class ViewUtil {
     public void showGridviewStatues(Context context, TextView textView, HomeListEntity entity){
         textView.setVisibility(View.INVISIBLE);
 
+        int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
         switch (entity.getTag()){
             default:
 
@@ -1275,12 +1276,14 @@ public class ViewUtil {
                 textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
                 textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
                 textView.setText("现金");
+                textView.setPadding(4 * padding, padding, 4 * padding, padding);
                 break;
             case 4:
                 textView.setVisibility(View.VISIBLE);
                 textView.setBackgroundResource(R.drawable.shape_red_f07422_stroke_retangle_no_lb);
                 textView.setTextColor(context.getResources().getColor(R.color.red_F07422));
                 textView.setText("活跃");
+                textView.setPadding(4 * padding, padding, 4 * padding, padding);
                 break;
         }
 

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

@@ -169,15 +169,15 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
             return;
         }
         switch (view.getId()) {
-            case R.id.llayout_sex://用户性别
+          /*  case R.id.llayout_sex://用户性别
                 ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
-                break;
+                break;*/
             case R.id.tv_sex://用户性别
                 ViewUtil.choiceSex(PersonalInfoAct.this, getCurrentFocus());
                 break;
-            case R.id.llayout_birthday://用户生日
+           /* case R.id.llayout_birthday://用户生日
                 ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,TextUtils.isEmpty(userEntity.getBirthday())?"1990-01-01":userEntity.getBirthday());
-                break;
+                break;*/
             case R.id.tv_birthday:
                 ViewUtil.showDateDialog(PersonalInfoAct.this, tvBirthday,TextUtils.isEmpty(userEntity.getBirthday())?"1990-01-01":userEntity.getBirthday());
                 break;

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

@@ -9,6 +9,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -53,14 +54,16 @@ public class NewbieTaskAdp extends BaseAdapter {
     public long getItemId(int position) {
         return 0;
     }
+
     private final static int[] ids = {R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, R.drawable.icon, R.drawable.newbie_task_6};
+
     @Override
     public View getView(final int position, View convertView, ViewGroup parent) {
         Object tag = convertView == null ? null : convertView.getTag();
         ViewHolder holder;
-        if(tag instanceof ViewHolder){
+        if (tag instanceof ViewHolder) {
             holder = (ViewHolder) tag;
-        }else {
+        } 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);
@@ -71,19 +74,19 @@ public class NewbieTaskAdp extends BaseAdapter {
         }
 
         final NewbieTask ety = (NewbieTask) getItem(position);
-        holder.newbie_task_iv.setImageResource(ids[(ety.getId()+ids.length-1)%ids.length]);
+        holder.newbie_task_iv.setImageResource(ids[(ety.getId() + ids.length - 1) % ids.length]);
         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) {
-                if(onClickListener != null)
+                if (onClickListener != null)
                     onClickListener.onClick(view);
                 doActionByTask(context, ety);
             }
         });
-        switch (ety.getStatus()){
+        switch (ety.getStatus()) {
             case 0:
                 holder.newbie_task_tv.setText("去完成");
                 break;
@@ -101,14 +104,15 @@ public class NewbieTaskAdp extends BaseAdapter {
         return convertView;
     }
 
-    class ViewHolder{
+    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){
+
+    public static void doActionByTask(Context context, NewbieTask task) {
+        if (context instanceof Activity) {
             NEWBIE_TASK_ITEM.onEvent("id", task.getId(), "name", task.getName());
-            switch (task.getId()){
+            switch (task.getId()) {
                 case 1://了解小绵羊
                     Jump2View.getInstance().goUnderstandSheep(context, null);
                     break;
@@ -122,23 +126,24 @@ public class NewbieTaskAdp extends BaseAdapter {
                     Jump2View.getInstance().goTryplayView(context, null);
                     break;
                 case 5://注册账号并登录
-                    if(BuildConfig.DEBUG){
+                    if (BuildConfig.DEBUG) {
                         G.showToast("测试：服务器返回数据错误，这个任务可能没有完成？");
                     }
+                    new FgtSmallSheep().isShowRedPackage();
                     break;
                 case 6://加入官方QQ群
                     doActionByTaskQQ(context, task);
                     break;
             }
         } else {
-            if(BuildConfig.DEBUG)
+            if (BuildConfig.DEBUG)
                 G.showToast("测试：context必须继续Activity");
         }
     }
 
-    private static void doActionByTaskQQ(Context context,NewbieTask task) {
+    private static void doActionByTaskQQ(Context context, NewbieTask task) {
 
-        switch (task.getStatus()){
+        switch (task.getStatus()) {
             case 0://"去完成");
                 Jump2View.getInstance().goAddQQTaskDetail(context, task);
                 break;

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

@@ -246,7 +246,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             getFromACache(type);
         }
         //加载网络数据
-        if(TextUtils.isEmpty(show_type))
+        if(TextUtils.isEmpty(show_type))//这里为
             type = 0;
         getFromNetWork(type);
     }

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

@@ -43,11 +43,36 @@ public class SpUtils {
      * @return value
      * ，
      */
+    public static boolean getFirst(String key) {
+        SharedPreferences user = SheepApp.mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
+        return user.getBoolean(key, false);
+    }
+    /**
+     * 存入一些小型的用户数据
+     *
+     * @param key   ,
+     * @param value ,
+     */
+    public static void saveFirst(String key, boolean value) {
+        SharedPreferences user = SheepApp.mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putBoolean(key, value);
+        editor.apply();
+    }
+
+    /**
+     * 获取user表的用户数据
+     *
+     * @param key ，
+     * @return value
+     * ，
+     */
     public static int getOrder(String key) {
         SharedPreferences user = SheepApp.mContext.getSharedPreferences("user", Context.MODE_PRIVATE);
         return user.getInt(key, 0);
     }
 
+
     /**
      * 点击事件 记录,是否在提示
      *

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

@@ -4,14 +4,13 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     android:paddingBottom="@dimen/content_padding_10"
-    android:paddingEnd="@dimen/content_padding_10"
-    android:paddingStart="@dimen/content_padding_10"
     android:paddingTop="@dimen/content_padding_10">
 
     <LinearLayout
         android:id="@+id/linearlayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
         android:orientation="vertical"
         android:gravity="center"
         android:layout_marginTop="@dimen/content_padding_4">

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

@@ -35,7 +35,7 @@
                 android:id="@+id/tv_money"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="0.01"
+                android:text="0.00"
                 android:textColor="#ffffe0d7"
                 android:textSize="38sp" />