任务详情修改、意见反馈、关于我们、首页修改

app/src/main/AndroidManifest.xml

@@ -295,6 +295,7 @@
         <activity android:name="com.sheep.gamegroup.view.activity.ActWeb" android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActMyMoney" android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.FeedbackAct" android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActMainGame" android:screenOrientation="portrait"/>
         <!--友盟start-->
 
 

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

@@ -130,7 +130,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                         .goWebview(
                                 getActivity(),
                                 new WebviewEntity(
-                                        0,
+                                        1,
                                         "关于我们"));
                 break;
             case R.id.feedbook_layout://意见反馈

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

@@ -64,9 +64,13 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ImageGlarryDrawable;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.MyGridview;
+import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.adapter.AdpHomeListGrideview;
+import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTask1;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
@@ -147,6 +151,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     RecyclerView recyclerview;
     @BindView(R.id.recharge)
     TextView recharge;
+    @BindView(R.id.home_list_gridview_gv)
+    MyGridview home_list_gridview_gv;
+    @BindView(R.id.home_list_gridview_listview)
+    MyListview home_list_gridview_listview;
+    @BindView(R.id.home_list_gridview_layout)
+    LinearLayout home_list_gridview_layout;
 
     @Inject
     SmallSheepPresenter pagePresenter;
@@ -164,6 +174,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     private List<BulletinEnty> bulletinEntyLists = new ArrayList<>();
 
     private List<HomeListEntity> homeListEntitys = new ArrayList<>();
+    private List<HomeListEntity> homeListEntitysGridview = new ArrayList<>();
+    private List<HomeListEntity> homeListEntitysListview = new ArrayList<>();
+    private AdpHomeListGrideview adpHomeListGrideview;
+    private AdpHomeListListview adpHomeListListview;
 
     Handler mHanderl = new Handler() {
         @Override
@@ -206,6 +220,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 .build()
                 .inject(this);
         recyclerInitView();
+
     }
 
 
@@ -319,6 +334,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         recyclerview.setAdapter(tryMakeMoneyAdp);
+
+        adpHomeListListview = new AdpHomeListListview(homeListEntitysListview, getActivity());
+        adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview, getActivity());
+        home_list_gridview_listview.setAdapter(adpHomeListListview);
+        home_list_gridview_gv.setAdapter(adpHomeListGrideview);
     }
 
     private void recyclerInitData() {
@@ -376,7 +396,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 break;
             case R.id.lying_layout://跳转到游戏页面
                 Jump2View.getInstance()
-                        .goHomePageView(activity, 1);
+                        .goMainGame(activity);
 
                 break;
             case R.id.newbie_task://新手任务
@@ -678,9 +698,22 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     HomeListEntity.class
             );
             if(homeListEntity != null && homeListEntity.size()> 0){
+                home_list_gridview_layout.setVisibility(View.VISIBLE);
                 homeListEntitys.clear();
+                homeListEntitysGridview.clear();
+                homeListEntitysListview.clear();
                 homeListEntitys.addAll(homeListEntity);
+                for (int i=0;i<homeListEntitys.size();i++){
+                    if(i<4){
+                        homeListEntitysGridview.add(homeListEntitys.get(i));
+                    }else {
+                        homeListEntitysListview.add(homeListEntitys.get(i));
+                    }
+                }
+                adpHomeListGrideview.notifyDataSetChanged();
+                adpHomeListListview.notifyDataSetChanged();
             }else {
+                home_list_gridview_layout.setVisibility(View.GONE);
 
             }
         }catch (Exception e){
@@ -690,6 +723,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     @Override
     public void failhomeList(BaseMessage baseMessage) {
+        home_list_gridview_layout.setVisibility(View.GONE);
 
     }
 

app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -55,7 +55,7 @@ public enum MainTab {
 
         @Override
         public int getDrawableId() {
-            return R.drawable.drawable_selector_class;
+            return R.drawable.drawable_selector_personalcenter;
         }
     }
 //    ,

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

@@ -13,8 +13,18 @@ private String Id;//	integer ($int64)
 private String Jump;//	string跳转（h5填跳转地址，原生：1试玩赚钱，2邀请赚钱，3躺着赚钱，4办卡赚钱）
 private String Order;//	integer ($int64)排序，默认99，越小越靠前
 private String Title;//	string标题
-private String Type;//	integer ($int64)类型（0不跳转，1h5，2原生）
+private int Type;//	integer ($int64)类型（0不跳转，1h5，2原生）
 private String UpdateTime;//	integer ($int64)更新时间
+    private String Url;//	integer ($int64)更新时间
+
+    public String getUrl() {
+        return Url;
+    }
+
+    public void setUrl(String Url) {
+        this.Url = Url;
+    }
+
 
     public String getCreateTime() {
         return CreateTime;
@@ -72,11 +82,11 @@ private String UpdateTime;//	integer ($int64)更新时间
         Title = title;
     }
 
-    public String getType() {
+    public int getType() {
         return Type;
     }
 
-    public void setType(String type) {
+    public void setType(int type) {
         Type = type;
     }
 

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

@@ -0,0 +1,100 @@
+package com.sheep.gamegroup.model.entity;
+
+import java.io.Serializable;
+
+/**
+ * Created by ljy on 2018/5/10.
+ */
+
+public class TaskChild implements Serializable {
+    private String BeginTime;//1525147200,
+    private String Order;//1,
+    private String EndTime;//1530115200,
+    private String Desc;//"<p>阿斯顿发射的发</p>",
+    private String Amount;//1,
+    private String Id;//8,
+    private String task_id;//161,
+    private String Time;//0,
+    private String Name;//"212312311111111",
+    private int TaskType;//0 即将开始  1 进行中  2 已完成
+
+    public String getBeginTime() {
+        return BeginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        BeginTime = beginTime;
+    }
+
+    public String getOrder() {
+        return Order;
+    }
+
+    public void setOrder(String order) {
+        Order = order;
+    }
+
+    public String getEndTime() {
+        return EndTime;
+    }
+
+    public void setEndTime(String endTime) {
+        EndTime = endTime;
+    }
+
+    public String getDesc() {
+        return Desc;
+    }
+
+    public void setDesc(String desc) {
+        Desc = desc;
+    }
+
+    public String getAmount() {
+        return Amount;
+    }
+
+    public void setAmount(String amount) {
+        Amount = amount;
+    }
+
+    public String getId() {
+        return Id;
+    }
+
+    public void setId(String id) {
+        Id = id;
+    }
+
+    public String getTask_id() {
+        return task_id;
+    }
+
+    public void setTask_id(String task_id) {
+        this.task_id = task_id;
+    }
+
+    public String getTime() {
+        return Time;
+    }
+
+    public void setTime(String time) {
+        Time = time;
+    }
+
+    public String getName() {
+        return Name;
+    }
+
+    public void setName(String name) {
+        Name = name;
+    }
+
+    public int getTaskType() {
+        return TaskType;
+    }
+
+    public void setTaskType(int taskType) {
+        TaskType = taskType;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.model.entity;
 import com.alibaba.fastjson.JSONObject;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 任务
@@ -28,6 +29,15 @@ public class TaskEty implements Serializable{
     private String bonus;// 0,
     private String desc;// 任务详情介绍
     private String ext;// 对应的信用卡配置的id
+    private List<TaskChild> child;
+
+    public List<TaskChild> getChild() {
+        return child;
+    }
+
+    public void setChild(List<TaskChild> child) {
+        this.child = child;
+    }
 
     public int getAcceptedTaskId() {
         return acceptedTaskId;

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

@@ -7,6 +7,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.ViewTreeObserver;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
@@ -14,9 +15,12 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -295,4 +299,76 @@ public class CommonUtil {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 首页，homelist 跳转 逻辑
+     */
+    public void goWhere(Context context, HomeListEntity entity){
+        if(entity == null){
+            return;
+        }
+        try {
+            switch (entity.getType()){
+                case 0://不跳转
+                default:
+
+                    break;
+                case 1://h5
+                    Jump2View.getInstance()
+                            .goWebview(context,
+                                    new WebviewEntity(0,
+                                            entity.getUrl(),
+                                            entity.getTitle()));
+                    break;
+                case 2://原生
+                    goNative(context, entity);
+                    break;
+                case 3://特殊h5
+                    goNative(context, entity);
+                    break;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+    /**
+     *
+     */
+    public void goNative(Context context, HomeListEntity entity){
+
+        switch(Integer.valueOf(entity.getJump())){
+            case 1://试玩赚钱
+
+                Jump2View.getInstance().goTryplayView(context, null);
+                break;
+            case 2://2邀请赚钱，
+                Jump2View.getInstance().goAskGetMoney(context, null);
+                break;
+            case 3://3躺着赚钱，
+                Jump2View.getInstance().tryGoLyingView(context, null);
+
+                break;
+            case 4://4办卡赚钱
+                Jump2View.getInstance().goCreditCardTaskList(context, null);
+                break;
+            case 5://5玩转游戏
+                Jump2View.getInstance()
+                        .goMainGame(context);
+                break;
+            case 6://6充值q币
+//                G.showToast("敬请期待!");
+                Jump2View.getInstance().goRechargeQAct(context,null);
+                break;
+            case 7://微信辅助
+//                G.showToast("敬请期待!");
+
+                Jump2View.getInstance().goWeb(context,
+                        entity.getUrl(), "微信二维码辅助好友注册任务");
+                break;
+            default:
+
+                break;
+
+        }
+    }
 }

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

@@ -29,6 +29,7 @@ import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
 import com.sheep.gamegroup.view.activity.ActGuideOnHook;
+import com.sheep.gamegroup.view.activity.ActMainGame;
 import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.gamegroup.view.activity.ActNewbieTaskList;
 import com.sheep.gamegroup.view.activity.ActNotice;
@@ -719,4 +720,13 @@ public class Jump2View {
         Intent intent = new Intent(context, FeedbackAct.class);
         context.startActivity(intent);
     }
+
+    /**
+     * 游戏列表界面
+     * @param context
+     */
+    public void goMainGame(Context context) {
+        Intent intent = new Intent(context, ActMainGame.class);
+        context.startActivity(intent);
+    }
 }

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

@@ -0,0 +1,58 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+
+import com.kfzs.duanduan.fragment.FgtMainGame;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+/**
+ * Created by ljy on 2018/5/10.
+ */
+
+public class ActMainGame extends BaseActivity {
+
+    Activity activity;
+    @Override
+    protected int getLayoutId() {
+        return R.layout.personalcenter_act_layout;
+    }
+
+    @Override
+    public void initView() {
+
+        activity = this;
+
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "玩转游戏")
+                .setTitleFinish(this);
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        Bundle bundle = new Bundle();
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
+        if(fragment == null){
+            fragment = new FgtMainGame();
+            fragment.setArguments(bundle);
+            transaction.add(R.id.frame_container, fragment, "tag");
+            transaction.commit();
+        }else {
+            fragment.setArguments(bundle);
+            transaction.replace(R.id.frame_container, fragment);
+            transaction.commit();
+        }
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+}

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

@@ -65,6 +65,8 @@ public class FeedbackAct extends BaseActivity {
 
     @OnClick(R.id.tv_submit)
     public void onViewClicked() {
+        Content = feedbookEt.getText() +"";
+        Email = feedbookEmailEt.getText() +"";
         if(android.text.TextUtils.isEmpty(Content)){
             G.showToast(getResources().getString(R.string.feedback_notice_input_advice));
             return;

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

@@ -34,6 +34,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
+import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.EntityUtils;
@@ -43,8 +44,10 @@ import com.sheep.gamegroup.presenter.TaskDetailPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.adapter.AdpTaskDetailChildListview;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
@@ -56,6 +59,8 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import org.greenrobot.eventbus.EventBus;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.inject.Inject;
 
@@ -94,6 +99,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     TextView btnUpImag;
     @BindView(R.id.bottom_btn_layout)
     LinearLayout bottom_btn_layout;
+    @BindView(R.id.detail_task_listview)
+    MyListview detail_task_listview;
     private Activity activity;
     @Inject
     TaskDetailPresenter presenter;
@@ -109,6 +116,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5
     private boolean isDownLoad = false;//是否下载
 
+    private AdpTaskDetailChildListview adpTaskDetailChildListview;
+    private List<TaskChild> taskChildList = new ArrayList<>();
+
 
     @Override
     protected int getLayoutId() {
@@ -131,6 +141,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 .setTitleFinish(activity);
         Aria.download(this).register();
         mDownloadTaskService = new DownloadTaskService(this);
+        adpTaskDetailChildListview = new AdpTaskDetailChildListview(taskChildList, activity);
+        detail_task_listview.setAdapter(adpTaskDetailChildListview);
+        adpTaskDetailChildListview.notifyDataSetChanged();
     }
 
     @Override
@@ -218,6 +231,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     private void initWigget(){
         taskEty = taskReleaseEty.getTask();
+        taskChildList.addAll(taskEty.getChild());
         downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(taskEty);
         webText.setWebChromeClient(new WebChromeClient(){
 
@@ -294,6 +308,15 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //            btnTaskItem.setText("信用卡注册");
 //        }
 
+        //
+        if(taskChildList != null && taskChildList.size() > 0){
+            detail_task_listview.setVisibility(View.VISIBLE);
+            adpTaskDetailChildListview.notifyDataSetChanged();
+        }else {
+
+            detail_task_listview.setVisibility(View.GONE);
+        }
+
         taskSchedule();
     }
 

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

@@ -0,0 +1,88 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import java.util.List;
+
+/**
+ * Created by ljy on 2018/5/10.
+ */
+
+public class AdpHomeListGrideview extends BaseAdapter {
+    private List<HomeListEntity> homeListEntity;
+    private Context context;
+
+    public AdpHomeListGrideview(List<HomeListEntity> homeListEntity, Context context) {
+        this.homeListEntity = homeListEntity;
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return homeListEntity.size();
+    }
+
+    @Override
+    public HomeListEntity getItem(int position) {
+        return homeListEntity.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        if(holder == null){
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.adp_homelist_gridview, null);
+            holder.gridview_item_name_tv = convertView.findViewById(R.id.gridview_item_name_tv);
+            holder.gridview_item_detail_tv = convertView.findViewById(R.id.gridview_item_detail_tv);
+            holder.gridview_item_icon_iv = convertView.findViewById(R.id.gridview_item_icon_iv);
+            // 获取屏幕宽度
+            int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
+            int cricleRadius = W / 2  -50;
+            int h = cricleRadius  / 2;
+            convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, h));
+            convertView.setTag(holder);
+        }else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        final HomeListEntity entity = getItem(position);
+        holder.gridview_item_name_tv.setText(entity.getTitle()+"");
+        holder.gridview_item_detail_tv.setText(entity.getDesc()+"");
+        Glide.with(context)
+                .load(entity.getIcon())
+                .apply(new RequestOptions().dontAnimate())
+                .into(holder.gridview_item_icon_iv);
+        convertView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.getInstance()
+                        .goWhere(context, entity);
+            }
+        });
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView gridview_item_name_tv, gridview_item_detail_tv;
+        ImageView gridview_item_icon_iv;
+    }
+}

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

@@ -0,0 +1,91 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+/**
+ * Created by ljy on 2018/5/10.
+ */
+
+public class AdpHomeListListview extends BaseAdapter {
+    private List<HomeListEntity> homeListEntity;
+    private Context context;
+
+    public AdpHomeListListview(List<HomeListEntity> homeListEntity, Context context) {
+        this.homeListEntity = homeListEntity;
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return homeListEntity.size();
+    }
+
+    @Override
+    public HomeListEntity getItem(int position) {
+        return homeListEntity.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        if(holder == null){
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.adp_homelist_listview,null);
+
+            holder.q_iv = convertView.findViewById(R.id.q_iv);
+            holder.q_name_tv = convertView.findViewById(R.id.q_name_tv);
+            holder.q_dec_tv = convertView.findViewById(R.id.q_dec_tv);
+            holder.line_ly_q_view = convertView.findViewById(R.id.line_ly_q_view);
+            convertView.setTag(holder);
+        }else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        final HomeListEntity entity = getItem(position);
+        Glide.with(context)
+                .load(entity.getIcon())
+                .apply(new RequestOptions().dontAnimate())
+                .into(holder.q_iv);
+        holder.q_name_tv.setText(entity.getTitle()+"");
+        holder.q_dec_tv.setText(entity.getDesc()+"");
+
+        if(position == getCount()-1){
+            holder.line_ly_q_view.setVisibility(View.GONE);
+        }else {
+            holder.line_ly_q_view.setVisibility(View.VISIBLE);
+        }
+
+        convertView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.getInstance()
+                        .goWhere(context, entity);
+            }
+        });
+        return convertView;
+    }
+
+    class ViewHolder{
+        ImageView q_iv;
+        TextView q_name_tv, q_dec_tv;
+        View line_ly_q_view;
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.model.entity.TaskChild;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+/**
+ * Created by ljy on 2018/5/10.
+ */
+
+public class AdpTaskDetailChildListview extends BaseAdapter {
+    private List<TaskChild> taskChildList;
+    private Context context;
+
+    public AdpTaskDetailChildListview(List<TaskChild> taskChildList, Context context) {
+        this.taskChildList = taskChildList;
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return taskChildList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return taskChildList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        if(holder == null){
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.adp_taskdetail_child_listview, null);
+            holder.item_name_tv = convertView.findViewById(R.id.item_name_tv);
+            holder.item_detail_tv = convertView.findViewById(R.id.item_detail_tv);
+            holder.detail_task_tv = convertView.findViewById(R.id.detail_task_tv);
+            convertView.setTag(holder);
+        }else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        TaskChild taskChild = (TaskChild) getItem(position);
+        if(taskChild == null){
+            return convertView;
+        }
+        holder.item_name_tv.setText(taskChild.getName()+"");
+        holder.item_detail_tv.setText(taskChild.getAmount()+"元");
+        switch (taskChild.getTaskType()){
+            case 0://0 即将开始  1 进行中  2 已完成
+            default:
+                holder.detail_task_tv.setText("即将开始 ");
+                CommonUtil.getInstance()
+                        .setViewBackground(holder.detail_task_tv, "#929292");
+                break;
+            case 1:
+
+                holder.detail_task_tv.setText("进行中");
+                CommonUtil.getInstance()
+                        .setViewBackground(holder.detail_task_tv, "##fd2d54");
+                break;
+            case 2:
+
+                holder.detail_task_tv.setText("已完成");
+                CommonUtil.getInstance()
+                        .setViewBackground(holder.detail_task_tv, "#FF2EF77B");
+                break;
+        }
+
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView item_name_tv, item_detail_tv, detail_task_tv;
+    }
+}

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

@@ -0,0 +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"/>
+
+</selector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/gray_F2F2F2" />
+    <corners android:radius="4dp" />
+</shape>

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

@@ -44,13 +44,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="@dimen/view_size_130"
-                    android:cursorVisible="false"
+                    android:cursorVisible="true"
                     android:layout_below="@+id/feedbook_notice_end_tv"
                     android:layout_marginTop="@dimen/content_padding"
                     android:hint="@string/feedback_notice_input_advice"
                     android:gravity="top"
                     android:text=""
-                    style="@style/edt_style"
+                    style="@style/edt_style_gray"
                     android:layout_marginBottom="@dimen/content_padding_20"/>
                 <LinearLayout
                     android:id="@+id/feedbook_email_layout"
@@ -76,7 +76,7 @@
                         android:text=""
                         android:lines="2"
                         android:inputType="textEmailAddress"
-                        style="@style/edt_style"
+                        style="@style/edt_style_gray"
                         android:layout_gravity="center_vertical"/>
                 </LinearLayout>
 

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

@@ -0,0 +1,40 @@
+<?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="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center"
+    android:layout_gravity="center_vertical"
+    android:padding="@dimen/content_padding_10"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:layout_marginRight="@dimen/content_padding_small"
+    android:layout_marginBottom="@dimen/content_padding_15">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="@dimen/content_padding_small">
+
+            <TextView
+                android:id="@+id/gridview_item_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="试玩赚钱"
+                style="@style/nomal_txt_style"/>
+            <TextView
+                android:id="@+id/gridview_item_detail_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="下载应用领现金"
+                style="@style/nomal_txt_style_11"/>
+        </LinearLayout>
+        <ImageView
+            android:id="@+id/gridview_item_icon_iv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxHeight="@dimen/view_size_73"
+            android:maxWidth="@dimen/view_size_73"
+            android:src="@mipmap/home_try_play_circle_bg"
+            android:adjustViewBounds="true"/>
+</LinearLayout>

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

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/lying_qb_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:padding="@dimen/content_padding_10"
+    android:layout_margin="@dimen/content_padding">
+
+    <ImageView
+        android:id="@+id/q_iv"
+        android:layout_width="@dimen/view_size_55"
+        android:layout_height="@dimen/view_size_55"
+        android:src="@mipmap/home_q_circle_bg"
+        app:layout_constraintBottom_toTopOf="@+id/line_ly_q_view"
+        android:padding="@dimen/content_padding_small"
+        android:layout_marginRight="@dimen/content_padding_small"/>
+
+    <TextView
+        android:id="@+id/q_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="充值Q币"
+        app:layout_constraintTop_toTopOf="@+id/q_iv"
+        app:layout_constraintBottom_toBottomOf="@+id/q_iv"
+        app:layout_constraintLeft_toRightOf="@+id/q_iv"
+        style="@style/txt_style_16_black"/>
+
+    <TextView
+        android:id="@+id/q_dec_tv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="平台绵羊币，充值更便宜"
+        app:layout_constraintTop_toTopOf="@+id/q_iv"
+        app:layout_constraintBottom_toBottomOf="@+id/q_iv"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/q_name_tv"
+        android:gravity="right"/>
+
+    <View
+        android:id="@+id/line_ly_q_view"
+        android:layout_width="match_parent"
+        android:layout_height="1sp"
+        android:background="@color/bg_gray"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,41 @@
+<?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="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center"
+    android:layout_gravity="center_vertical"
+    android:padding="@dimen/content_padding_10"
+    android:layout_marginRight="@dimen/content_padding_small">
+
+    <TextView
+        android:id="@+id/item_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="·第一天签到任务"
+        android:layout_centerVertical="true"
+        style="@style/nomal_txt_style"/>
+    <TextView
+        android:id="@+id/item_detail_tv"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:text="1.5元"
+        android:textColor="@color/txt_red"
+        android:textSize="@dimen/text_size_15"
+        android:layout_marginLeft="@dimen/content_padding_small"/>
+    <TextView
+        android:id="@+id/detail_task_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="任务截图"
+        android:minWidth="@dimen/view_size_73"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_size_12"
+        android:gravity="center"
+        android:padding="@dimen/content_padding_3"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/item_layout"
+        android:background="@drawable/sp_rectangle_bg_gray_radius"
+        android:layout_alignParentBottom="true"/>
+</LinearLayout>

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

@@ -28,7 +28,11 @@
             <include
                 layout="@layout/homepage_item_banner"/>
             <include
-                layout="@layout/homepage_item_4module"/>
+                layout="@layout/homepage_item_4module"
+                android:visibility="gone"/>
+            <include
+                layout="@layout/homepage_item_gridview_listview"
+                android:visibility="visible"/>
             <ImageView
                 android:id="@+id/homepage_wxfz"
                 android:layout_width="match_parent"
@@ -36,10 +40,15 @@
                 android:layout_marginTop="@dimen/content_padding_10"
                 android:scaleType="fitXY"
                 android:adjustViewBounds="true"
-                android:src="@drawable/homepage_wxfz"/>
+                android:src="@drawable/homepage_wxfz"
+                android:visibility="gone"/>
 
             <include
-                layout="@layout/homepage_item_liy_q"/>
+                layout="@layout/homepage_item_liy_q"
+                android:visibility="gone"/>
+            <include
+                layout="@layout/homepage_item_gridview_listview"
+                android:visibility="gone"/>
             <include
                 layout="@layout/homepage_item_currenttime_reward"/>
 

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

@@ -10,15 +10,16 @@
     android:paddingRight="@dimen/content_padding_10">
 
     <com.sheep.gamegroup.util.MyGridview
+        android:id="@+id/home_list_gridview_gv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:scrollbars="none"
         android:numColumns="2"
-        android:background="@color/white"
         android:listSelector="@color/transparent"/>
 
     <com.sheep.gamegroup.util.MyListview
+        android:id="@+id/home_list_gridview_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scrollbars="none"

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

@@ -92,6 +92,15 @@
                         android:layout_alignParentBottom="true"/>
                 </RelativeLayout>
 
+                <com.sheep.gamegroup.util.MyListview
+                    android:id="@+id/detail_task_listview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    android:divider="@null"
+                    android:listSelector="@color/transparent"
+                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
+
                 <LinearLayout
                     android:id="@+id/detail_item_layout_2"
                     android:layout_width="match_parent"

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

@@ -66,6 +66,7 @@
     <dimen name="view_size_30">30dp</dimen>
     <dimen name="view_size_35">35dp</dimen>
     <dimen name="view_size_45">45dp</dimen>
+    <dimen name="view_size_55">55dp</dimen>
     <dimen name="view_size_60">60dp</dimen>
     <dimen name="view_size_73">73dp</dimen>
     <dimen name="view_size_80">80dp</dimen>

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

@@ -35,5 +35,7 @@
     <color name="white_DEDEDE">#DEDEDE</color>
     <color name="white_ededed">#ededed</color>
     <color name="white_FFF7F7F7">#FFF7F7F7</color>
+    <color name="green_FF2EF77B">#FF2EF77B</color>
+    <color name="gray_F2F2F2">#F2F2F2</color>
 
 </resources>

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

@@ -63,6 +63,16 @@
         <item name="android:background">@drawable/sp_edt_background_common</item>
     </style>
 
+    <style name="edt_style_gray">
+        <item name="android:textSize">14sp</item>
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:paddingBottom">6dp</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingRight">8dp</item>
+        <item name="android:textColorHint">@color/txt_gray_929292</item>
+        <item name="android:background">@drawable/sp_edt_backgroud_gray_1dp</item>
+    </style>
+
     <style name="txt_big_noheight_style">
         <item name="android:text">无敌大航海</item>
         <item name="android:textSize">@dimen/text_size_5</item>