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

# Conflicts:
#	app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

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);//空数据
-    public Handler mHanderl = new Handler(Looper.getMainLooper()) {
+    Handler mHanderl = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
@@ -222,11 +222,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     break;
                 case 1:
                     tryMakeMoneyAdp.clear();
-                    if (!ListUtil.isEmpty(allTaskAcceptedTaskList)) {
+                    if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
                         recyclerview_line.setVisibility(View.VISIBLE);
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
-                    if (!ListUtil.isEmpty(releaseEtyLists)) {
+                    if(!ListUtil.isEmpty(releaseEtyLists)) {
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists));
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
@@ -236,7 +236,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     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));
+                    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:
@@ -313,7 +313,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
          */
         adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
         adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0, "is_hot"), "每日必做");
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1, "about_to_begin"), "即将开始");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1,"about_to_begin"), "即将开始");
 
 //        mViewPager.setOffscreenPageLimit(2);
         mViewPager.setAdapter(adpViewPagerDetail);
@@ -448,7 +448,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //用户信息
         userEntity = DataUtil.getInstance().getUserEntity();
-        if (userEntity != null) {
+        if(userEntity != null){
             loadUserInfo();
         }
         //任务
@@ -461,13 +461,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //实时动态
         List<MoreDataEntity> cacheMoreDataEtyList = DataUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
-        if (!ListUtil.isEmpty(cacheMoreDataEtyList)) {
+        if(!ListUtil.isEmpty(cacheMoreDataEtyList)){
             invite(cacheMoreDataEtyList);
         }
 
         //公告
         List<BulletinEnty> cacheBulletinEtyList = DataUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
-        if (ListUtil.isEmpty(cacheBulletinEtyList)) {
+        if(ListUtil.isEmpty(cacheBulletinEtyList)){
             homepageItemNoticeLayout.setVisibility(View.GONE);
         } else {
             bulletinEntyLists.clear();
@@ -476,7 +476,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //轮播
         List<SlideshowEty> cacheSlideshowEtyList = DataUtil.getInstance().getCacheList(ApiKey.slideshow, SlideshowEty.class);
-        if (ListUtil.isEmpty(cacheSlideshowEtyList)) {
+        if(ListUtil.isEmpty(cacheSlideshowEtyList)){
             banner.setVisibility(View.GONE);
         } else {
             for (SlideshowEty slideshowEty : cacheSlideshowEtyList) {
@@ -488,7 +488,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //首页list
         List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
-        if (ListUtil.isEmpty(cacheHomeListEtyList)) {
+        if(ListUtil.isEmpty(cacheHomeListEtyList)){
             home_list_gridview_layout.setVisibility(View.GONE);
         } else {
             home_list_gridview_layout.setVisibility(View.VISIBLE);
@@ -559,21 +559,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void call(BaseMessage o) {
 
-                if (o != null) {
+                if(o != null){
                     CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
-                    if (cashAwarsEntity != null) {
-
-                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward() + ""));
-                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash() + ""));
-                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare() + ""));
-                        homepage_item_get_award_name_tv.setText(award + "");
-                        homepage_item_money_tv.setText(cash + "");
-                        homepage_item_juan_tv.setText(welfare + "");
+                    if(cashAwarsEntity != null){
+
+                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward()+""));
+                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash()+""));
+                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare()+""));
+                        homepage_item_get_award_name_tv.setText(award+"");
+                        homepage_item_money_tv.setText(cash+"");
+                        homepage_item_juan_tv.setText(welfare+"");
                     }
                 }
             }
         });
-        if (!isFirst) {
+        if(!isFirst){
             for (int i = 0; i < adpViewPagerDetail.getCount(); i++) {
                 FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(i);
                 item.refreshData();
@@ -609,14 +609,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (null == homeListEntitysGridview.get(position)) {
+                if(null ==  homeListEntitysGridview.get(position)){
                     return;
                 }
-                HomeListEntity homeListEntity = homeListEntitysGridview.get(position);
+                HomeListEntity homeListEntity= homeListEntitysGridview.get(position);
                 UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-                if (homeListEntity.getJump().equals("-2")) {
+                if(homeListEntity.getJump().equals("-2")){
                     setValueList(!homeListEntity.isSelect());
-                } else {
+                }else {
                     CommonUtil.getInstance()
                             .goWhere(activity, homeListEntity, "首页");
                 }
@@ -636,7 +636,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 1,
                                 0,
                                 0,
-                                "-1",
+                                 "-1",
                                 3));
 //        tryMakeMoneyPresenter.releaseTask(parameEty);
     }
@@ -676,7 +676,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         BaseMessage baseMessage = (BaseMessage) o;
         userEntity = baseMessage.getData(UserEntity.class);
-        if (userEntity == null) {
+        if(userEntity == null){
             return;
         }
         DataUtil.getInstance().setUserEntity(userEntity);
@@ -719,7 +719,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void returnTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.new_run_task(is_succession, show_game_task));
-        if (isNewData) {
+        if(isNewData) {
             BaseMessage baseMessage = (BaseMessage) object;
             allTaskAcceptedTaskList = baseMessage.getDataList(TaskAcceptedEty.class);
             AutoTaskListUtil.getInstance().loadList(allTaskAcceptedTaskList);
@@ -753,7 +753,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void releaseTaskTaskUpdataView(Object object) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task);
-        if (isNewData && object instanceof BaseMessage) {
+        if(isNewData && object instanceof BaseMessage) {
             List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
             if (releaseEtyList != null) {
                 releaseEtyLists = releaseEtyList;
@@ -791,7 +791,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successSlideshow(BaseMessage baseMessage) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.slideshow);
-        if (isNewData) {
+        if(isNewData){
             List<SlideshowEty> slideshowEtyList = baseMessage.getDataList(SlideshowEty.class);
             if (ListUtil.isEmpty(slideshowEtyList)) {
                 banner.setVisibility(View.GONE);
@@ -816,7 +816,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successbulletin(BaseMessage baseMessage) {
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.bulletin);
-        if (isNewData) {
+        if(isNewData){
             List<BulletinEnty> bulletinEntyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), BulletinEnty.class);
             if (ListUtil.isEmpty(bulletinEntyList)) {
                 homepageItemNoticeLayout.setVisibility(View.GONE);
@@ -832,7 +832,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void successhomeList(BaseMessage baseMessage) {
         checkAndInitView();
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
-        if (isNewData) {
+        if(isNewData){
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
             if (ListUtil.isEmpty(homeListEntityList)) {
                 home_list_gridview_layout.setVisibility(View.GONE);
@@ -892,11 +892,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void onResume() {
         super.onResume();
         UserEntity result = DataUtil.getInstance().getUserEntity();
-        if (result == null) {
+        if(result == null) {
             CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
                 @Override
                 public void call(UserEntity item) {
-                    if (item != null) {
+                    if(item != null) {
                         userEntity = item;
                         loadUserInfo();
                     }
@@ -906,7 +906,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             userEntity = result;
             loadUserInfo();
         }
-        if (DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
+        if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
             refreshTaskList();
 
         viewRobDuty.setOnClickListener(new View.OnClickListener() {
@@ -1178,7 +1178,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 点击一条公告
      */
     private void onClickNotice(BulletinEnty item) {
-        switch (item.getJumpType()) {// 跳转类型:11,任务 98,内部h5 99,外部h5
+        switch (item.getJumpType()){// 跳转类型:11,任务 98,内部h5 99,外部h5
             case 11:
                 Jump2View.getInstance().goTaskDetailView(activity, NumberFormatUtils.parseInteger(item.getJumpValue()));
                 break;
@@ -1281,31 +1281,31 @@ 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()) {
+                        if (popupWindow.isShowing()){
                             popupWindow.dismiss();
                         }
                     }
                 });
     }
-
     /**
      * 新手任务
      */
-    private void addNewTask() {
+    private void addNewTask(){
         HomeListEntity homeListEntityNewTask = new HomeListEntity();
         homeListEntityNewTask.setTitle("新手任务");
         homeListEntityNewTask.setDesc("新手任务");
         homeListEntityNewTask.setJump("-1");
-        homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw + "");
+        homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw+"");
         homeListEntitys.add(0, homeListEntityNewTask);
-        if (homeListEntitys.size() > 8) {
+        if(homeListEntitys.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("查看更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
-            homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             homeListEntitys.add(7, homeListEntity);
         }
         setValueList(false);
@@ -1313,26 +1313,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private void setValueList(boolean flag) {
         homeListEntitysGridview.clear();
-        for (int i = 0; i < homeListEntitys.size(); i++) {
-            if (flag) {
+        for(int i=0;i<homeListEntitys.size();i++){
+            if(flag){
                 homeListEntitysGridview.add(homeListEntitys.get(i));
-            } else {
-                if (i < 8) {
+            }else {
+                if(i<8){
                     homeListEntitysGridview.add(homeListEntitys.get(i));
                 }
             }
 
         }
-        if (homeListEntitysGridview.size() > 8) {
+        if(homeListEntitysGridview.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("查看更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
             if (flag) {
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click + "");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
             } else {
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             }
             homeListEntitysGridview.set(7, homeListEntity);
         }

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

@@ -80,6 +80,7 @@ public class TaskListItemAdp extends BaseAdapter {
             holder.price_tv = convertView.findViewById(R.id.price_tv);
             holder.icon_iv = convertView.findViewById(R.id.icon_iv);
             holder.detail_task_tv = convertView.findViewById(R.id.detail_task_tv);
+            holder.desc_tv = convertView.findViewById(R.id.desc_tv);
             convertView.setTag(holder);
         }
 
@@ -98,6 +99,7 @@ public class TaskListItemAdp extends BaseAdapter {
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
         }
         holder.price_tv.setText(stateStr);
+        holder.desc_tv.setText(ety.getRemarks());
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -115,7 +117,7 @@ public class TaskListItemAdp extends BaseAdapter {
 
     class ViewHolder{
         ImageView icon_iv;
-        TextView name_tv, date_tv, price_tv,detail_task_tv;
+        TextView name_tv, date_tv, price_tv,detail_task_tv,desc_tv;
     }
 
     /**
@@ -165,20 +167,20 @@ public class TaskListItemAdp extends BaseAdapter {
                 break;
             case 3://完成
             case 9:
-                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
-                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
+                textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
                 textView.setText("已完成");
                 break;
             case 4://失败
             case 5:
             case 8:
-                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
-                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
+                textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
                 textView.setText("任务失败");
                 break;
             case 6:
-                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
-                textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
+                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
+                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
                 textView.setText("重新提交");
                 break;
         }

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

@@ -81,7 +81,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     private int from;// 1 来自主页
     private int type = 0;//0:推荐 1:热门 2:预约 3:游戏推荐
     private String show_type;
-    private int is_succession;//0:一般任务 1:连续任务
+    private int is_succession;//0:一般任务 1:连续任务3:所有任务
 
     public TryMakeMoneyAdp(Context context) {
         super(context);

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

@@ -117,6 +117,8 @@ public class FgtAudit extends BaseFragment {
                     if(baseMessage != null){
                         List<TaskAcceptedEty> releaseEtyList = baseMessage.getDataList(TaskAcceptedEty.class);
                         ListUtil.addAll(etyList, releaseEtyList);
+                        if(!etyList.isEmpty())
+                            etyList.add(null);
                     }
                     notifyDataSetChanged();
                 }

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

@@ -113,6 +113,7 @@ public class FgtMainAudit extends BaseCompatFragment {
     }
 
     private void new_tab(){
+//        indicator.newTab();
         pager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));
         pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {

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

@@ -36,8 +36,9 @@
         android:id="@+id/gridview_item_tag_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="试玩赚钱"
-        android:textSize="7sp"
+        android:text="试玩"
+        android:textSize="9sp"
         android:textColor="@color/black_6_3"
+        android:padding="@dimen/content_padding_3"
         android:layout_toRightOf="@+id/linearlayout"/>
 </RelativeLayout>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <View
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:background="@drawable/shape_red_solid_rectangle"/>
+
+</LinearLayout>

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

@@ -4,7 +4,9 @@
     android:layout_height="wrap_content"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:padding="@dimen/content_padding_20"
-    android:layout_margin="@dimen/content_padding_10">
+    android:layout_marginBottom="@dimen/content_padding_10"
+    android:layout_marginLeft="@dimen/content_padding_10"
+    android:layout_marginRight="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/icon_iv"
@@ -13,6 +15,7 @@
         android:src="@mipmap/icon"
         android:layout_centerVertical="true"/>
     <LinearLayout
+        android:id="@+id/content_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -77,7 +80,13 @@
         </RelativeLayout>
     </LinearLayout>
 
-
-
-
+    <TextView
+        android:id="@+id/desc_tv"
+        android:layout_marginTop="@dimen/content_padding_10"
+        android:layout_below="@+id/icon_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:textSize="@dimen/text_size_2"
+        android:textColor="@color/txt_black_818181"/>
 </RelativeLayout>