首页修改、审核修改/增加资料

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

@@ -36,6 +36,7 @@ import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.react.ConfigUtil;
 import com.kfzs.duanduan.react.SharedPreferences;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
+import com.kfzs.duanduan.utils.dlg.FormatAny;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
@@ -173,6 +174,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     TextView homepage_item_money_tv;
     @BindView(R.id.homepage_item_juan_tv)
     TextView homepage_item_juan_tv;
+    @BindView(R.id.recyclerview_line)
+    View recyclerview_line;
 
 
     @Inject
@@ -212,6 +215,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 case 1:
                     tryMakeMoneyAdp.clear();
                     if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
+                        recyclerview_line.setVisibility(View.VISIBLE);
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
                     if(!ListUtil.isEmpty(releaseEtyLists)) {
@@ -510,6 +514,15 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                 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+"");
+                    }
                 }
             }
         });
@@ -560,12 +573,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
                 if(homeListEntity.getJump().equals("-2")){
                     setValueList(!homeListEntity.isSelect());
-                    homeListEntity.setSelect(!homeListEntity.isSelect());
                 }else {
                     CommonUtil.getInstance()
                             .goWhere(activity, homeListEntity, "首页");
                 }
-                adpHomeListGrideview.notifyDataSetChanged();
             }
         });
     }
@@ -1204,7 +1215,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
-            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            if (flag) {
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
+            } else {
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            }
             homeListEntitysGridview.set(7, homeListEntity);
         }
         adpHomeListGrideview.notifyDataSetChanged();

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

@@ -8,31 +8,31 @@ import java.io.Serializable;
  */
 
 public class CashAwarsEntity implements Serializable {
-    private String welfare;//: 27994,
-    private String award;//: 47504.47,
-    private String cash;//: 19510.47
+    private double welfare;//: 27994,
+    private double award;//: 47504.47,
+    private double cash;//: 19510.47
 
-    public String getWelfare() {
+    public double getWelfare() {
         return welfare;
     }
 
-    public void setWelfare(String welfare) {
+    public void setWelfare(double welfare) {
         this.welfare = welfare;
     }
 
-    public String getAward() {
+    public double getAward() {
         return award;
     }
 
-    public void setAward(String award) {
+    public void setAward(double award) {
         this.award = award;
     }
 
-    public String getCash() {
+    public double getCash() {
         return cash;
     }
 
-    public void setCash(String cash) {
+    public void setCash(double cash) {
         this.cash = cash;
     }
 }

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

@@ -21,6 +21,15 @@ public class HomeListEntity {
     private String UpdateTime;//	integer ($int64)更新时间
     private String Url;//	integer ($int64)更新时间
     private boolean select;
+    private int Tag;//标签类型（0无，1热门，2最新，3现金，4活跃，5福利）
+
+    public int getTag() {
+        return Tag;
+    }
+
+    public void setTag(int tag) {
+        Tag = tag;
+    }
 
     public boolean isSelect() {
         return select;

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

@@ -22,6 +22,7 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -51,6 +52,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Container;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.GameAccountEntity;
+import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.PayEntity;
 import com.sheep.gamegroup.model.entity.RobTask;
 import com.sheep.gamegroup.model.entity.TaskEty;
@@ -1235,4 +1237,31 @@ public class ViewUtil {
     public static String getNetImgByName(String name) {
         return String.format(Locale.CHINA, "http://cdngame.kuaifazs.com/%s.png", name);
     }
+
+    /**
+     * 标签类型（0无，1热门，2最新，3现金，4活跃，5福利）
+     * homepage item statues
+     */
+    public void showGridviewStatues(Context context, TextView textView, HomeListEntity entity){
+        textView.setVisibility(View.INVISIBLE);
+
+        switch (entity.getTag()){
+            default:
+
+                break;
+            case 3:
+                textView.setVisibility(View.VISIBLE);
+                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
+                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setText("现金");
+                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("活跃");
+                break;
+        }
+
+    }
 }

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

@@ -132,6 +132,9 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View {
         if(object instanceof BaseMessage){
             List<TaskAcceptedEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskAcceptedEty.class);
             ListUtil.addAll(etyList, releaseEtyList);
+
+            if(!etyList.isEmpty())
+                etyList.add(null);//底部部分----我是有底线的
         }
         notifyDataSetChanged();
     }

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

@@ -64,11 +64,11 @@ public class AdpHomeListGrideview extends BaseAdapter {
             convertView.setTag(holder);
         }
         final HomeListEntity entity = getItem(position);
-        ViewUtil.setText(holder.gridview_item_tag_tv, entity.getTip());
+        ViewUtil.newInstance().showGridviewStatues(context,holder.gridview_item_tag_tv, entity);
         ViewUtil.setText(holder.gridview_item_name_tv, entity.getTitle());
         Glide.with(context)
                 .load(entity.getId() == 0 ? Integer.valueOf(entity.getIcon()) : entity.getIcon())
-                .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /2, G.WIDTH /4 /2))
+                .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /3, G.WIDTH /4 /3))
                 .into(holder.gridview_item_icon_iv);
         return convertView;
     }

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

@@ -65,6 +65,9 @@ public class TaskListItemAdp extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
+        if(position == getCount()-1){
+            return LayoutInflater.from(context).inflate(R.layout.find_item_bottom, null);
+        }
         Object tag = convertView == null ? null : convertView.getTag();
         ViewHolder holder;
         if(tag instanceof ViewHolder){
@@ -102,7 +105,7 @@ public class TaskListItemAdp extends BaseAdapter {
             }
         });
         TestUtil.setDebugDownLoad(context, convertView, ety.getRelease_task().getTask());
-        holder.detail_task_tv.setText(returnValue3(ety, holder.detail_task_tv));
+        returnValue3(ety, holder.detail_task_tv);
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
                 .apply(new RequestOptions().placeholder(R.mipmap.icon))
@@ -156,20 +159,24 @@ public class TaskListItemAdp extends BaseAdapter {
             case 1://提交中
             case 2:
             case 7:
-                textView.setBackgroundResource(R.drawable.shape_blue_stroke_rectangle_x);
+                textView.setBackgroundResource(R.drawable.shape_blue_stroke_rectangle_10_radius);
                 textView.setTextColor(context.getResources().getColor(R.color.btn_color_main_stroke));
                 textView.setText("审核中");
                 break;
             case 3://完成
-                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
+                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
                 textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
                 textView.setText("已完成");
                 break;
             case 4://失败
             case 5:
-            case 6:
             case 8:
-                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_x);
+                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
+                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                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.setText("重新提交");
                 break;

app/src/main/res/drawable/drawable_selector_find.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/tab_find_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_find_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_find"/>
+    <item android:drawable="@drawable/homepage_faxian_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/homepage_faxian_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/homepage_faxian"/>
 
 </selector>

app/src/main/res/drawable/drawable_selector_personalcenter.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/tab_personalcenter_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_personalcenter_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_personalcenter"/>
+    <item android:drawable="@drawable/homepage_wode_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/homepage_wode_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/homepage_wode"/>
 
 </selector>

app/src/main/res/drawable/drawable_selector_task.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/tab_task_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_task_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_task"/>
+    <item android:drawable="@drawable/homepage_zhuanqian_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/homepage_zhuanqian_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/homepage_zhuanqian"/>
 
 </selector>

app/src/main/res/drawable/shape_blue_stroke_rectangle_10_radius.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:radius="10dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#2EBEF2" />
+</shape>

app/src/main/res/drawable/shape_gray_stroke_rectangle_10_radius.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:radius="10dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#CCCCCC" />
+</shape>

app/src/main/res/drawable/shape_red_f07422_stroke_retangle_no_lb.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#F07422" />
+</shape>

app/src/main/res/drawable/shape_red_stroke_rectangle_10_radius.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:radius="10dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#FD2D54" />
+</shape>

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

@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@mipmap/audit_top_bg"
-        android:paddingTop="@dimen/status_bar_height"
         android:paddingBottom="@dimen/content_padding_15">
 
 
@@ -34,7 +33,7 @@
             android:gravity="center"
             android:text="@string/app_name"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_4"
+            android:textSize="@dimen/text_size_5"
             app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +43,7 @@
             android:id="@+id/number_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/text_size_25"
+            android:textSize="@dimen/text_size_3"
             android:textColor="@color/white"
             android:text=""
             android:gravity="center"

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

@@ -2,7 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal">
+    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"

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

@@ -47,8 +47,18 @@
             <include
                 layout="@layout/homepage_item_notice_and_currenttime"/>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="#fff5f5f5"/>
+
             <include
                 layout="@layout/homepage_item_get_award"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:background="#fff5f5f5"/>
 
             <include
                 layout="@layout/homepage_item_notice"
@@ -76,6 +86,15 @@
                 android:paddingLeft="@dimen/content_padding_10"
                 android:paddingRight="@dimen/content_padding_10"/>
 
+            <View
+                android:id="@+id/recyclerview_line"
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:layout_marginBottom="@dimen/content_padding_8"
+                android:layout_marginTop="@dimen/content_padding_8"
+                android:background="#fff5f5f5"
+                android:visibility="gone"/>
+
             <!--选项卡-->
             <include
                 layout="@layout/tablayout_viewpager_layout"/>

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

@@ -34,17 +34,17 @@
         app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"
         android:textColor="@color/black_999999"
-        android:textSize="@dimen/text_size_12"/>
+        android:textSize="@dimen/text_size_1"/>
 
     <TextView
         android:id="@+id/homepage_item_juan_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="1234324"
+        android:text=""
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"
         android:textColor="@color/black_999999"
-        android:textSize="@dimen/text_size_12"/>
+        android:textSize="@dimen/text_size_1"/>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:text="2018/02/14 14:41"
                 android:layout_below="@+id/name_tv"
-                android:textSize="@dimen/text_size_3"
+                android:textSize="@dimen/text_size_2"
                 android:textColor="@color/txt_black_818181"
                 android:layout_marginBottom="@dimen/content_padding_small"/>
         </RelativeLayout>

app/src/main/res/values/strings.xml

@@ -86,4 +86,8 @@
     <string name="audit_total_money">%s元\n\n累计现金</string>
     <string name="audit_total_welfare">%s元\n\n累计福利</string>
     <string name="my_invitation_str">我的邀请码:%s</string>
+
+    <string name="homepage_award">你还有%s元的奖励未领取</string>
+    <string name="homepage_cash">现金任务未完成：%s元</string>
+    <string name="homepage_welfare">游戏福利未领取：%s元</string>
 </resources>

view/src/main/res/values/colors.xml

@@ -75,6 +75,7 @@
     <color name="gray_F0F0F0">#F0F0F0</color>
     <color name="yellow_D3AF57">#D3AF57</color>
     <color name="red_FD2D54">#FD2D54</color>
+    <color name="red_F07422">#F07422</color>
     <color name="gray_CCCCCC">#CCCCCC</color>
 
 </resources>