列表搞定

Signed-off-by: 刁铃刚 <315096953@qq.com>

app/src/main/java/com/sheep/jiuyan/samllsheep/net/Url.java

@@ -22,6 +22,7 @@ public class Url {
     public static String MONEYRECORD=Config.instance().mBaseUrl + "/v1/user/getMoneyRecord";
 
     public static String WXACCOUNT=Config.instance().mBaseUrl + "/v1/user/userChildWxList";
+    public static String TASK_LIST=Config.instance().mBaseUrl + "/v1/user/getChildTaskList";
     public static String COMMIT_WXACCOUNT=Config.instance().mBaseUrl + "/v1/user/commitWx";
 
     public static String BINGACCOUNT=Config.instance().mBaseUrl + "/v1/user/register";

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WXAccountActivity.java

@@ -34,15 +34,16 @@ public class WXAccountActivity extends BaseActivity {
     public void initView() {
         mLv = (ListView) findViewById(R.id.lv);
         TitleBarUtils.getInstance()
-                .setTitle(this,"账户信息")
+                .setTitle(this, "账户信息")
                 .setTitleFinish(this);
     }
 
     @Override
     public void initListener() {
     }
-    private  void  showView(List<WXAccount> orders){
-        mAdapter=new CommonAdapter<WXAccount>(WXAccountActivity.this,R.layout.wx_account_item, orders) {
+
+    private void showView(List<WXAccount> orders) {
+        mAdapter = new CommonAdapter<WXAccount>(WXAccountActivity.this, R.layout.wx_account_item, orders) {
             @Override
             protected void convert(ViewHolder viewHolder, WXAccount item, int position) {
 
@@ -76,16 +77,17 @@ public class WXAccountActivity extends BaseActivity {
     }
 
 
-    private void getTask(){
+    private void getTask() {
         final HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
         NetManager.get(Url.WXACCOUNT, map, getApplicationContext(), new SheepCallback<List<WXAccount>>(this) {
             @Override
             public void success(List<WXAccount> orders) {
-                 showView(orders);
+                showView(orders);
             }
         });
     }
+
     @Override
     public void initData() {
         getTask();

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WxAccountDetail.java

@@ -6,7 +6,19 @@ import android.widget.TextView;
 
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.net.NetManager;
+import com.sheep.jiuyan.samllsheep.net.SheepCallback;
+import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.adapter.AdpWxDetailList;
+import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
+import com.sheep.jiuyan.samllsheep.page.entry.WxDetailList;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+
+import okhttp3.Call;
 
 /**
  * @ Created by Dlg
@@ -45,6 +57,17 @@ public class WxAccountDetail extends BaseActivity {
 
     @Override
     public void initData() {
-
+        HashMap<String, String> map = new HashMap<>();
+        map.put("wx_open_id", SpUtils.getOpenId(this));
+        map.put("wx_id", SpUtils.getOpenId(this));
+        NetManager.get(Url.TASK_LIST, map, this, new SheepCallback<List<WxDetailList>>(this) {
+            @Override
+            public void success(List<WxDetailList> tasks) {
+                if (tasks != null && tasks.size() > 0) {
+                    mAdpWxDetailList.addAll(tasks);
+                    mAdpWxDetailList.notifyDataSetChanged();
+                }
+            }
+        });
     }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpTaskList.java

@@ -32,7 +32,7 @@ public class AdpTaskList extends AdpCommonRecy<WXAccount> {
 
     @Override
     public void convert(ViewHolder holder, WXAccount wxAccount) {
-        holder.itemView.setTag(TAG_WXID, wxAccount.getWxId());
+        holder.itemView.setTag(TAG_WXID, wxAccount.getId() + "");
         holder.getView(R.id.txt_item_fgt_main_page_offline_task_user, TextView.class)
                 .setText(wxAccount.getWxId());
         holder.getView(R.id.txt_item_fgt_main_page_offline_task_statu, TextView.class)

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpWxDetailList.java

@@ -1,7 +1,10 @@
 package com.sheep.jiuyan.samllsheep.page.adapter;
 
 import android.content.Context;
+import android.widget.ImageView;
+import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.page.entry.WxDetailList;
 
@@ -26,7 +29,13 @@ public class AdpWxDetailList extends AdpCommonRecy<WxDetailList> {
 
     @Override
     public void convert(ViewHolder holder, WxDetailList wxDetailList) {
-
+        Glide.with(mContext)
+                .load(wxDetailList.getTask().getIcon())
+                .into(holder.getView(R.id.img_item_wx_account_detail_logo, ImageView.class));
+        holder.getView(R.id.txt_item_wx_account_detail_title, TextView.class)
+                .setText(wxDetailList.getTask().getDesc());
+        holder.getView(R.id.txt_item_wx_account_detail_task, TextView.class)
+                .setText("目票Todo");
     }
 
     @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/WXAccount.java

@@ -5,6 +5,9 @@ package com.sheep.jiuyan.samllsheep.page.entry;
  */
 
 public class WXAccount {
+
+    private Integer id;
+
     private String WxId;
 
     /**
@@ -16,6 +19,14 @@ public class WXAccount {
      */
     private int Status;
 
+    public Integer getId() {
+        return id == null ? 0 : id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
     public String getWxId() {
         return WxId == null ? "" : WxId;
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/WxDetailList.java

@@ -10,5 +10,24 @@ package com.sheep.jiuyan.samllsheep.page.entry;
 
 public class WxDetailList {
 
+    private Integer wxid;
 
+    private Task task;
+
+
+    public Integer getWxid() {
+        return wxid == null ? 0 : wxid;
+    }
+
+    public void setWxid(Integer wxid) {
+        this.wxid = wxid;
+    }
+
+    public Task getTask() {
+        return task;
+    }
+
+    public void setTask(Task task) {
+        this.task = task;
+    }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageOffline.java

@@ -84,6 +84,7 @@ public class FgtMainPageOffline extends BaseFragment {
                 if (!isLoadMore) {
 //                    mAdpTaskList.clear();//暂时没有分页功能，就这样吧。
                 }
+                mAdpTaskList.clear();
                 mAdpTaskList.add(new WXAccount());
                 mAdpTaskList.add(new WXAccount());
                 mAdpTaskList.add(new WXAccount());

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -176,6 +176,7 @@ public class FgtMainPageTask extends BaseFragment {
                 if (!isLoadMore) {
 //                    mAdapter.clear();//暂时没有分页功能
                 }
+                mAdapter.clear();
                 if (tasks != null && tasks.size() > 0) {
                     mAdapter.addAll(tasks);
                     mAdapter.notifyDataSetChanged();

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

@@ -81,7 +81,7 @@
             android:id="@+id/tv_text1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/tv_money"
+            android:layout_alignBottom="@+id/tv_money"
             android:layout_centerVertical="true"
             android:layout_marginBottom="3dp"
             android:layout_marginLeft="10dp"

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

@@ -1,6 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/content_padding_big">
 
+    <ImageView
+        android:id="@+id/img_item_wx_account_detail_logo"
+        android:layout_width="70dp"
+        android:layout_height="70dp" />
+
+    <TextView
+        android:id="@+id/txt_item_wx_account_detail_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/content_padding"
+        android:text="标题"
+        android:textColor="@color/black_text_deep"
+        android:textSize="@dimen/text_size_4"
+        app:layout_constraintLeft_toRightOf="@id/img_item_wx_account_detail_logo" />
+
+    <TextView
+        android:id="@+id/txt_item_wx_account_detail_task"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/content_padding_small"
+        android:text="任务目标："
+        android:textColor="@color/black_text_gray"
+        android:textSize="@dimen/text_size_2"
+        app:layout_constraintLeft_toLeftOf="@id/txt_item_wx_account_detail_title"
+        app:layout_constraintTop_toBottomOf="@id/txt_item_wx_account_detail_title" />
+
+    <TextView
+        android:id="@+id/txt_item_wx_account_detail_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/content_padding_small"
+        android:text="已完成60%"
+        android:textColor="@color/black_text_gray"
+        android:textSize="@dimen/text_size_2"
+        android:visibility="gone"
+        app:layout_constraintLeft_toLeftOf="@id/txt_item_wx_account_detail_task"
+        app:layout_constraintTop_toBottomOf="@id/txt_item_wx_account_detail_task" />
+
+    <ImageView
+        android:id="@+id/img_item_wx_account_detail_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/narrow_down"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/img_item_wx_account_detail_logo"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@id/img_item_wx_account_detail_logo" />
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:layout_marginTop="@dimen/content_padding"
+        android:background="@color/divier"
+        app:layout_constraintTop_toBottomOf="@id/img_item_wx_account_detail_logo" />
 </android.support.constraint.ConstraintLayout>

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

@@ -7,7 +7,7 @@
     <color name="colorGreen">#4ADE15</color>
     <!--APP中的文本颜色主要值-->
     <color name="black_text_deep">#333333</color>
-    <color name="black_text_gray">#666666</color>
+    <color name="black_text_gray">#898989</color>
     <color name="black_text_light">#bbbbbb</color>
     <color name="orange_text_light">#ef712c</color>
     <!--APP中的主要非白色背景的底色-->